linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SICS-795 Bring GIT up to date with changes made on ics1-wombat.

Browse Source
This commit is contained in:
Ferdi Franceschini
2014-10-08 20:29:23 +11:00
parent 9720f1d0f0
commit d8f5030a8d
8 changed files with 122 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
site_ansto/instrument/hipd/util/sics_config.ini
View File

@@ -103,9 +103,11 @@ implementation = normal_sample_stage
name = sample_stage
optype = motion_axis
[12tmagnet_oxford]
asyncqueue = sct
desc = "12 Tesla Oxford Magnet"
driver = "oxford_labview"
driver = "oxford12tlv"
imptype = magnetic_field
interval = 5
ip = 10.157.205.3
port = 55001
@@ -291,40 +293,21 @@ desc = "Load the small omega configuration"
imptype = motion_axis
[vf1_west4100]
asyncqueue = sct
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
imptype = temperature
ip = 10.157.205.24
port = 502
[vf1_west6100]
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace 6100 temperature controller"
dev_id = 1
driver = "west_6100"
driver = "west6100"
imptype = temperature
ip = 10.157.205.24
port = 502
timeout = 2000
[vf2_west4100]
asyncqueue = sct
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
imptype = temperature
ip = 10.157.205.25
port = 502
[vf2_west6100]
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace 6100 temperature controller"
dev_id = 1
driver = "west_6100"
driver = "west6100"
imptype = temperature
ip = 10.157.205.25
port = 502
timeout = 2000