Pullback ls340_pelican and ls218 changes on Pelican

This commit is contained in:
Douglas Clowes
2014-09-10 14:39:00 +10:00
parent a9a20b4855
commit 377405d2a4

View File

@ -8,7 +8,7 @@ enabled = False
cascade = T1:ls336_01,T2:ls340_11,sample_stage:normal_sample_stage
enabled = False
[Default]
cascade = sample_stage:normal_sample_stage
cascade = sample_stage:normal_sample_stage,T1:ls340_pelican
enabled = True
[OC1]
cascade = T1:OC1_ls340,sample_stage:normal_sample_stage
@ -43,9 +43,9 @@ name = curr2
optype = multimeter
[T1]
datype = T
enabled = False
enabled = True
id = 1
implementation = none
implementation = ls340_pelican
name = tc1
optype = temperature
[T2]
@ -83,6 +83,11 @@ id = 2
implementation = none
name = volts2
optype = multimeter
[ls218]
enabled = Always
implementation = ls218-01
name = ls218
optype = lakeshore_218
[sample_stage]
enabled = Always
implementation = normal_sample_stage
@ -120,6 +125,13 @@ imptype = function_generator
ip = 10.157.205.16
port = 5025
[ls218-01]
desc = "Lakeshore 218 Temperature Monitor"
driver = "lakeshore_218"
imptype = lakeshore_218
ip = ca2-pelican
port = 4002
[ls336_01]
asyncqueue = sct
desc = "Lakeshore 336 temperature controller"