linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,824 Commits 1 Branch 0 Tags
11b68fb9579cd8826a253cd784aa7667da32b19d
Commit Graph

564 Commits

Author SHA1 Message Date
Douglas Clowes
11b68fb957 New driver for the Oxford Mercury (using conditional and exec) 2014-11-20 14:50:44 +11:00
Douglas Clowes
a053c02868 Regenerate SCT drivers 2014-11-13 14:21:42 +11:00
Douglas Clowes
8a7ff5d63c Make 3He fields numeric and align with R 3.1 2014-11-13 14:10:20 +11:00
Douglas Clowes
f076b537ed Regenerate SCT drivers 2014-11-13 13:53:04 +11:00
Douglas Clowes
30c23b1e0a Merge branch 'RELEASE-3_1' 
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps.sct
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/util/gen_sct.py
 2014-11-13 13:52:46 +11:00
Douglas Clowes
86d4732b06 Regenerate SCT drivers 2014-11-13 13:43:51 +11:00
Douglas Clowes
5fefe5f009 Regenerate SCT drivers 2014-11-13 12:41:22 +11:00
Douglas Clowes
674fae9115 Regenerate SCT drivers 2014-11-13 12:40:18 +11:00
Douglas Clowes
38dff05881 Regenerate SCT drivers 2014-11-13 12:38:03 +11:00
Douglas Clowes
3450b4cbf9 Regenerate SCT drivers 2014-11-13 12:35:46 +11:00
Douglas Clowes
fe0bc8f0c0 Regen two sct drivers 2014-11-10 18:58:42 +11:00
Douglas Clowes
14237f734b Change limites on e3200 setpoint 2014-11-10 18:57:46 +11:00
Douglas Clowes
305e903d01 3He chnage to float and timestamp in seconds 2014-11-10 18:57:22 +11:00
Ferdi Franceschini
a375c6ce20 SICS-821: You can now use the "whenall" keyword to forbid a move based on the positions of a set of motors. 2014-11-07 09:44:35 +11:00
Douglas Clowes
9909c1412e Regenerate all the SCT drivers with new generator 2014-11-07 09:14:09 +11:00
Douglas Clowes
6c6292bbb2 Change nodenames to lowercase and add a 'stash' function in he3_polanal 2014-11-07 09:10:17 +11:00
Douglas Clowes
67b6c5c7ee regen sct_he3_polanal.tcl 2014-11-06 18:17:25 +11:00
Douglas Clowes
3602f56352 Rework the he3_polanal.sct driver 2014-11-06 18:17:02 +11:00
Douglas Clowes
f1595151cd Changes to protocol_args to add defaults 2014-11-06 16:27:15 +11:00
Douglas Clowes
a9932f8ae8 Slight change to the way we do PID in SCT files 2014-11-06 16:09:44 +11:00
Douglas Clowes
741d12d57a Driver generated in RELEASE-3_2 with --sct=before 2014-11-06 15:42:00 +11:00
Douglas Clowes
42db9431f2 Add newer generated drivers from merge 2014-11-06 14:43:18 +11:00
Douglas Clowes
3ce5ae0977 Merge branch 'RELEASE-3_1' 
Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
 2014-11-06 14:13:20 +11:00
Douglas Clowes
2076c0a5fc New generated SCT drivers for knauer, sr630 and epson robot wrapper 2014-11-06 13:40:06 +11:00
Douglas Clowes
0b2f3d520b Regen SCT drivers 2014-11-06 13:36:47 +11:00
Douglas Clowes
ce324826dd Update protocol_args to new format and terminator for ls340 2014-11-06 13:00:07 +11:00
Douglas Clowes
8a61f65701 Developing the Eurotherm 3200 SCT driver 2014-11-06 12:35:21 +11:00
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
300e29fe00 Merge branch 'Pelican' into RELEASE-3_1 2014-11-03 12:37:34 +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
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
d41e77cc79 Regenerate the affected drivers 2014-10-22 16:03:22 +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
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