adopt sea amd cfg changes from wip

Change-Id: I83b82ece53e0cb3394551c122561a042499527d8

cfg/main/ccrpe_cfg.py

@@ -9,8 +9,9 @@ Mod('sea_main',
 )
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
-    io = 'sea_main',
+    io='sea_main',
-    sea_object = 'tt',
+    sea_object='tt',
+    rel_paths=['.', 'tm'],
 )
 Mod('ts',
     'frappy_psi.sea.SeaReadable', '',

cfg/main/ccrpe_lowT_cfg.py

@@ -1,39 +1,37 @@
 Node('cfg/main/ccrpe_lowT.cfg',
      '4 K closed cycle cryostat (PE cell)',
-     interface='5000',
-     name='ccrpe_lowT',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for ccrpe_lowT.config',
     config='ccrpe_lowT.config',
     service='main',
 )
 
 Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='tt',
     rel_paths=['.', 'tm'],
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',
     rel_paths=['ts'],
 )
 
 Mod('te',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',
     rel_paths=['te'],
 )
 
 Mod('warmup',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='warmup',
 )

cfg/main/cryosim_cfg.py

@@ -1,6 +1,5 @@
 Node('cyrosim.psi.ch',
      'cryo simulation (similar ppms simulation)',
-     interface='tcp://5000',
 )
 
 Mod('tt',

cfg/main/fftf_cfg.py

@@ -36,7 +36,7 @@ Mod('vacuumpump',
 )
 
 Mod('table',
-    'frappy_psi.sea.SeaModule',
+    'frappy_psi.sea.SeaModule', '',
     io='sea_main',
     sea_object='table',
 )

cfg/main/ill3_cfg.py

@@ -1,24 +1,22 @@
 Node('cfg/main/ill3.cfg',
      'orange cryofurnace with 70 mm sample space (low T)',
-     interface='5000',
-     name='ill3',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for ill3.config',
     config='ill3.config',
     service='main',
 )
 
 Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='tt',
 )
 
 Mod('cc',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='cc',
     extra_modules=['h'],
@@ -26,49 +24,49 @@ Mod('cc',
 )
 
 Mod('lev',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     single_module='cc.h',
 )
 
 Mod('nv',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='nv',
 )
 
 Mod('ln2fill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='ln2fill',
 )
 
 Mod('hefill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hefill',
 )
 
 Mod('hepump',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hepump',
 )
 
 Mod('hemot',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='hemot',
 )
 
 Mod('nvflow',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='nvflow',
 )
 
 Mod('table',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='table',
 )

cfg/main/ma6_cfg.py

@@ -77,4 +77,5 @@ Mod('om',
     encoder_mode='CHECK',
     target_min=-180,
     target_max=360,
+    backlash=-1,
 )

cfg/main/ma7two_cfg.py

@@ -1,104 +1,102 @@
 Node('cfg/main/ma7two.cfg',
      '6.8 Tesla horizontal cryomagnet with two heater loops',
-     interface='5000',
-     name='ma7two',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for ma7two.config',
     config='ma7two.config',
     service='main',
 )
 
 Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='tt',
 )
 
 Mod('cc',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='cc',
 )
 
 Mod('nv',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='nv',
 )
 
 Mod('hefill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hefill',
 )
 
 Mod('hepump',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hepump',
 )
 
 Mod('hemot',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='hemot',
 )
 
 Mod('nvflow',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='nvflow',
 )
 
 Mod('ln2fill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='ln2fill',
 )
 
 Mod('mf',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='mf',
 )
 
 Mod('lev',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='lev',
 )
 
 Mod('tcoil1',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tcoil',
     rel_paths=['ta'],
 )
 
 Mod('tcoil2',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tcoil',
     rel_paths=['tb'],
 )
 
 Mod('table',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='table',
 )
 
 Mod('om_io',
-    'secop_psi.phytron.PhytronIO',
+    'frappy_psi.phytron.PhytronIO',
     'dom motor IO',
     uri='ma7-ts.psi.ch:3007',
 )
 
 Mod('om',
-    'secop_psi.phytron.Motor',
+    'frappy_psi.phytron.Motor',
     'stick rotation',
     io='om_io',
     encoder_mode='CHECK',

cfg/main/magsim_cfg.py

@@ -1,6 +1,5 @@
 Node('magsim.psi.ch',
      'cryo magnet simulation (similar to ppms simulation)',
-     interface='tcp://5000',
 )
 
 Mod('tt',

cfg/main/mb11_cfg.py

@@ -1,8 +1,9 @@
 Node('mb11.psi.ch',
      'MB11 11 Tesla - 100 mm cryomagnet',
-     interface='tcp://5000',
 )
 
+sea_cfg = 'mb11.config'
+
 Mod('itc1',
     'frappy_psi.mercury.IO',
     'ITC for heat exchanger and pressures',
@@ -29,6 +30,7 @@ Mod('T_stat',
     slot='DB6.T1',
     io='itc1',
     tolerance=0.1,
+    flowpars=((1,5), (2, 20)),
 )
 
 Mod('htr_stat',
@@ -203,8 +205,8 @@ Mod('om',
     'frappy_psi.phytron.Motor',
     'stick rotation, typically used for omega',
     io='om_io',
-    target_min=-180,
+    target_min=-360,
     target_max=360,
     encoder_mode='NO',
-    target=Param(min=-180, max=360)
+    target=Param(min=-360, max=360),
 )

cfg/main/mb11std_cfg.py

@@ -1,6 +1,5 @@
 Node('mb11.psi.ch',
      'MB11 11 Tesla - 100 mm cryomagnet',
-     interface='tcp://5000',
 )
 
 Mod('itc1',
@@ -29,6 +28,7 @@ Mod('T_stat',
     slot='DB6.T1',
     io='itc1',
     tolerance=0.1,
+    flowpars=((1,5), (2, 20)),
 )
 
 Mod('htr_stat',
@@ -59,7 +59,7 @@ Mod('p_stat',
     'static needle valve pressure',
     output_module='pos_stat',
     settling_time=60.0,
-    slot='DB5.P1,DB3.G1',
+    slot='DB5.P1',
     io='itc1',
     tolerance=1.0,
     value=Param(
@@ -96,7 +96,7 @@ Mod('p_dyn',
     'dynamic needle valve pressure',
     output_module='pos_dyn',
     settling_time=60.0,
-    slot='DB8.P1,DB4.G1',
+    slot='DB8.P1',
     io='itc1',
     tolerance=1.0,
     value=Param(
@@ -133,7 +133,7 @@ Mod('lev',
 
 Mod('n2lev',
     'frappy_psi.mercury.N2Level',
-    'LHe level',
+    'LN2 level',
     slot='DB1.L1',
     io='ips',
 )
@@ -219,7 +219,8 @@ Mod('om',
     'frappy_psi.phytron.Motor',
     'stick rotation, typically used for omega',
     io='om_io',
-    target_min=-180,
+    target_min=-360,
     target_max=360,
     encoder_mode='NO',
+    target=Param(min=-360, max=360),
 )

cfg/main/rt_cfg.py

@@ -1,18 +1,16 @@
 Node('cfg/main/rt.cfg',
      'room temperature HRPT (pt1000)',
-     interface='5000',
-     name='rt',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for rt.config',
     config='rt.config',
     service='main',
 )
 
 Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     sea_object='tt',
     io='sea_main',
 )

cfg/main/varioxb_cfg.py

@@ -0,0 +1,183 @@
+Node('varioxb.psi.ch',
+     'VarioxB - 100 mm cryostat (not tested!)',
+)
+
+Mod('itc1',
+    'frappy_psi.mercury.IO',
+    'ITC for heat exchanger and pressures',
+    uri='mb11-ts:3001',
+)
+
+Mod('itc2',
+    'frappy_psi.mercury.IO',
+    'ITC for neck and nv heaters',
+    uri='mb11-ts:3002',
+)
+
+Mod('T_stat',
+    'frappy_psi.mercury.TemperatureAutoFlow',
+    'static heat exchanger temperature',
+    output_module='htr_stat',
+    needle_valve='p_stat',
+    slot='DB6.T1',
+    io='itc1',
+    tolerance=0.1,
+)
+
+Mod('htr_stat',
+    'frappy_psi.mercury.HeaterOutput',
+    'static heat exchanger heater',
+    slot='DB1.H1',
+    io='itc1',
+)
+
+Mod('p_stat',
+    'frappy_psi.mercury.PressureLoop',
+    'static needle valve pressure',
+    output_module='pos_stat',
+    settling_time=60.0,
+    slot='DB5.P1',
+    io='itc1',
+    tolerance=1.0,
+    value=Param(
+        unit='mbar_flow',
+    ),
+)
+
+Mod('pos_stat',
+    'frappy_psi.mercury.ValvePos',
+    'static needle valve position',
+    slot='DB5.P1,DB3.G1',
+    io='itc1',
+)
+
+Mod('T_dyn',
+    'frappy_psi.mercury.TemperatureAutoFlow',
+    'dynamic heat exchanger temperature',
+    output_module='htr_dyn',
+    needle_valve='p_dyn',
+    slot='DB7.T1',
+    io='itc1',
+    tolerance=0.1,
+)
+
+Mod('htr_dyn',
+    'frappy_psi.mercury.HeaterOutput',
+    'dynamic heat exchanger heater',
+    slot='DB2.H1',
+    io='itc1',
+)
+
+Mod('p_dyn',
+    'frappy_psi.mercury.PressureLoop',
+    'dynamic needle valve pressure',
+    output_module='pos_dyn',
+    settling_time=60.0,
+    slot='DB8.P1',
+    io='itc1',
+    tolerance=1.0,
+    value=Param(
+        unit='mbar_flow',
+    ),
+)
+
+Mod('pos_dyn',
+    'frappy_psi.mercury.ValvePos',
+    'dynamic needle valve position',
+    slot='DB8.P1,DB4.G1',
+    io='itc1',
+)
+
+Mod('lev',
+    'frappy_psi.mercury.HeLevel',
+    'LHe level',
+    slot='DB1.L1',
+    io='ips',
+)
+
+Mod('n2lev',
+    'frappy_psi.mercury.N2Level',
+    'LN2 level',
+    slot='DB1.L1',
+    io='ips',
+)
+
+Mod('T_neck1',
+    'frappy_psi.mercury.TemperatureLoop',
+    'neck heater 1 temperature',
+    output_module='htr_neck1',
+    slot='MB1.T1',
+    io='itc2',
+    tolerance=1.0,
+)
+
+Mod('htr_neck1',
+    'frappy_psi.mercury.HeaterOutput',
+    'neck heater 1 power',
+    slot='MB0.H1',
+    io='itc2',
+)
+
+Mod('T_neck2',
+    'frappy_psi.mercury.TemperatureLoop',
+    'neck heater 2 temperature',
+    output_module='htr_neck2',
+    slot='DB6.T1',
+    io='itc2',
+    tolerance=1.0,
+)
+
+Mod('htr_neck2',
+    'frappy_psi.mercury.HeaterOutput',
+    'neck heater 2 power',
+    slot='DB1.H1',
+    io='itc2',
+)
+
+Mod('T_nvs',
+    'frappy_psi.mercury.TemperatureLoop',
+    'static needle valve temperature',
+    output_module='htr_nvs',
+    slot='DB7.T1',
+    io='itc2',
+    tolerance=0.1,
+)
+
+Mod('htr_nvs',
+    'frappy_psi.mercury.HeaterOutput',
+    'static needle valve heater power',
+    slot='DB2.H1',
+    io='itc2',
+)
+
+Mod('T_nvd',
+    'frappy_psi.mercury.TemperatureLoop',
+    'dynamic needle valve heater temperature',
+    output_module='htr_nvd',
+    slot='DB8.T1',
+    io='itc2',
+    tolerance=0.1,
+)
+
+Mod('htr_nvd',
+    'frappy_psi.mercury.HeaterOutput',
+    'dynamic needle valve heater power',
+    slot='DB3.H1',
+    io='itc2',
+)
+
+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)
+)

cfg/sea/ccr2.config.json

@@ -80,7 +80,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -123,7 +123,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ccr2ht.config.json

@@ -86,7 +86,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -129,7 +129,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ccr3.config.json

@@ -85,7 +85,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -128,7 +128,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ccrpe.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/ccrpe_lowT.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/cti5.config.json

@@ -79,7 +79,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -122,7 +122,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/eurotherm.config.json

@@ -85,7 +85,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -128,7 +128,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/fftf.config.json

@@ -76,7 +76,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -119,7 +119,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/fs.config.json

@@ -85,7 +85,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -128,7 +128,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/ft.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/fw.config.json

@@ -102,7 +102,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -145,7 +145,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/haake.config.json

@@ -85,7 +85,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -128,7 +128,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/haakeuro.config.json

@@ -85,7 +85,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -128,7 +128,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/ill1.config.json

@@ -91,7 +91,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -134,7 +134,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ill2.config.json

@@ -91,7 +91,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -134,7 +134,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ill3.config.json

@@ -89,7 +89,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -132,7 +132,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ill4.config.json

@@ -91,7 +91,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -134,7 +134,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ill5.config.json

@@ -89,7 +89,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -132,7 +132,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ill5pgas5.config.json

@@ -154,7 +154,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -197,7 +197,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},
@@ -396,7 +396,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "pccu mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "pccu hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "pccu hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -439,7 +439,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "pccu nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "pccu nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "pccu nth", "visibility": 3},

cfg/sea/jtccr.config.json

@@ -141,7 +141,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "v mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "v hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "v hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -184,7 +184,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "v nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "v nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "v nth"},
@@ -264,7 +264,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -307,7 +307,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/ma02.config.json

@@ -92,7 +92,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -135,7 +135,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma10.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma11.config.json

@@ -109,7 +109,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -152,7 +152,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma15.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma6.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma6_sampleheat.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma7.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma7_sampleheat.config.json

@@ -108,7 +108,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -151,7 +151,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ma7two.config.json

@@ -77,7 +77,7 @@
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "hc", "type": "float"},
 {"path": "hu", "type": "float"},
 {"path": "hh", "type": "float", "readonly": false, "cmd": "cc hh"},
@@ -113,7 +113,7 @@
 {"path": "hs4", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/mbe.config.json

@@ -72,7 +72,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -115,7 +115,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ori3.config.json

@@ -91,7 +91,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -134,7 +134,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ori4.config.json

@@ -86,7 +86,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -129,7 +129,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ori6.config.json

@@ -89,7 +89,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -132,7 +132,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ori7.config.json

@@ -91,7 +91,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -134,7 +134,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/rt.config.json

@@ -50,7 +50,7 @@
 {"path": "mcr", "type": "float", "visibility": 3},
 {"path": "mot", "type": "float", "visibility": 3},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -93,7 +93,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},

cfg/sea/variox.config.json

@@ -91,7 +91,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -134,7 +134,7 @@
 {"path": "h5", "type": "float", "visibility": 3},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/stick/dil5_cfg.py

@@ -1,8 +1,9 @@
 Node('triton.psi.ch',
      'triton test',
-     interface='tcp://5000',
 )
 
+sea_cfg = 'dil5.stick'
+
 Mod('triton',
     'frappy_psi.mercury.IO',
     'connection to triton software',

cfg/stick/flamedil_cfg.py

@@ -1,6 +1,5 @@
 Node('triton.psi.ch',
      'triton test',
-     interface='tcp://5000',
 )
 
 Mod('T_mix',

cfg/stick/hvolt_long_cfg.py

@@ -1,18 +1,16 @@
 Node('cfg/stick/hvolt_long.cfg',
      'high voltage stick (extended can)',
-     interface='5000',
-     name='hvolt_long',
 )
 
 Mod('sea_stick',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'stick sea connection for hvolt_long.stick',
     config='hvolt_long.stick',
     service='stick',
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_stick',
     sea_object='tt',
     json_file='ma6.config.json',
@@ -20,7 +18,7 @@ Mod('ts',
 )
 
 Mod('hcp',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_stick',
     sea_object='hcp',
 )

cfg/stick/ill3stick_cfg.py

@@ -1,18 +1,16 @@
 Node('cfg/stick/ill3stick.cfg',
      'ILL3 standard sample stick',
-     interface='5000',
-     name='ill3stick',
 )
 
 Mod('sea_stick',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'SEA stick connection',
     config='ill3.stick',
     service='stick',
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_stick',
     sea_object='tt',
     json_file='ill3.config.json',

cfg/stick/mb11stick_cfg.py

@@ -1,4 +1,3 @@
 Node('mb11.stick.sea.psi.ch',
      'MB11 standard sample stick (do not use)',
-     interface='tcp://5000',
 )

cfg/stick/ori1stick_cfg.py

@@ -1,18 +1,16 @@
 Node('cfg/stick/ori1stick.cfg',
      'ORI1 standard sample stick',
-     interface='5000',
-     name='ori1stick',
 )
 
 Mod('sea_stick',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'SEA stick connection',
     config='ori1.stick',
     service='stick',
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_stick',
     sea_object='tt',
     json_file='ori1.config.json',

cfg/stick/ovenstick_cfg.py

@@ -1,18 +1,16 @@
 Node('cfg/stick/ovenstick.cfg',
      'oven stick for sans',
-     interface='5000',
-     name='ovenstick',
 )
 
 Mod('sea_stick',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'SEA stick connection',
     config='oven.stick',
     service='stick',
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_stick',
     sea_object='tt',
     json_file='ma7.config.json',

cfg/stick/oventwo_cfg.py

@@ -1,18 +1,16 @@
 Node('cfg/stick/oventwo.cfg',
      'oven stick for SANS',
-     interface='5000',
-     name='oventwo',
 )
 
 Mod('sea_stick',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'stick sea connection for oventwo.stick',
     config='oventwo.stick',
     service='stick',
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_stick',
     sea_object='ts',
 )

cfg/stick/sch_cfg.py

@@ -1,25 +1,23 @@
 # error creating warmup
 Node('cfg/stick/sch.cfg',
      'old sample changer for 100 mm orange cryo (4 samples, HRPT)',
-     interface='5000',
-     name='sch',
 )
 
 Mod('sea_stick',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'SEA connection to sch4',
     config='sch.stick',
     service='stick',
 )
 
 Mod('warmup',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     sea_object='warmup',
     io='sea_stick',
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     sea_object='tt',
     json_file='ori4.config.json',
     rel_paths=['ts'],

cfg/stick/varioxstick_cfg.py

@@ -1,18 +1,16 @@
 Node('cfg/stick/varioxstick.cfg',
      'Variox standard sample stick',
-     interface='5000',
-     name='varioxstick',
 )
 
 Mod('sea_stick',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'SEA stick connection',
     config='variox.stick',
     service='stick',
 )
 
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_stick',
     sea_object='tt',
     json_file='variox.config.json',

frappy_psi/sea.py

@@ -39,7 +39,6 @@ from os.path import expanduser, join, exists
 from frappy.client import ProxyClient
 from frappy.datatypes import ArrayOf, BoolType, \
     EnumType, FloatRange, IntRange, StringType
-from frappy.core import IDLE, BUSY, ERROR
 from frappy.errors import ConfigError, HardwareError, secop_error, CommunicationFailedError
 from frappy.lib import generalConfig, mkthread
 from frappy.lib.asynconn import AsynConn, ConnectionClosed
@@ -278,6 +277,9 @@ class SeaClient(ProxyClient, Module):
                         continue
                 else:
                     continue
+                # path from sea may contain double slash //
+                # this should be fixed, however in the meantime fix it here
+                path = path.replace('//', '/')
                 data = {'%s.geterror' % path: readerror.replace('ERROR: ', '')}
                 obj = None
                 flag = 'hdbevent'
@@ -642,10 +644,6 @@ class SeaModule(Module):
         if upd:
             upd(value, timestamp, readerror)
             return
-        self.announceUpdate(parameter, value, readerror, timestamp)
-        # self._update(module, parameter, value, timestamp, readerror)
-
-    def _update(self, module, parameter, value, timestamp, readerror):
         try:
             pobj = self.parameters[parameter]
         except KeyError:
@@ -672,36 +670,20 @@ class SeaModule(Module):
 
 
 class SeaReadable(SeaModule, Readable):
-    _readerror = None
-    _status = IDLE, ''
-
-    def update_value(self, value, timestamp, readerror):
-        # make sure status is always ERROR when reading value fails
-        self._readerror = readerror
-        if readerror:
-            self.read_status()
-            self.announceUpdate('value', value, readerror, timestamp)
-            # self._update(self.name, 'value', value, timestamp, readerror)
-        else:  # order is important
-            self.value = value
-            self.read_status()
 
     def update_status(self, value, timestamp, readerror):
         if readerror:
             value = repr(readerror)
         if value == '':
-            self._status = IDLE, ''
+            self.status = (self.Status.IDLE, '')
         else:
-            self._status = ERROR, value
+            self.status = (self.Status.ERROR, value)
-        self.read_status()
 
     def read_status(self):
-        if self._readerror:
+        return self.status
-            return ERROR, repr(self._readerror)
-        return self._status
 
 
-class SeaWritable(SeaReadable, Writable):
+class SeaWritable(SeaModule, Writable):
     def read_value(self):
         return self.target
 
@@ -711,13 +693,20 @@ class SeaWritable(SeaReadable, Writable):
             self.value = value
 
 
-class SeaDrivable(SeaReadable, Drivable):
+class SeaDrivable(SeaModule, Drivable):
+    _sea_status = ''
     _is_running = 0
 
     def earlyInit(self):
         super().earlyInit()
         self._run_event = threading.Event()
 
+    def read_status(self):
+        return self.status
+
+    # def read_target(self):
+    #    return self.target
+
     def write_target(self, value):
         self._run_event.clear()
         self.io.query(f'run {self.sea_object} {value}')
@@ -725,20 +714,25 @@ class SeaDrivable(SeaReadable, Drivable):
             self.log.warn('target changed but is_running stays 0')
         return value
 
+    def update_status(self, value, timestamp, readerror):
+        if not readerror:
+            self._sea_status = value
+            self.updateStatus()
+
     def update_is_running(self, value, timestamp, readerror):
         if not readerror:
             self._is_running = value
-            self.read_status()
+            self.updateStatus()
             if value:
                 self._run_event.set()
 
-    def read_status(self):
+    def updateStatus(self):
-        status = super().read_status()
+        if self._sea_status:
-        if self._is_running:
+            self.status = (self.Status.ERROR, self._sea_status)
-            if status[0] >= ERROR:
+        elif self._is_running:
-                return ERROR, 'BUSY + ' + status[1]
+            self.status = (self.Status.BUSY, 'driving')
-            return BUSY, 'driving'
+        else:
-        return status
+            self.status = (self.Status.IDLE, '')
 
     def updateTarget(self, module, parameter, value, timestamp, readerror):
         if value is not None: