Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip

cfg/main/mb11.cfg

@@ -25,7 +25,7 @@ class = secop_psi.mercury.TemperatureAutoFlow
 description = static heat exchanger temperature
 output_module = htr_stat
 needle_valve = p_stat
-slot = DB6.T1,DB1.H1
+slot = DB6.T1
 io = itc1
 tolerance = 0.1
 
@@ -56,7 +56,7 @@ class = secop_psi.mercury.TemperatureAutoFlow
 description = dynamic heat exchanger temperature
 output_module = htr_dyn
 needle_valve = p_dyn
-slot = DB7.T1,DB2.H1
+slot = DB7.T1
 io = itc1
 tolerance = 0.1
 
@@ -98,7 +98,7 @@ io = ips
 class = secop_psi.mercury.TemperatureLoop
 description = neck heater 1 temperature
 output_module = htr_neck1
-slot = MB1.T1,MB0.H1
+slot = MB1.T1
 io = itc2
 tolerance = 1
 
@@ -112,7 +112,7 @@ io = itc2
 class = secop_psi.mercury.TemperatureLoop
 description = neck heater 2 temperature
 output_module = htr_neck2
-slot = DB6.T1,DB1.H1
+slot = DB6.T1
 io = itc2
 tolerance = 1
 
@@ -126,7 +126,7 @@ io = itc2
 class = secop_psi.mercury.TemperatureLoop
 description = static needle valve temperature
 output_module = htr_nvs
-slot = DB7.T1,DB2.H1
+slot = DB7.T1
 io = itc2
 tolerance = 0.1
 
@@ -140,7 +140,7 @@ io = itc2
 class = secop_psi.mercury.TemperatureLoop
 description = dynamic needle valve heater temperature
 output_module = htr_nvd
-slot = DB8.T1,DB3.H1
+slot = DB8.T1
 io = itc2
 tolerance = 0.1
 

cfg/stick/dil5.cfg

@@ -10,17 +10,17 @@ class = secop_psi.mercury.IO
 description = connection to triton software
 uri = tcp://linse-dil5:33576
 
-#[ts]
-#class = secop_psi.switching_sensor.Sensor
-#description = either T_mix or T_mix_wup, depending on T
-#lower = T_mix
-#upper = T_mix_wup
-#switch_range = (1.5, 4)
-
 [ts]
-class = secop_psi.triton.TemperatureSensor
+class = secop_psi.triton.TemperatureLoop
 description = mix. chamber temperature
 slot = T5
+output_module = htr_mix
+io = triton
+
+[htr_mix]
+class = secop_psi.triton.HeaterOutput
+description = mix. chamber heater
+slot = H1
 io = triton
 
 [T_sorb]