Bring config INI files up to date with new drivers and fix some errors.

This commit is contained in:
Ferdi Franceschini
2015-03-13 13:09:15 +11:00
parent 88c1f007fa
commit 25d73eb17a
13 changed files with 322 additions and 114 deletions

View File

@@ -1,12 +1,15 @@
[12tmagnet_setup]
cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi_01
cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_01
enabled = False
[CF1]
cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
enabled = False
[CF8]
[CF7]
cascade = T1:ls336_08,T2:ls336_05,sample_stage:normal_sample_stage
enabled = False
[CF8]
cascade = T1:ls336_01,T2:ls340_11,sample_stage:normal_sample_stage
enabled = False
[Default]
cascade = sample_stage:normal_sample_stage
enabled = True
@@ -107,8 +110,9 @@ 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
@@ -187,7 +191,7 @@ asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 137.157.201.21
ip = 10.157.205.61
port = 7777
terminator = \r\n
tol1 = 1.0
@@ -225,6 +229,38 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls340_01]
asyncqueue = sct
desc = "Lakeshore 340 temperature controller"
driver = "ls340"
imptype = temperature
ip = 137.157.201.86
port = 4001
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls340_02]
asyncqueue = sct
desc = "Lakeshore 340 temperature controller"
driver = "ls340"
imptype = temperature
ip = 137.157.201.86
port = 4002
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls340_11]
desc = "Lakeshore 340 temperature controller"
driver = "ls340"
imptype = temperature
ip = 137.157.201.86
port = 4001
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls370_1]
desc = "Lakeshore 370 Resistance Bridge"
driver = "lakeshore_m370"
@@ -243,6 +279,7 @@ ip = 10.157.205.5
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@@ -256,6 +293,7 @@ ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@@ -269,6 +307,7 @@ ip = 10.157.205.47
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@@ -314,10 +353,21 @@ robot_name = rosie
desc = "Load the small omega configuration"
imptype = motion_axis
[west4100]
desc = "Blue furnace temperature controller"
[vf1_west6100]
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
driver = "west_6100"
imptype = temperature
ip = 10.157.205.19
ip = 10.157.205.24
port = 502
[vf2_west6100]
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace temperature controller"
dev_id = 1
driver = "west_6100"
imptype = temperature
ip = 10.157.205.25
port = 502