From ab918a33ae4af7c61d77548e0ed4639ee734ab13 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Thu, 23 Nov 2023 15:56:23 +0100 Subject: [PATCH] cc: replace bool by enum in cc.hav and cc.nav --- cfg/sea/ccr2.config.json | 4 ++-- cfg/sea/ccr2ht.config.json | 4 ++-- cfg/sea/ccr3.config.json | 4 ++-- cfg/sea/ccrpe.config.json | 4 ++-- cfg/sea/ccrpe_lowT.config.json | 4 ++-- cfg/sea/cti5.config.json | 4 ++-- cfg/sea/eurotherm.config.json | 4 ++-- cfg/sea/fftf.config.json | 4 ++-- cfg/sea/fs.config.json | 4 ++-- cfg/sea/ft.config.json | 4 ++-- cfg/sea/fw.config.json | 4 ++-- cfg/sea/haake.config.json | 4 ++-- cfg/sea/haakeuro.config.json | 4 ++-- cfg/sea/ill1.config.json | 4 ++-- cfg/sea/ill2.config.json | 4 ++-- cfg/sea/ill3.config.json | 4 ++-- cfg/sea/ill4.config.json | 4 ++-- cfg/sea/ill5.config.json | 4 ++-- cfg/sea/ill5pgas5.config.json | 8 ++++---- cfg/sea/jtccr.config.json | 8 ++++---- cfg/sea/ma02.config.json | 4 ++-- cfg/sea/ma10.config.json | 4 ++-- cfg/sea/ma11.config.json | 4 ++-- cfg/sea/ma15.config.json | 4 ++-- cfg/sea/ma6.config.json | 4 ++-- cfg/sea/ma6_sampleheat.config.json | 4 ++-- cfg/sea/ma7.config.json | 4 ++-- cfg/sea/ma7_sampleheat.config.json | 4 ++-- cfg/sea/ma7two.config.json | 4 ++-- cfg/sea/mbe.config.json | 4 ++-- cfg/sea/ori3.config.json | 4 ++-- cfg/sea/ori4.config.json | 4 ++-- cfg/sea/ori6.config.json | 4 ++-- cfg/sea/ori7.config.json | 4 ++-- cfg/sea/rt.config.json | 4 ++-- cfg/sea/variox.config.json | 4 ++-- frappy/protocol/dispatcher.py | 3 +++ frappy/protocol/interface/tcp.py | 1 + 38 files changed, 80 insertions(+), 76 deletions(-) diff --git a/cfg/sea/ccr2.config.json b/cfg/sea/ccr2.config.json index af0894c..cd273d1 100644 --- a/cfg/sea/ccr2.config.json +++ b/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"}, diff --git a/cfg/sea/ccr2ht.config.json b/cfg/sea/ccr2ht.config.json index ea4eb27..78e8992 100644 --- a/cfg/sea/ccr2ht.config.json +++ b/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"}, diff --git a/cfg/sea/ccr3.config.json b/cfg/sea/ccr3.config.json index 371e3fc..40c4055 100644 --- a/cfg/sea/ccr3.config.json +++ b/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"}, diff --git a/cfg/sea/ccrpe.config.json b/cfg/sea/ccrpe.config.json index cdd649d..dcb5f67 100644 --- a/cfg/sea/ccrpe.config.json +++ b/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}, diff --git a/cfg/sea/ccrpe_lowT.config.json b/cfg/sea/ccrpe_lowT.config.json index 1155b6b..ab5933f 100644 --- a/cfg/sea/ccrpe_lowT.config.json +++ b/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}, diff --git a/cfg/sea/cti5.config.json b/cfg/sea/cti5.config.json index dd05bd6..302f10f 100644 --- a/cfg/sea/cti5.config.json +++ b/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"}, diff --git a/cfg/sea/eurotherm.config.json b/cfg/sea/eurotherm.config.json index e8e2bc7..b4dbdf5 100644 --- a/cfg/sea/eurotherm.config.json +++ b/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}, diff --git a/cfg/sea/fftf.config.json b/cfg/sea/fftf.config.json index 9b13d99..00b1e65 100644 --- a/cfg/sea/fftf.config.json +++ b/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"}, diff --git a/cfg/sea/fs.config.json b/cfg/sea/fs.config.json index a62740b..e91a130 100644 --- a/cfg/sea/fs.config.json +++ b/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}, diff --git a/cfg/sea/ft.config.json b/cfg/sea/ft.config.json index 853eace..fbf8ab6 100644 --- a/cfg/sea/ft.config.json +++ b/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}, diff --git a/cfg/sea/fw.config.json b/cfg/sea/fw.config.json index 4c3261f..3c86f02 100644 --- a/cfg/sea/fw.config.json +++ b/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}, diff --git a/cfg/sea/haake.config.json b/cfg/sea/haake.config.json index e8e2bc7..b4dbdf5 100644 --- a/cfg/sea/haake.config.json +++ b/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}, diff --git a/cfg/sea/haakeuro.config.json b/cfg/sea/haakeuro.config.json index e8e2bc7..b4dbdf5 100644 --- a/cfg/sea/haakeuro.config.json +++ b/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}, diff --git a/cfg/sea/ill1.config.json b/cfg/sea/ill1.config.json index c960299..fc93597 100644 --- a/cfg/sea/ill1.config.json +++ b/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"}, diff --git a/cfg/sea/ill2.config.json b/cfg/sea/ill2.config.json index c960299..fc93597 100644 --- a/cfg/sea/ill2.config.json +++ b/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"}, diff --git a/cfg/sea/ill3.config.json b/cfg/sea/ill3.config.json index 2e15a12..75b3aac 100644 --- a/cfg/sea/ill3.config.json +++ b/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"}, diff --git a/cfg/sea/ill4.config.json b/cfg/sea/ill4.config.json index c960299..fc93597 100644 --- a/cfg/sea/ill4.config.json +++ b/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"}, diff --git a/cfg/sea/ill5.config.json b/cfg/sea/ill5.config.json index 1e1c09c..716d97b 100644 --- a/cfg/sea/ill5.config.json +++ b/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"}, diff --git a/cfg/sea/ill5pgas5.config.json b/cfg/sea/ill5pgas5.config.json index 35a52ad..b90a320 100644 --- a/cfg/sea/ill5pgas5.config.json +++ b/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}, diff --git a/cfg/sea/jtccr.config.json b/cfg/sea/jtccr.config.json index 7b8395d..f23cd16 100644 --- a/cfg/sea/jtccr.config.json +++ b/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}, diff --git a/cfg/sea/ma02.config.json b/cfg/sea/ma02.config.json index 32af36c..8a683c8 100644 --- a/cfg/sea/ma02.config.json +++ b/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"}, diff --git a/cfg/sea/ma10.config.json b/cfg/sea/ma10.config.json index f5ce954..0f4e490 100644 --- a/cfg/sea/ma10.config.json +++ b/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"}, diff --git a/cfg/sea/ma11.config.json b/cfg/sea/ma11.config.json index 9cc5b5e..de4bb0d 100644 --- a/cfg/sea/ma11.config.json +++ b/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"}, diff --git a/cfg/sea/ma15.config.json b/cfg/sea/ma15.config.json index e53a41f..bae985f 100644 --- a/cfg/sea/ma15.config.json +++ b/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"}, diff --git a/cfg/sea/ma6.config.json b/cfg/sea/ma6.config.json index d2ca2a3..197a67b 100644 --- a/cfg/sea/ma6.config.json +++ b/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"}, diff --git a/cfg/sea/ma6_sampleheat.config.json b/cfg/sea/ma6_sampleheat.config.json index 358855b..1b24239 100644 --- a/cfg/sea/ma6_sampleheat.config.json +++ b/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"}, diff --git a/cfg/sea/ma7.config.json b/cfg/sea/ma7.config.json index 5620b86..b6e45a6 100644 --- a/cfg/sea/ma7.config.json +++ b/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"}, diff --git a/cfg/sea/ma7_sampleheat.config.json b/cfg/sea/ma7_sampleheat.config.json index bf2d7a9..eecd44d 100644 --- a/cfg/sea/ma7_sampleheat.config.json +++ b/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"}, diff --git a/cfg/sea/ma7two.config.json b/cfg/sea/ma7two.config.json index f2bd933..8303310 100644 --- a/cfg/sea/ma7two.config.json +++ b/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"}, diff --git a/cfg/sea/mbe.config.json b/cfg/sea/mbe.config.json index 27f2d21..f7eaa1d 100644 --- a/cfg/sea/mbe.config.json +++ b/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"}, diff --git a/cfg/sea/ori3.config.json b/cfg/sea/ori3.config.json index 230cff2..b467442 100644 --- a/cfg/sea/ori3.config.json +++ b/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"}, diff --git a/cfg/sea/ori4.config.json b/cfg/sea/ori4.config.json index b1e84ae..92c9f2d 100644 --- a/cfg/sea/ori4.config.json +++ b/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"}, diff --git a/cfg/sea/ori6.config.json b/cfg/sea/ori6.config.json index 45d102b..cc76f3b 100644 --- a/cfg/sea/ori6.config.json +++ b/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"}, diff --git a/cfg/sea/ori7.config.json b/cfg/sea/ori7.config.json index 89131b8..b85e319 100644 --- a/cfg/sea/ori7.config.json +++ b/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"}, diff --git a/cfg/sea/rt.config.json b/cfg/sea/rt.config.json index 501ea3e..a38de19 100644 --- a/cfg/sea/rt.config.json +++ b/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}, diff --git a/cfg/sea/variox.config.json b/cfg/sea/variox.config.json index cb37fb5..8d3ede9 100644 --- a/cfg/sea/variox.config.json +++ b/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"}, diff --git a/frappy/protocol/dispatcher.py b/frappy/protocol/dispatcher.py index cc76225..1de1113 100644 --- a/frappy/protocol/dispatcher.py +++ b/frappy/protocol/dispatcher.py @@ -489,6 +489,9 @@ class Dispatcher: modobj.setRemoteLogging(conn, level) def handle_logging(self, conn, specifier, level): + if specifier == '#': + self.log.handlers[1].setLevel(int(level)) + return LOGGING_REPLY, specifier, level if specifier and specifier != '.': modobj = self._modules[specifier] modobj.setRemoteLogging(conn, level) diff --git a/frappy/protocol/interface/tcp.py b/frappy/protocol/interface/tcp.py index cd39ce2..8f688cb 100644 --- a/frappy/protocol/interface/tcp.py +++ b/frappy/protocol/interface/tcp.py @@ -143,6 +143,7 @@ class TCPRequestHandler(socketserver.BaseRequestHandler): if not data: self.log.error('should not reply empty data!') return + self.log.debug('send %r', data) outdata = encode_msg_frame(*data) with self.send_lock: if self.running: