SICS-797: Bring GIT up to date with changes made on ics1-quokka

This commit is contained in:
Ferdi Franceschini
2014-10-09 14:21:10 +11:00
parent 2ebefc2b29
commit 7d35f7e696

View File

@@ -45,6 +45,13 @@ id = 1
implementation = none
name = dsc_val
optype = multimeter
[Flow Control]
datype = FC
enabled = False
id = 1
implementation = none
name = fc1
optype = flowcontrol
[Function_Generator]
datype = V
enabled = False
@@ -200,8 +207,8 @@ imptype = temperature
ip = 10.157.205.43
port = 4001
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
tol1 = 0.2
tol2 = 0.2
[Oxford_12tmagnet_sample_insert]
desc = "som will be redefined as the magnet sample insert rotation. Sample stage will be renamed to somss"
@@ -235,6 +242,13 @@ ip = 10.157.205.13
port = 4444
type = B
[hiden_xcs]
desc = "Hiden XCS Relative Humidity Flow Control"
driver = "hiden_xcs"
imptype = flowcontrol
ip = 137.157.202.79
port = 4001
[isotech_ps]
desc = "Isotech Power Supply:Baud=2400,Data=8,Stop=1,Parity=None,Flow=None"
driver = "isotech_ps"