diff --git a/cfg/main/ori3_cfg.py b/cfg/main/ori3_cfg.py index 82486de..7713010 100644 --- a/cfg/main/ori3_cfg.py +++ b/cfg/main/ori3_cfg.py @@ -58,6 +58,12 @@ Mod('hemot', sea_object='hemot', ) +Mod('nvflow', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + sea_object='nvflow', +) + Mod('table', 'frappy_psi.sea.SeaReadable', '', io='sea_main', diff --git a/cfg/sea/ori3.config.json b/cfg/sea/ori3.config.json index c960299..230cff2 100644 --- a/cfg/sea/ori3.config.json +++ b/cfg/sea/ori3.config.json @@ -237,10 +237,10 @@ {"path": "", "type": "enum", "enum": {"xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10}, {"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, -{"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3}, +{"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"}, {"path": "eco", "type": "bool", "readonly": false, "cmd": "hepump eco", "visibility": 3}, {"path": "auto", "type": "bool", "readonly": false, "cmd": "hepump auto", "visibility": 3}, -{"path": "valve", "type": "enum", "enum": {"closed": 0, "closing": 1, "opening": 2, "opened": 3, "undefined": 4}, "readonly": false, "cmd": "hepump valve", "visibility": 3}, +{"path": "valve", "type": "enum", "enum": {"closed": 0, "closing": 1, "opening": 2, "opened": 3, "undefined": 4}, "readonly": false, "cmd": "hepump valve"}, {"path": "eco_t_lim", "type": "float", "readonly": false, "cmd": "hepump eco_t_lim", "description": "switch off eco mode when T_set < eco_t_lim and T < eco_t_lim * 2", "visibility": 3}, {"path": "calib", "type": "float", "readonly": false, "cmd": "hepump calib", "visibility": 3}, {"path": "health", "type": "float"}]}, @@ -278,6 +278,16 @@ {"path": "customadr", "type": "text", "readonly": false, "cmd": "hemot customadr"}, {"path": "custompar", "type": "float", "readonly": false, "cmd": "hemot custompar"}]}, +"nvflow": {"base": "/nvflow", "params": [ +{"path": "", "type": "float", "kids": 7}, +{"path": "send", "type": "text", "readonly": false, "cmd": "nvflow send", "visibility": 3}, +{"path": "status", "type": "text", "visibility": 3}, +{"path": "stddev", "type": "float"}, +{"path": "nsamples", "type": "int", "readonly": false, "cmd": "nvflow nsamples"}, +{"path": "offset", "type": "float", "readonly": false, "cmd": "nvflow offset"}, +{"path": "scale", "type": "float", "readonly": false, "cmd": "nvflow scale"}, +{"path": "save", "type": "bool", "readonly": false, "cmd": "nvflow save", "description": "unchecked: current calib is not saved. set checked: save calib"}]}, + "table": {"base": "/table", "params": [ {"path": "", "type": "none", "kids": 17}, {"path": "send", "type": "text", "readonly": false, "cmd": "table send", "visibility": 3}, diff --git a/cfg/stick/dil5_cfg.py b/cfg/stick/dil5_cfg.py index 1f5d38a..a31867b 100644 --- a/cfg/stick/dil5_cfg.py +++ b/cfg/stick/dil5_cfg.py @@ -7,7 +7,7 @@ Mod('triton', 'frappy_psi.mercury.IO', 'connection to triton software', uri='tcp://linse-dil5:33576', - timeout=5.0, + timeout=25.0, ) Mod('ts', @@ -23,6 +23,7 @@ Mod('htr_mix', 'mix. chamber heater', slot='H1,T5', io='triton', + resistivity = 100 ) Mod('htr_sorb',