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

SICS-794: Bring GIT up to date with changes made on ics1-echidna.

Browse Source
This commit is contained in:
Ferdi Franceschini
2014-10-08 20:36:13 +11:00
parent d8f5030a8d
commit 542be52d74
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
site_ansto/instrument/hrpd/util/sics_config.ini
View File

@ -5,7 +5,7 @@ enabled = False
cascade = T1:CF1_ls340,sample_stage:normal_sample_stage cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
enabled = False enabled = False
[CF8] [CF8]
cascade = T1:ls336_01,T2:ls340_11,sample_stage:normal_sample_stage cascade = T1:ls336_08,T2:ls336_05,sample_stage:normal_sample_stage
enabled = False enabled = False
[Default] [Default]
cascade = sample_stage:normal_sample_stage cascade = sample_stage:normal_sample_stage
@ -95,8 +95,8 @@ implementation = none
name = volts2 name = volts2
optype = multimeter optype = multimeter
[robot] [robot]
enabled = True enabled = False
implementation = robbie implementation = none
name = robot name = robot
optype = pickandplace optype = pickandplace
[sample_stage] [sample_stage]
@ -176,7 +176,7 @@ asyncqueue = sct
desc = "Lakeshore 336 temperature controller" desc = "Lakeshore 336 temperature controller"
driver = "ls336" driver = "ls336"
imptype = temperature imptype = temperature
ip = 137.157.201.21 ip = 10.157.205.54
port = 7777 port = 7777
terminator = \r\n terminator = \r\n
tol1 = 1.0 tol1 = 1.0
@ -193,6 +193,17 @@ terminator = \r\n
tol1 = 1.0 tol1 = 1.0
tol2 = 1.0 tol2 = 1.0
[ls336_08]
asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 10.157.205.55
port = 7777
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls336_11] [ls336_11]
desc = "Lakeshore 336 temperature controller" desc = "Lakeshore 336 temperature controller"
driver = "ls336" driver = "ls336"
@ -296,14 +307,14 @@ imptype = multimeter
ip = 10.157.205.37 ip = 10.157.205.37
port = 4001 port = 4001
[robbie] [robby]
asyncqueue = sct asyncqueue = sct
desc = "Robbie: Epson Pick and Place Robot" desc = "Robbie: Epson Pick and Place Robot"
driver = epson_pandp driver = epson_pandp
imptype = pickandplace imptype = pickandplace
ip = 137.157.201.26 ip = 137.157.201.26
port = 6000 port = 6000
robot_name = robbie robot_name = robby
[rosie] [rosie]
asyncqueue = sct asyncqueue = sct