From ea960f2250e30d11443d26e6200ce051d85123c9 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Tue, 23 Aug 2022 17:21:01 +0200 Subject: [PATCH] fix ln2fill enum --- cfg/sea/ill1.config.json | 2 +- cfg/sea/ill5pgas5.config.json | 2 +- cfg/sea/ma02.config.json | 2 +- cfg/sea/ma10.config.json | 2 +- cfg/sea/ma11.config.json | 6 ++++-- cfg/sea/ma6.config.json | 4 ++-- cfg/sea/ma7.config.json | 4 ++-- cfg/sea/ori4.config.json | 2 +- cfg/sea/ori6.config.json | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/cfg/sea/ill1.config.json b/cfg/sea/ill1.config.json index e5c6d60..c960299 100644 --- a/cfg/sea/ill1.config.json +++ b/cfg/sea/ill1.config.json @@ -219,7 +219,7 @@ {"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]}, "ln2fill": {"base": "/ln2fill", "params": [ -{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "ln2fill", "kids": 3}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "ln2fill", "kids": 3}, {"path": "send", "type": "text", "readonly": false, "cmd": "ln2fill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}]}, diff --git a/cfg/sea/ill5pgas5.config.json b/cfg/sea/ill5pgas5.config.json index 741c1f8..35a52ad 100644 --- a/cfg/sea/ill5pgas5.config.json +++ b/cfg/sea/ill5pgas5.config.json @@ -282,7 +282,7 @@ {"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]}, "ln2fill": {"base": "/ln2fill", "params": [ -{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "ln2fill", "kids": 3}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "ln2fill", "kids": 3}, {"path": "send", "type": "text", "readonly": false, "cmd": "ln2fill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}]}, diff --git a/cfg/sea/ma02.config.json b/cfg/sea/ma02.config.json index af757bc..d13c63c 100644 --- a/cfg/sea/ma02.config.json +++ b/cfg/sea/ma02.config.json @@ -305,7 +305,7 @@ {"path": "mode", "type": "enum", "enum": {"slow": 0, "fast (switches to slow automatically after filling)": 1}, "readonly": false, "cmd": "lev mode"}]}, "hefill": {"base": "/hefill", "params": [ -{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, {"path": "send", "type": "text", "readonly": false, "cmd": "hefill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, diff --git a/cfg/sea/ma10.config.json b/cfg/sea/ma10.config.json index 53a232e..f5ce954 100644 --- a/cfg/sea/ma10.config.json +++ b/cfg/sea/ma10.config.json @@ -346,7 +346,7 @@ {"path": "tubecoolingminutes", "type": "float", "readonly": false, "cmd": "ln2fill tubecoolingminutes"}]}, "hefill": {"base": "/hefill", "params": [ -{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, {"path": "send", "type": "text", "readonly": false, "cmd": "hefill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, diff --git a/cfg/sea/ma11.config.json b/cfg/sea/ma11.config.json index 126e3d7..9cc5b5e 100644 --- a/cfg/sea/ma11.config.json +++ b/cfg/sea/ma11.config.json @@ -269,7 +269,9 @@ {"path": "pullup", "type": "float", "readonly": false, "cmd": "hemot pullup"}, {"path": "eeprom", "type": "enum", "enum": {"ok": 0, "dirty": 1, "save": 2, "load": 3}, "readonly": false, "cmd": "hemot eeprom"}, {"path": "customadr", "type": "text", "readonly": false, "cmd": "hemot customadr"}, -{"path": "custompar", "type": "float", "readonly": false, "cmd": "hemot custompar"}]}, "ln2fill": {"base": "/ln2fill", "params": [{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "ln2fill", "kids": 14}, +{"path": "custompar", "type": "float", "readonly": false, "cmd": "hemot custompar"}]}, +"ln2fill": {"base": "/ln2fill", "params": [ +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "ln2fill", "kids": 14}, {"path": "send", "type": "text", "readonly": false, "cmd": "ln2fill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, @@ -283,7 +285,7 @@ {"path": "maxholdhours", "type": "float", "readonly": false, "cmd": "ln2fill maxholdhours"}, {"path": "tolerance", "type": "float", "readonly": false, "cmd": "ln2fill tolerance"}, {"path": "badreadingminutes", "type": "float", "readonly": false, "cmd": "ln2fill badreadingminutes"}, -{"path": "tubecoolingminutes", "type": "float", "readonly": false, "cmd": "ln2fill tubecoolingminutes"}]}, "hefill": {"base": "/hefill", "params": [{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, +{"path": "tubecoolingminutes", "type": "float", "readonly": false, "cmd": "ln2fill tubecoolingminutes"}]}, "hefill": {"base": "/hefill", "params": [{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, {"path": "send", "type": "text", "readonly": false, "cmd": "hefill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, diff --git a/cfg/sea/ma6.config.json b/cfg/sea/ma6.config.json index b16c12c..0ebe15e 100644 --- a/cfg/sea/ma6.config.json +++ b/cfg/sea/ma6.config.json @@ -281,7 +281,7 @@ {"path": "custompar", "type": "float", "readonly": false, "cmd": "hemot custompar"}]}, "ln2fill": {"base": "/ln2fill", "params": [ -{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "ln2fill", "kids": 14}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "ln2fill", "kids": 14}, {"path": "send", "type": "text", "readonly": false, "cmd": "ln2fill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, @@ -298,7 +298,7 @@ {"path": "tubecoolingminutes", "type": "float", "readonly": false, "cmd": "ln2fill tubecoolingminutes"}]}, "hefill": {"base": "/hefill", "params": [ -{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, {"path": "send", "type": "text", "readonly": false, "cmd": "hefill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, diff --git a/cfg/sea/ma7.config.json b/cfg/sea/ma7.config.json index 470a38c..74d2e2f 100644 --- a/cfg/sea/ma7.config.json +++ b/cfg/sea/ma7.config.json @@ -208,7 +208,7 @@ {"path": "autoflow/flowtarget", "type": "float"}, {"path": "calib", "type": "none", "kids": 2}, {"path": "calib/ln_per_min_per_mbar", "type": "float", "readonly": false, "cmd": "nv calib/ln_per_min_per_mbar"}, -{"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]}, "hefill": {"base": "/hefill", "params": [{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, +{"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]}, "hefill": {"base": "/hefill", "params": [{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "hefill", "kids": 16}, {"path": "send", "type": "text", "readonly": false, "cmd": "hefill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, @@ -264,7 +264,7 @@ {"path": "nopumpfeedback", "type": "bool", "readonly": false, "cmd": "hemot nopumpfeedback"}, {"path": "eeprom", "type": "enum", "enum": {"ok": 0, "dirty": 1, "save": 2, "load": 3}, "readonly": false, "cmd": "hemot eeprom"}, {"path": "customadr", "type": "text", "readonly": false, "cmd": "hemot customadr"}, -{"path": "custompar", "type": "float", "readonly": false, "cmd": "hemot custompar"}]}, "ln2fill": {"base": "/ln2fill", "params": [{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "ln2fill", "kids": 14}, +{"path": "custompar", "type": "float", "readonly": false, "cmd": "hemot custompar"}]}, "ln2fill": {"base": "/ln2fill", "params": [{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "ln2fill", "kids": 14}, {"path": "send", "type": "text", "readonly": false, "cmd": "ln2fill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}, diff --git a/cfg/sea/ori4.config.json b/cfg/sea/ori4.config.json index 8b881f2..b1e84ae 100644 --- a/cfg/sea/ori4.config.json +++ b/cfg/sea/ori4.config.json @@ -234,7 +234,7 @@ {"path": "custompar", "type": "float", "readonly": false, "cmd": "nvmot custompar"}]}, "ln2fill": {"base": "/ln2fill", "params": [{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "ln2fill", "kids": 3}, {"path": "send", "type": "text", "readonly": false, "cmd": "ln2fill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, -{"path": "state", "type": "text"}]}, "hefill": {"base": "/hefill", "params": [{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "hefill", "kids": 6}, +{"path": "state", "type": "text"}]}, "hefill": {"base": "/hefill", "params": [{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "hefill", "kids": 6}, {"path": "send", "type": "text", "readonly": false, "cmd": "hefill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "fast", "type": "enum", "enum": {"slow": 0, "fast": 1}, "readonly": false, "cmd": "cc hf"}, diff --git a/cfg/sea/ori6.config.json b/cfg/sea/ori6.config.json index d892321..45d102b 100644 --- a/cfg/sea/ori6.config.json +++ b/cfg/sea/ori6.config.json @@ -217,7 +217,7 @@ {"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]}, "ln2fill": {"base": "/ln2fill", "params": [ -{"path": "", "type": "enum", "enum": {"no fill valve": 2}, "readonly": false, "cmd": "ln2fill", "kids": 3}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2}, "readonly": false, "cmd": "ln2fill", "kids": 3}, {"path": "send", "type": "text", "readonly": false, "cmd": "ln2fill send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "state", "type": "text"}]},