From 50118e4eadcfac1785c793e80cf54ea3b9cc0fbb Mon Sep 17 00:00:00 2001 From: sans Date: Tue, 27 May 2025 14:46:52 +0200 Subject: [PATCH] haake: fix haake2 and add pumprunning --- cfg/main/haake2_cfg.py | 2 +- cfg/main/haake_cfg.py | 5 +- cfg/sea/haake.config.json | 2 +- cfg/sea/haake2.config.json | 160 +++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 cfg/sea/haake2.config.json diff --git a/cfg/main/haake2_cfg.py b/cfg/main/haake2_cfg.py index f4ac910..504960d 100644 --- a/cfg/main/haake2_cfg.py +++ b/cfg/main/haake2_cfg.py @@ -1,4 +1,4 @@ -Node('haakeuro.config.sea.psi.ch', +Node('haake2.config.sea.psi.ch', 'Haake thermostat + Eurotherm controller', ) Mod('sea_main', diff --git a/cfg/main/haake_cfg.py b/cfg/main/haake_cfg.py index 370cf13..e69c619 100644 --- a/cfg/main/haake_cfg.py +++ b/cfg/main/haake_cfg.py @@ -1,5 +1,5 @@ -Node('haakeuro.config.sea.psi.ch', - 'Haake thermostat + Eurotherm controller', +Node('haake.config.sea.psi.ch', + 'Haake thermostat', ) Mod('sea_main', 'frappy_psi.sea.SeaClient', @@ -13,4 +13,5 @@ Mod('th', io = 'sea_main', sea_object = 'th', extra_modules=['t2'], + value=Param(unit='degC'), ) diff --git a/cfg/sea/haake.config.json b/cfg/sea/haake.config.json index b4dbdf5..8282ccc 100644 --- a/cfg/sea/haake.config.json +++ b/cfg/sea/haake.config.json @@ -3,7 +3,7 @@ {"path": "unit", "type": "text", "readonly": false, "cmd": "th unit", "visibility": 3}, {"path": "t2", "type": "float"}, {"path": "set", "type": "float"}, -{"path": "running", "type": "int", "readonly": false, "cmd": "th running", "visibility": 3}, +{"path": "pumprunning", "type": "int", "readonly": false, "cmd": "th pumprunning"}, {"path": "extcontrol", "type": "int", "readonly": false, "cmd": "th extcontrol", "visibility": 3}, {"path": "relais", "type": "int", "visibility": 3}, {"path": "overtemp", "type": "int", "visibility": 3}, diff --git a/cfg/sea/haake2.config.json b/cfg/sea/haake2.config.json new file mode 100644 index 0000000..8282ccc --- /dev/null +++ b/cfg/sea/haake2.config.json @@ -0,0 +1,160 @@ +{"th": {"base": "/th", "params": [ +{"path": "", "type": "float", "readonly": false, "cmd": "run th", "kids": 26}, +{"path": "unit", "type": "text", "readonly": false, "cmd": "th unit", "visibility": 3}, +{"path": "t2", "type": "float"}, +{"path": "set", "type": "float"}, +{"path": "pumprunning", "type": "int", "readonly": false, "cmd": "th pumprunning"}, +{"path": "extcontrol", "type": "int", "readonly": false, "cmd": "th extcontrol", "visibility": 3}, +{"path": "relais", "type": "int", "visibility": 3}, +{"path": "overtemp", "type": "int", "visibility": 3}, +{"path": "lowlevel", "type": "int", "visibility": 3}, +{"path": "pumpalarm", "type": "int", "visibility": 3}, +{"path": "externalarm", "type": "int", "visibility": 3}, +{"path": "coolalarm", "type": "int", "visibility": 3}, +{"path": "sensor1alarm", "type": "int", "visibility": 3}, +{"path": "sensor2alarm", "type": "int", "visibility": 3}, +{"path": "reset", "type": "int", "readonly": false, "cmd": "th reset", "visibility": 3}, +{"path": "with2sensors", "type": "int", "readonly": false, "cmd": "th with2sensors", "visibility": 3}, +{"path": "upperLimit", "type": "float", "readonly": false, "cmd": "th upperLimit"}, +{"path": "lowerLimit", "type": "float", "readonly": false, "cmd": "th lowerLimit"}, +{"path": "tolerance", "type": "float", "readonly": false, "cmd": "th tolerance"}, +{"path": "maxwait", "type": "int", "readonly": false, "cmd": "th maxwait"}, +{"path": "settle", "type": "int", "readonly": false, "cmd": "th settle"}, +{"path": "targetValue", "type": "float"}, +{"path": "is_running", "type": "int", "visibility": 3}, +{"path": "verbose", "type": "int", "readonly": false, "cmd": "th verbose", "visibility": 3}, +{"path": "driver", "type": "text", "visibility": 3}, +{"path": "creationCmd", "type": "text", "visibility": 3}, +{"path": "status", "type": "text", "readonly": false, "cmd": "th status"}]}, + +"te": {"base": "/te", "params": [ +{"path": "", "type": "float", "readonly": false, "cmd": "run te", "kids": 30}, +{"path": "unit", "type": "text", "readonly": false, "cmd": "te unit", "visibility": 3}, +{"path": "mode", "type": "int", "readonly": false, "cmd": "te mode"}, +{"path": "model", "type": "text", "visibility": 3}, +{"path": "pbPow", "type": "float", "visibility": 3}, +{"path": "pbMin", "type": "float", "visibility": 3}, +{"path": "pbScl", "type": "float", "visibility": 3}, +{"path": "output", "type": "float"}, +{"path": "position", "type": "float", "readonly": false, "cmd": "te position"}, +{"path": "asymmetry", "type": "float", "readonly": false, "cmd": "te asymmetry", "visibility": 3}, +{"path": "range", "type": "float", "readonly": false, "cmd": "te range", "visibility": 3}, +{"path": "set", "type": "float", "readonly": false, "cmd": "te set"}, +{"path": "rdonly", "type": "int", "readonly": false, "cmd": "te rdonly", "visibility": 3}, +{"path": "task", "type": "text", "readonly": false, "cmd": "te task"}, +{"path": "upperLimit", "type": "float", "readonly": false, "cmd": "te upperLimit"}, +{"path": "lowerLimit", "type": "float", "readonly": false, "cmd": "te lowerLimit", "visibility": 3}, +{"path": "tolerance", "type": "float", "readonly": false, "cmd": "te tolerance"}, +{"path": "maxwait", "type": "int", "readonly": false, "cmd": "te maxwait"}, +{"path": "settle", "type": "int", "readonly": false, "cmd": "te settle"}, +{"path": "targetValue", "type": "float"}, +{"path": "is_running", "type": "int", "visibility": 3}, +{"path": "verbose", "type": "int", "readonly": false, "cmd": "te verbose", "visibility": 3}, +{"path": "driver", "type": "text", "visibility": 3}, +{"path": "creationCmd", "type": "text", "visibility": 3}, +{"path": "status", "type": "text", "readonly": false, "cmd": "te status"}, +{"path": "pb", "type": "float", "readonly": false, "cmd": "te pb"}, +{"path": "ti", "type": "float", "readonly": false, "cmd": "te ti"}, +{"path": "td", "type": "float", "readonly": false, "cmd": "te td"}, +{"path": "manual", "type": "float", "readonly": false, "cmd": "te manual"}, +{"path": "rate", "type": "float", "readonly": false, "cmd": "te rate"}, +{"path": "workset", "type": "float", "readonly": false, "cmd": "te workset"}]}, + +"cc": {"base": "/cc", "params": [ +{"path": "", "type": "bool", "kids": 96}, +{"path": "send", "type": "text", "readonly": false, "cmd": "cc send", "visibility": 3}, +{"path": "status", "type": "text", "visibility": 3}, +{"path": "autodevice", "type": "bool", "readonly": false, "cmd": "cc autodevice"}, +{"path": "fav", "type": "bool", "readonly": false, "cmd": "cc fav"}, +{"path": "f", "type": "float", "visibility": 3}, +{"path": "fs", "type": "enum", "enum": {"ok": 0, "no_sens": 1}, "readonly": false, "cmd": "cc fs", "visibility": 3}, +{"path": "mav", "type": "bool", "readonly": false, "cmd": "cc mav"}, +{"path": "fm", "type": "enum", "enum": {"idle": 0, "opening": 1, "closing": 2, "opened": 3, "closed": 4, "no_motor": 5}, "visibility": 3}, +{"path": "fa", "type": "enum", "enum": {"fixed": 0, "controlled": 1, "automatic": 2, "offline": 3}, "readonly": false, "cmd": "cc fa", "visibility": 3}, +{"path": "mp", "type": "float", "readonly": false, "cmd": "cc mp", "visibility": 3}, +{"path": "msp", "type": "float", "visibility": 3}, +{"path": "mmp", "type": "float", "visibility": 3}, +{"path": "mc", "type": "float", "readonly": false, "cmd": "cc mc", "visibility": 3}, +{"path": "mfc", "type": "float", "readonly": false, "cmd": "cc mfc", "visibility": 3}, +{"path": "moc", "type": "float", "readonly": false, "cmd": "cc moc", "visibility": 3}, +{"path": "mtc", "type": "float", "readonly": false, "cmd": "cc mtc", "visibility": 3}, +{"path": "mtl", "type": "float", "visibility": 3}, +{"path": "mft", "type": "float", "readonly": false, "cmd": "cc mft", "visibility": 3}, +{"path": "mt", "type": "float", "visibility": 3}, +{"path": "mo", "type": "float", "visibility": 3}, +{"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": "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}, +{"path": "hu", "type": "float", "visibility": 3}, +{"path": "hh", "type": "float", "readonly": false, "cmd": "cc hh", "visibility": 3}, +{"path": "hl", "type": "float", "readonly": false, "cmd": "cc hl", "visibility": 3}, +{"path": "htf", "type": "float", "readonly": false, "cmd": "cc htf", "description": "meas. period in fast mode", "visibility": 3}, +{"path": "hts", "type": "float", "readonly": false, "cmd": "cc hts", "description": "meas. period in slow mode", "visibility": 3}, +{"path": "hd", "type": "float", "readonly": false, "cmd": "cc hd", "visibility": 3}, +{"path": "hwr", "type": "float", "readonly": false, "cmd": "cc hwr", "visibility": 3}, +{"path": "hem", "type": "float", "readonly": false, "cmd": "cc hem", "description": "sensor length in mm from top to empty pos.", "visibility": 3}, +{"path": "hfu", "type": "float", "readonly": false, "cmd": "cc hfu", "description": "sensor length in mm from top to full pos.", "visibility": 3}, +{"path": "hcd", "type": "enum", "enum": {"stop": 0, "fill": 1, "off": 2, "auto": 3, "manual": 7}, "readonly": false, "cmd": "cc hcd", "visibility": 3}, +{"path": "hv", "type": "enum", "enum": {"fill_valve_off": 0, "filling": 1, "no_fill_valve": 2, "timeout": 3, "timeout1": 4}, "visibility": 3}, +{"path": "hsf", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3}, +{"path": "ha", "type": "bool", "readonly": false, "cmd": "cc ha", "visibility": 3}, +{"path": "hm", "type": "bool", "visibility": 3}, +{"path": "hf", "type": "enum", "enum": {"slow": 0, "fast": 1}, "readonly": false, "cmd": "cc hf", "visibility": 3}, +{"path": "hbe", "type": "bool", "readonly": false, "cmd": "cc hbe", "visibility": 3}, +{"path": "hmf", "type": "float", "visibility": 3}, +{"path": "hms", "type": "float", "visibility": 3}, +{"path": "hit", "type": "float", "readonly": false, "cmd": "cc hit", "visibility": 3}, +{"path": "hft", "type": "int", "readonly": false, "cmd": "cc hft", "visibility": 3}, +{"path": "hea", "type": "enum", "enum": {"0": 0, "1": 1, "6": 6}, "readonly": false, "cmd": "cc hea"}, +{"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", "visibility": 3}, +{"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}, +{"path": "ntc", "type": "float", "readonly": false, "cmd": "cc ntc", "visibility": 3}, +{"path": "ntm", "type": "float", "readonly": false, "cmd": "cc ntm", "visibility": 3}, +{"path": "ns", "type": "enum", "enum": {"sens_ok": 0, "no_sens": 1, "short_circuit": 2, "upside_down": 3, "sens_warm": 4, "empty": 5}, "visibility": 3}, +{"path": "na", "type": "bool", "readonly": false, "cmd": "cc na", "visibility": 3}, +{"path": "nv", "type": "enum", "enum": {"fill_valve_off": 0, "filling": 1, "no_fill_valve": 2, "timeout": 3, "timeout1": 4, "boost": 5}, "visibility": 3}, +{"path": "nc", "type": "enum", "enum": {"stop": 0, "fill": 1, "off": 2, "auto": 3}, "readonly": false, "cmd": "cc nc", "visibility": 3}, +{"path": "nfb", "type": "float", "visibility": 3}, +{"path": "cda", "type": "float"}, +{"path": "cdb", "type": "float"}, +{"path": "cba", "type": "float"}, +{"path": "cbb", "type": "float"}, +{"path": "cvs", "type": "int"}, +{"path": "csp", "type": "int"}, +{"path": "cdv", "type": "text", "readonly": false, "cmd": "cc cdv"}, +{"path": "cic", "type": "text", "readonly": false, "cmd": "cc cic"}, +{"path": "cin", "type": "text"}, +{"path": "cds", "type": "enum", "enum": {"local": 0, "remote": 1, "loading": 2, "by_code": 3, "by_touch": 4}, "readonly": false, "cmd": "cc cds"}, +{"path": "timing", "type": "bool", "readonly": false, "cmd": "cc timing"}, +{"path": "tc", "type": "float", "visibility": 3}, +{"path": "tn", "type": "float", "visibility": 3}, +{"path": "th", "type": "float", "visibility": 3}, +{"path": "tf", "type": "float", "visibility": 3}, +{"path": "tm", "type": "float", "visibility": 3}, +{"path": "tv", "type": "float", "visibility": 3}, +{"path": "tq", "type": "float", "visibility": 3}, +{"path": "bdl", "type": "float", "readonly": false, "cmd": "cc bdl"}]}}