linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,869 Commits 1 Branch 0 Tags
9e76c7d60dfce12c0086c49f59b36ae4b679af8a
Commit Graph

319 Commits

Author SHA1 Message Date
Douglas Clowes
9e76c7d60d Remove sct_keysight_N8740A.tcl artifact from RELEASE-3_1 2015-01-07 14:04:35 +11:00
Douglas Clowes
c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
 2015-01-07 13:09:27 +11:00
Douglas Clowes
76d7191754 SICS-839 Change TCL var from nominal_outp_current to NominalOutpCurrent 2015-01-07 10:20:40 +11:00
Douglas Clowes
2d4c725d10 Regen keysight 2014-12-12 15:24:50 +11:00
Douglas Clowes
f09cf4d080 move keysight from environment to instrument class 2014-12-12 15:24:25 +11:00
Douglas Clowes
159184cb30 Regen SCT driver for Keysight PS 2014-12-12 14:28:48 +11:00
Douglas Clowes
b81b226fe8 Allow output voltage to be ramped on Keysight PS 2014-12-12 14:27:40 +11:00
Douglas Clowes
ff03b1108b Regen the omron SCT driver 2014-12-08 16:27:03 +11:00
Douglas Clowes
bdc11e914f Change the protocol to omron_ap for the omron driver 2014-12-08 16:26:03 +11:00
Douglas Clowes
8ff7368f34 develop keysight_N8740A.sct 2014-12-02 13:25:03 +11:00
Douglas Clowes
0aa292bc96 develop keysight_N8740A.sct 2014-12-02 13:24:51 +11:00
Douglas Clowes
5f2223510f Regenerate SCT drivers 2014-12-02 10:09:17 +11:00
Ferdi Franceschini
e64b7bf409 Instructed bruker_BEC1 wrapper to not make a script context controller. 2014-12-01 14:32:54 +11:00
Douglas Clowes
7adec62e61 Driver for Agilent/Keysight N8740A Power Supply 2014-12-01 12:59:49 +11:00
Douglas Clowes
99f23cda50 Regen the Oxford Mercury SCT driver 2014-11-24 12:45:12 +11:00
Douglas Clowes
f5994bb760 Add auto/manual switch and setting, change to all lowercase 2014-11-24 12:44:29 +11:00
Douglas Clowes
de766e465e Regen of Mercury driver 2014-11-20 17:37:58 +11:00
Douglas Clowes
7960bab345 Changes to Mercury driver 2014-11-20 17:37:34 +11:00
Douglas Clowes
892ca1cdc5 Merge branch 'RELEASE-3_1' 2014-11-20 15:11:56 +11:00
Douglas Clowes
e04f107bc9 Add new SCT driver for Oxford Mercury 2014-11-20 14:52:13 +11:00
Douglas Clowes
11b68fb957 New driver for the Oxford Mercury (using conditional and exec) 2014-11-20 14:50:44 +11:00
Douglas Clowes
7269314220 Regenerate SCT drivers (new spacing, new Oxford Mercury) 2014-11-20 14:48:00 +11:00
Douglas Clowes
a7e6017fd5 New driver for the Oxford Mercury (using conditional and exec) 2014-11-20 14:46:24 +11:00
Douglas Clowes
225c4c5ee7 Regenerate SCT drivers 2014-11-13 14:54:36 +11:00
Douglas Clowes
89b23eda07 Make the Lakeshore 218 driver less noisy and have less channels 2014-11-13 14:54:25 +11:00
Douglas Clowes
b84efe47cf Regenerate SCT drivers 2014-11-13 14:53:48 +11:00
Douglas Clowes
b35c470c79 Remove debug_threshold from debugging test 2014-11-13 14:39:26 +11:00
Douglas Clowes
ee4cd27f0e Regenerate SCT drivers 2014-11-13 14:20:52 +11:00
Douglas Clowes
8f977bb98f Realign SCT drivers with R3.2 2014-11-13 14:18:45 +11:00
Douglas Clowes
c443411764 Realign SCT drivers with R3.2 2014-11-13 14:14:04 +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
9909c1412e Regenerate all the SCT drivers with new generator 2014-11-07 09:14:09 +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
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
4620c7b079 Regenerate SCT drivers 2014-11-03 14:26:25 +11:00