From 3563a0db167a249a7e70b546d92b54d17714d875 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Tue, 31 May 2022 16:44:53 +0200 Subject: [PATCH] fix ill4 --- cfg/main/ill4.cfg | 21 +++++++-------- cfg/sea/ill4.config.json | 58 ++++++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/cfg/main/ill4.cfg b/cfg/main/ill4.cfg index 39950d6..6662d10 100644 --- a/cfg/main/ill4.cfg +++ b/cfg/main/ill4.cfg @@ -10,48 +10,47 @@ service = main [tt] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt [cc] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = cc extra_modules = h visibility = 3 [lev] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main single_module = cc.h [nv] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = nv [ln2fill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = ln2fill [hefill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hefill [hepump] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hepump [hemot] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = hemot -visibility = 3 [table] -class = secop_psi.sea.SeaModule -iodev = sea_main +class = secop_psi.sea.SeaReadable +io = sea_main sea_object = table diff --git a/cfg/sea/ill4.config.json b/cfg/sea/ill4.config.json index 76cdb57..c960299 100644 --- a/cfg/sea/ill4.config.json +++ b/cfg/sea/ill4.config.json @@ -1,8 +1,9 @@ {"tt": {"base": "/tt", "params": [ -{"path": "", "type": "float", "readonly": false, "cmd": "run tt", "description": "tt", "kids": 18}, +{"path": "", "type": "float", "readonly": false, "cmd": "run tt", "description": "tt", "kids": 19}, {"path": "send", "type": "text", "readonly": false, "cmd": "tt send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "is_running", "type": "int", "readonly": false, "cmd": "tt is_running", "visibility": 3}, +{"path": "mainloop", "type": "text", "readonly": false, "cmd": "tt mainloop", "visibility": 3}, {"path": "target", "type": "float"}, {"path": "running", "type": "int"}, {"path": "tolerance", "type": "float", "readonly": false, "cmd": "tt tolerance"}, @@ -115,23 +116,23 @@ {"path": "hit", "type": "float", "readonly": false, "cmd": "cc hit"}, {"path": "hft", "type": "int", "readonly": false, "cmd": "cc hft"}, {"path": "hea", "type": "enum", "enum": {"0": 0, "1": 1, "6": 2}, "readonly": false, "cmd": "cc hea"}, -{"path": "hch", "type": "int", "readonly": false, "cmd": "cc hch"}, -{"path": "hwr0", "type": "float", "readonly": false, "cmd": "cc hwr0"}, -{"path": "hem0", "type": "float", "readonly": false, "cmd": "cc hem0", "description": "sensor length in mm from top to empty pos."}, -{"path": "hfu0", "type": "float", "readonly": false, "cmd": "cc hfu0", "description": "sensor length in mm from top to full pos."}, -{"path": "hd0", "type": "float", "readonly": false, "cmd": "cc hd0", "description": "external sensor drive current (mA)"}, -{"path": "h0", "type": "float"}, -{"path": "hs0", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}}, -{"path": "h1", "type": "float"}, -{"path": "hs1", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}}, -{"path": "h2", "type": "float"}, -{"path": "hs2", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}}, -{"path": "h3", "type": "float"}, -{"path": "hs3", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}}, -{"path": "h4", "type": "float"}, -{"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": "hch", "type": "int", "readonly": false, "cmd": "cc hch", "visibility": 3}, +{"path": "hwr0", "type": "float", "readonly": false, "cmd": "cc hwr0", "visibility": 3}, +{"path": "hem0", "type": "float", "readonly": false, "cmd": "cc hem0", "description": "sensor length in mm from top to empty pos.", "visibility": 3}, +{"path": "hfu0", "type": "float", "readonly": false, "cmd": "cc hfu0", "description": "sensor length in mm from top to full pos.", "visibility": 3}, +{"path": "hd0", "type": "float", "readonly": false, "cmd": "cc hd0", "description": "external sensor drive current (mA)", "visibility": 3}, +{"path": "h0", "type": "float", "visibility": 3}, +{"path": "hs0", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3}, +{"path": "h1", "type": "float", "visibility": 3}, +{"path": "hs1", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3}, +{"path": "h2", "type": "float", "visibility": 3}, +{"path": "hs2", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3}, +{"path": "h3", "type": "float", "visibility": 3}, +{"path": "hs3", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3}, +{"path": "h4", "type": "float", "visibility": 3}, +{"path": "hs4", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3}, +{"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": "nu", "type": "float"}, @@ -224,7 +225,7 @@ {"path": "state", "type": "text"}]}, "hefill": {"base": "/hefill", "params": [ -{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "timeout": 2}, "readonly": false, "cmd": "hefill", "kids": 6}, +{"path": "", "type": "enum", "enum": {"watching": 0, "fill": 1, "inactive": 2, "manualfill": 3}, "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"}, @@ -233,18 +234,19 @@ {"path": "helow", "type": "float", "readonly": false, "cmd": "cc hl"}]}, "hepump": {"base": "/hepump", "params": [ -{"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": 9}, +{"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"}, -{"path": "eco", "type": "bool", "readonly": false, "cmd": "hepump eco"}, -{"path": "auto", "type": "bool", "readonly": false, "cmd": "hepump auto"}, -{"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"}, -{"path": "calib", "type": "float", "readonly": false, "cmd": "hepump calib", "visibility": 3}]}, +{"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running", "visibility": 3}, +{"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": "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"}]}, "hemot": {"base": "/hepump/hemot", "params": [ -{"path": "", "type": "float", "readonly": false, "cmd": "run hemot", "kids": 32}, +{"path": "", "type": "float", "readonly": false, "cmd": "run hemot", "visibility": 3, "kids": 30}, {"path": "send", "type": "text", "readonly": false, "cmd": "hemot send", "visibility": 3}, {"path": "status", "type": "text", "visibility": 3}, {"path": "is_running", "type": "int", "readonly": false, "cmd": "hemot is_running", "visibility": 3}, @@ -270,8 +272,6 @@ {"path": "output0", "type": "bool", "readonly": false, "cmd": "hemot output0"}, {"path": "output1", "type": "bool", "readonly": false, "cmd": "hemot output1"}, {"path": "input3", "type": "bool"}, -{"path": "input0", "type": "float"}, -{"path": "input0raw", "type": "float"}, {"path": "pullup", "type": "float", "readonly": false, "cmd": "hemot pullup"}, {"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"},