Commit Graph

2411 Commits

Author SHA1 Message Date
Douglas Clowes
0010cef179 Call the add instead of make function for the Eurotherm 2000 wrapper 2014-11-06 12:34:45 +11:00
Douglas Clowes
1f6d28637d Trim the He-3 response before splitting to remove empty list elements
Damn you, TCL ...
2014-11-06 11:13:32 +11:00
Douglas Clowes
4620c7b079 Regenerate SCT drivers 2014-11-03 14:26:25 +11:00
Douglas Clowes
9adb5cb907 Handle missing read_command 2014-11-03 14:25:42 +11:00
Douglas Clowes
300e29fe00 Merge branch 'Pelican' into RELEASE-3_1 2014-11-03 12:37:34 +11:00
Douglas Clowes
16ad9ed8e2 Pull back address change on Pelican 2014-11-03 12:34:56 +11:00
Douglas Clowes
9daf62c299 Fix for the Lakeshore LS-340 RELAY command on Pelican
It's not the same as on the LS-336
2014-11-03 11:53:20 +11:00
Douglas Clowes
71475199d9 Formatting, typo, and speedup from RELEASE-3_2 compareSICS.py 2014-11-03 11:46:51 +11:00
Douglas Clowes
13d3772078 Regen 3He SCT driver 2014-10-27 17:51:14 +11:00
Douglas Clowes
155d24588a Extend 3He poll to 900 seconds and add refresh command 2014-10-27 17:50:55 +11:00
Douglas Clowes
81a425e293 Revert "Anticollider changes from Platypus"
This reverts commit f47c6fec812eece9f68c7bee2bcc314bcadf32ca.
2014-10-27 15:01:23 +11:00
Douglas Clowes
3bcd3fa0fb Regen SC driver for west 4100/6100 2014-10-27 14:41:46 +11:00
Douglas Clowes
09cedac66d Make West 4100 driveable and add permlinks 2014-10-27 14:40:40 +11:00
Douglas Clowes
fa2eb775ac Regen 3He SC driver 2014-10-27 14:35:37 +11:00
Douglas Clowes
62481b76c5 Add fields to 3He driver 2014-10-27 14:35:16 +11:00
Douglas Clowes
1b7eddc015 Add whatsthere.py to RELEASE-3_1 2014-10-22 12:42:14 +11:00
Douglas Clowes
b02ea420d8 Merge Platypus changes into RELEASE-3_1 2014-10-22 12:15:04 +11:00
Douglas Clowes
9350f4023b Anticollider changes from Platypus 2014-10-22 12:11:01 +11:00
Douglas Clowes
2723ed9279 Changes add_bruker_BEC1 to add_bruker_bec1 2014-10-22 12:09:49 +11:00
Douglas Clowes
07116a4ef4 Change driveable nodes from text to int to satisfy new checks 2014-10-22 12:09:13 +11:00
Douglas Clowes
2ed8269a0f Changes to 3He driver 2014-10-22 11:56:28 +11:00
Ferdi Franceschini
d9660d1f7b Add west6100 driver to Pelican. 2014-10-17 16:42:57 +11:00
Ferdi Franceschini
e40b053c70 Load available environment controller configurations for Kookaburra. 2014-10-17 16:42:56 +11:00
Ferdi Franceschini
a8b2df51a5 Load some missing environment controller configurations for Echidna. 2014-10-17 16:42:55 +11:00
Ferdi Franceschini
35ea3704b7 Load available environment controller configurations for kowari 2014-10-17 16:42:55 +11:00
Ferdi Franceschini
2d9e377f5f Clean up Dingo sics_config.ini 2014-10-17 16:42:54 +11:00
Ferdi Franceschini
80ad9cff2a Load sics_config.ini wrapper code for Legacy drivers on Playtpus and update config. 2014-10-17 16:42:53 +11:00
Ferdi Franceschini
ea8ed30eb8 Revert obsolete read_config code for bruker_BEC1 driver. 2014-10-17 16:42:53 +11:00
Ferdi Franceschini
998e49d8b2 Generate new wrapper TCL code for Bruker magnet. 2014-10-17 16:42:52 +11:00
Ferdi Franceschini
f1397cc1f9 Wrapper template which configures bruker via sics_config.ini 2014-10-17 16:42:51 +11:00
Ferdi Franceschini
2afcb043c3 Generate TCL code for syringe and mvp wrappers. 2014-10-17 16:42:51 +11:00
Ferdi Franceschini
73181a43d9 Wrapper templates to load syringe pump and mvp valve via sics_config.ini. 2014-10-17 16:42:50 +11:00
Ferdi Franceschini
a6ff6346ed Fix typo in Platypus motor_configuration.tcl 2014-10-17 16:42:49 +11:00
Ferdi Franceschini
e7f2070737 SICS-806 Add extra parameters to Kookaburra hdf. 2014-10-17 16:42:49 +11:00
Douglas Clowes
0cd3e85607 Add a driver for the 3He Polariser/Analyser (rudimentary) 2014-10-16 15:52:30 +11:00
Ferdi Franceschini
11d008620a SICS-742 spin flipper is instructed to power up but doesn't reach the target current. 2014-10-15 09:14:58 +11:00
Ferdi Franceschini
6183182c78 A sics_config.ini for Platypus with the new Knauer pump driver. 2014-10-13 14:16:27 +11:00
Ferdi Franceschini
c5dc9ca615 A generic sics_config.ini for Kookaburra. 2014-10-13 11:35:20 +11:00
Ferdi Franceschini
7b522c0a7b A sics_config.ini for Dingo. 2014-10-13 11:25:34 +11:00
Ferdi Franceschini
de7b1d40e7 Add CF4 configuration from ics1-taipan 2014-10-12 17:31:01 +11:00
Ferdi Franceschini
e396657851 Fix west 6100 driver name in Wombat sics_config.ini 2014-10-12 17:26:54 +11:00
Ferdi Franceschini
7d35f7e696 SICS-797: Bring GIT up to date with changes made on ics1-quokka 2014-10-09 14:21:10 +11:00
Ferdi Franceschini
2ebefc2b29 SICS-796: Bring GIT up to date with changes made on ics1-dingo. 2014-10-08 20:46:16 +11:00
Ferdi Franceschini
542be52d74 SICS-794: Bring GIT up to date with changes made on ics1-echidna. 2014-10-08 20:36:13 +11:00
Ferdi Franceschini
d8f5030a8d SICS-795 Bring GIT up to date with changes made on ics1-wombat. 2014-10-08 20:29:23 +11:00
Ferdi Franceschini
9720f1d0f0 SICS-788 Guard against integer division. 2014-10-08 19:59:22 +11:00
Ferdi Franceschini
3a475196a0 SICS-788: Some divisions in Tcl macros will be truncated if the values are integers.
An integer division was caused here by the fix to SICS-785
2014-10-08 19:56:59 +11:00
Ferdi Franceschini
3b35308bf2 SICS-786 SICS locked up while counting on Taipan
An in-situ hack that was done on Wombat was accidentally committed.
2014-10-08 19:44:29 +11:00
Ferdi Franceschini
6ff638b36e SICS-793: Bring GIT up to date with changes made on ics1-taipan 2014-10-08 19:36:35 +11:00
Douglas Clowes
b0e4c3a85b Better checks and state machine for Knauer pump 2014-10-07 15:03:52 +11:00