a974be9c86
SICS-844 Add eulerian cradle configuration to Taipan
2015-02-23 10:22:28 +11:00
06c51416dd
Merge branch 'Dingo' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/server_config.tcl
2015-02-19 16:04:50 +11:00
27c3a48d91
Pullback from Dingo 2015-02-19
2015-02-19 15:59:22 +11:00
92539b80aa
Merge branch 'Kookaburra' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/kookaburra/config/anticollider/acscript.txt
2015-02-19 15:54:22 +11:00
0cff1f7c3c
Pullback from Kookaburra 2015-02-19
2015-02-19 15:51:41 +11:00
8b4ab411fd
Merge branch 'Wombat' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/hipd/config/commands/commands.tcl
sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/hipd/util/sics_config.ini
2015-02-19 15:26:13 +11:00
4e383b2af2
Merge branch 'Echidna' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
2015-02-19 14:57:43 +11:00
4756be739a
Merge branch 'Platypus' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/sct_omron_hldc.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
2015-02-19 14:55:19 +11:00
1bb7f90237
Merge branch 'Pelican' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
2015-02-19 14:53:33 +11:00
106d61a883
Merge branch 'Taipan_R31' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/tas/taipan_configuration.tcl
sics/site_ansto/instrument/tas/util/sics_config.ini
2015-02-19 14:50:39 +11:00
14be249401
Pullback from Wombat 2015-02-19
2015-02-19 11:51:51 +11:00
31420ab850
Pullback from Echidna 2015-02-19
2015-02-19 11:43:50 +11:00
da2383f5ce
Pullback from Platypus 2015-02-19
2015-02-19 11:30:48 +11:00
40d2a1e2f4
Pullback from Pelican 2015-02-19
2015-02-19 11:24:44 +11:00
2dcf274618
Tilt configuration from Taipan 2015-02-19
2015-02-19 10:35:21 +11:00
666a70cb96
Dubious diffs from Taipan 2015-02-19
2015-02-19 10:34:31 +11:00
fbdd46e258
Pullback from Taipan 2015-02-19
2015-02-19 10:34:12 +11:00
8c4eed9bfe
Merged changes from Quokka as at 2015-02-18
2015-02-19 09:40:49 +11:00
287b671569
Regenerate for limit changes
2015-02-19 09:14:23 +11:00
45d4663816
Pullback limit adjustments from Quokka to sct template drivers
2015-02-19 09:04:43 +11:00
648c7bf1dd
Update Quokka configuration file
2015-02-18 12:36:11 +11:00
f0bc6f0693
Backport the build command from RELEASE-3_2
2015-02-18 11:54:08 +11:00
cad4f64dcc
Regenerate the 3He driver for the coils
2015-02-16 12:38:43 +11:00
f80bec1403
Changes to get and set the field coil values
2015-02-16 12:38:02 +11:00
22bb612296
Fake device for Oxford LabView testing
2015-02-16 12:36:12 +11:00
3486b75d47
Generate the TCL from the new Oxford
2015-02-13 10:57:58 +11:00
2993a04485
Alternative Oxford Magnet Labview interface
2015-02-13 10:56:50 +11:00
be0d932a21
SICS-846 Off by one error in argc check sct_asyncqueue.c
2015-01-23 17:13:50 +11:00
b88580a571
SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files
...
We don't want these files deployed anyway
since they get updated on the instrument.
2015-01-23 12:28:53 +11:00
86e1f7b7cf
SICS-819 Fix SICS crash in logsetup
...
Directory creation involving path creation failed because the path has
a trailing slash. After creating the directory of the full path, SICS
tried to create the path again with the trailing slash - it failed.
When logger creation failed, SICS registered the callback with NULL. This
was dereferenced in the hipadaba callback.
Suppress trailing slashes in directory path creation. Do not register
the callback if the creation failed.
2015-01-23 10:09:12 +11:00
18456d2af8
Remove trailing spaces and blank lines from sct_bm.tcl
2015-01-08 11:41:09 +11:00
9c38845b84
SIS IO Box Beam monitor driver.
2015-01-07 13:01:21 +11:00
2b73a7eaca
Remove extra include (<rs232controller.h>)
2015-01-07 11:05:58 +11:00
76d7191754
SICS-839 Change TCL var from nominal_outp_current to NominalOutpCurrent
2015-01-07 10:20:40 +11:00
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
2d4c725d10
Regen keysight
2014-12-12 15:24:50 +11:00
f09cf4d080
move keysight from environment to instrument class
2014-12-12 15:24:25 +11:00
159184cb30
Regen SCT driver for Keysight PS
2014-12-12 14:28:48 +11:00
b81b226fe8
Allow output voltage to be ramped on Keysight PS
2014-12-12 14:27:40 +11:00
c61cb22270
Handle bigger modbus messages
2014-12-12 14:25:36 +11:00
ff03b1108b
Regen the omron SCT driver
2014-12-08 16:27:03 +11:00
bdc11e914f
Change the protocol to omron_ap for the omron driver
2014-12-08 16:26:03 +11:00
33fbe4ed01
Regen the doppler SCT driver
2014-12-08 16:24:44 +11:00
82f81b4b02
Change the byte order and start addresses for the doppler modbus driver
2014-12-08 16:24:30 +11:00
06a0ebad19
Regen SCT driver
2014-12-03 12:12:28 +11:00
f28115552a
Add additional doppler modbus registers
2014-12-03 12:12:17 +11:00
99671f2aa5
New driver for AeroLas Doppler drive for Emu
2014-12-02 16:16:36 +11:00
8ff7368f34
develop keysight_N8740A.sct
2014-12-02 13:25:03 +11:00
0aa292bc96
develop keysight_N8740A.sct
2014-12-02 13:24:51 +11:00
5f2223510f
Regenerate SCT drivers
2014-12-02 10:09:17 +11:00
Ferdi Franceschini