[WIP] fixes for gas10ka / varioxB

treat proxy for io correctly

cfg/main/varioxb_cfg.py

@@ -1,17 +1,18 @@
 Node('varioxb.psi.ch',
-     'VarioxB - 100 mm cryostat (not tested!)',
+     'VarioxB - 100 mm cryostat',
+     interface='tcp://5000',
 )
 
 Mod('itc1',
     'frappy_psi.mercury.IO',
     'ITC for heat exchanger and pressures',
-    uri='mb11-ts:3001',
+    uri='linvb-ts:3001',
 )
 
 Mod('itc2',
     'frappy_psi.mercury.IO',
     'ITC for neck and nv heaters',
-    uri='mb11-ts:3002',
+    uri='linvb-ts:3002',
 )
 
 Mod('T_stat',
@@ -91,15 +92,15 @@ Mod('pos_dyn',
 Mod('lev',
     'frappy_psi.mercury.HeLevel',
     'LHe level',
-    slot='DB1.L1',
-    io='ips',
+    slot='DB4.L1',
+    io='itc2',
 )
 
 Mod('n2lev',
     'frappy_psi.mercury.N2Level',
     'LN2 level',
-    slot='DB1.L1',
-    io='ips',
+    slot='DB4.L1',
+    io='itc2',
 )
 
 Mod('T_neck1',
@@ -166,18 +167,18 @@ Mod('htr_nvd',
     io='itc2',
 )
 
-Mod('om_io',
-    'frappy_psi.phytron.PhytronIO',
-    'dom motor IO',
-    uri='mb11-ts.psi.ch:3004',
-)
+#Mod('om_io',
+#    'frappy_psi.phytron.PhytronIO',
+#    'dom motor IO',
+#    uri='mb11-ts.psi.ch:3004',
+#)
 
-Mod('om',
-    'frappy_psi.phytron.Motor',
-    'stick rotation, typically used for omega',
-    io='om_io',
-    target_min=-180,
-    target_max=360,
-    encoder_mode='NO',
-    target=Param(min=-180, max=360)
-)
+#Mod('om',
+#    'frappy_psi.phytron.Motor',
+#    'stick rotation, typically used for omega',
+#    io='om_io',
+#    target_min=-180,
+#    target_max=360,
+#    encoder_mode='NO',
+#    target=Param(min=-180, max=360)
+#)

cfg/stick/gas10ka_cfg.py

@@ -0,0 +1,43 @@
+import os
+
+Node('gas10ka.psi.ch',
+     'gas pressure stick 10 kbar',
+)
+
+frappy_main_port = os.environ.get('FRAPPY_MAIN_PORT', 0)
+
+Mod('itc1_',
+    'frappy.core.Proxy',
+    'itc1 on main frappy server',
+    remote_class = 'frappy_psi.mercury.IO',
+    uri = f'tcp://localhost:{frappy_main_port}',
+    module='itc1',
+    # export = False,
+)
+
+
+Mod('res_sample',
+    'frappy_psi.mercury.RawSensor',
+    'raw sensor',
+    io='itc1_',
+    slot='MB1.T1',
+)
+
+Mod('htr_sample',
+    'frappy_psi.mercury.HeaterUpdate',
+    'sample stick heater power',
+    slot='MB0.H1,MB1.T1',
+    io='itc1_',
+)
+
+Mod('T_sample',
+    'frappy_psi.softcal.SoftPiLoop',
+    'sample T',
+    meaning=['temperature', 20],
+    rawsensor='res_sample',
+    output_module='htr_sample',
+    p=1,
+    i=0.01,
+    calib='X161269',
+    value=Param(unit='K'),
+)