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
|
679838eac3
|
Port new Aerolas Doppler driver from RELEASE-3_1
|
2015-01-07 10:29:07 +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
|
0afb08a7a3
|
Adjustments to mtth/vwi/vei for Pelican
Reverse sign on mom[abc] in set_vwi proc
Add hdbchain for vwi for mtth
Add sicslist setatt ... for vei as for vwi
|
2014-12-15 15:33:05 +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
|
c61cb22270
|
Handle bigger modbus messages
|
2014-12-12 14:25:36 +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
|
33fbe4ed01
|
Regen the doppler SCT driver
|
2014-12-08 16:24:44 +11:00 |
|
Douglas Clowes
|
82f81b4b02
|
Change the byte order and start addresses for the doppler modbus driver
|
2014-12-08 16:24:30 +11:00 |
|
Douglas Clowes
|
06a0ebad19
|
Regen SCT driver
|
2014-12-03 12:12:28 +11:00 |
|
Douglas Clowes
|
f28115552a
|
Add additional doppler modbus registers
|
2014-12-03 12:12:17 +11:00 |
|
Douglas Clowes
|
99671f2aa5
|
New driver for AeroLas Doppler drive for Emu
|
2014-12-02 16:16:36 +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
|
34f748e426
|
Set the driver name and the ip_address/tcp_port for nosctcontroller
|
2014-11-27 15:15:13 +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
|
51026a09af
|
Pull various config files closer into alignment
|
2014-11-20 16:06:32 +11:00 |
|
Douglas Clowes
|
f629ea24ed
|
Pull various config files closer into alignment
|
2014-11-20 15:56:30 +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
|
1469a60b5d
|
Regen SCT driver with new spacing
|
2014-11-20 14:51:54 +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
|
9b178f3014
|
Add a new (configurable) fake Oxford Mercury
|
2014-11-20 14:49:54 +11:00 |
|
Douglas Clowes
|
d4de7d4ea1
|
Pretty-up the spacing around the conditional code in gen_sct.py
|
2014-11-20 14:49:46 +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
|
01c0bf1f3c
|
Add a new (configurable) fake Oxford Mercury
|
2014-11-20 14:44:43 +11:00 |
|
Douglas Clowes
|
c838e4ffe2
|
Pretty-up the spacing around the conditional code in gen_sct.py
|
2014-11-20 14:42:50 +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
|
a053c02868
|
Regenerate SCT drivers
|
2014-11-13 14:21:42 +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
|
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
|
a5116f03e4
|
Add json-c to json in VERBOSE library search test
|
2014-11-13 13:44:30 +11:00 |
|