wn/heating-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

converters
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2024-11-12 12:01:13 +01:00
parent dbdd24822e
commit ee0efb6c19
2 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
deployment/configmap.yml
View File

@ -30,63 +30,71 @@ data:
"patty": {
"label": "patty",
"windows": [
{ "topic": "homegear/instance1/plain/18/1/STATE", "label": "Garten rechts" },
{ "topic": "homegear/instance1/plain/22/1/STATE", "label": "Garten links" }
{ "topic": "homegear/instance1/plain/18/1/STATE", "label": "Garten rechts", "converter": "max" },
{ "topic": "homegear/instance1/plain/22/1/STATE", "label": "Garten links", "converter": "max" }
],
"output_topic": "heating/homegear/instance1/set/39/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/39/1/SET_TEMPERATURE",
"output_converter": "max"
},
"kueche": {
"label": "kueche",
"windows": [
{ "topic": "homegear/instance1/plain/37/1/STATE", "label": "Garten Fenster" },
{ "topic": "homegear/instance1/plain/36/1/STATE", "label": "Garten Tuer" },
{ "topic": "homegear/instance1/plain/38/1/STATE", "label": "Strasse rechts" },
{ "topic": "homegear/instance1/plain/13/1/STATE", "label": "Strasse links" }
{ "topic": "homegear/instance1/plain/37/1/STATE", "label": "Garten Fenster", "converter": "max" },
{ "topic": "homegear/instance1/plain/36/1/STATE", "label": "Garten Tuer", "converter": "max" },
{ "topic": "homegear/instance1/plain/38/1/STATE", "label": "Strasse rechts", "converter": "max" },
{ "topic": "homegear/instance1/plain/13/1/STATE", "label": "Strasse links", "converter": "max" }
],
"output_topic": "heating/homegear/instance1/set/40/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/40/1/SET_TEMPERATURE",
"output_converter": "max"
},
"bad_oben": {
"label": "bad_oben",
"windows": [
],
"output_topic": "heating/homegear/instance1/set/41/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/41/1/SET_TEMPERATURE",
"output_converter": "max"
},
"schlafzimmer": {
"label": "schlafzimmer",
"windows": [
{ "topic": "homegear/instance1/plain/52/1/STATE", "label": "Strasse" }
{ "topic": "homegear/instance1/plain/52/1/STATE", "label": "Strasse", "converter": "max" }
],
"output_topic": "heating/homegear/instance1/set/42/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/42/1/SET_TEMPERATURE",
"output_converter": "max"
},
"wolfgang": {
"label": "wolfgang",
"windows": [
{ "topic": "homegear/instance1/plain/24/1/STATE", "label": "Garten" }
{ "topic": "homegear/instance1/plain/24/1/STATE", "label": "Garten", "converter": "max" }
],
"output_topic": "heating/homegear/instance1/set/43/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/43/1/SET_TEMPERATURE",
"output_converter": "max"
},
"esszimmer": {
"label": "esszimmer",
"windows": [
{ "topic": "homegear/instance1/plain/26/1/STATE", "label": "Strasse rechts" },
{ "topic": "homegear/instance1/plain/27/1/STATE", "label": "Strasse links" }
{ "topic": "homegear/instance1/plain/26/1/STATE", "label": "Strasse rechts", "converter": "max" },
{ "topic": "homegear/instance1/plain/27/1/STATE", "label": "Strasse links", "converter": "max" }
],
"output_topic": "heating/homegear/instance1/set/45/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/45/1/SET_TEMPERATURE",
"output_converter": "max"
},
"wohnzimmer": {
"label": "wohnzimmer",
"windows": [
{ "topic": "homegear/instance1/plain/28/1/STATE", "label": "Garten rechts" },
{ "topic": "homegear/instance1/plain/29/1/STATE", "label": "Garten links" }
{ "topic": "homegear/instance1/plain/28/1/STATE", "label": "Garten rechts", "converter": "max" },
{ "topic": "homegear/instance1/plain/29/1/STATE", "label": "Garten links", "converter": "max" }
],
"output_topic": "heating/homegear/instance1/set/46/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/46/1/SET_TEMPERATURE",
"output_converter": "max"
},
"bad_unten": {
"label": "bad_unten",
"windows": [
{ "topic": "homegear/instance1/plain/44/1/STATE", "label": "Strasse" }
{ "topic": "homegear/instance1/plain/44/1/STATE", "label": "Strasse", "converter": "max" }
],
"output_topic": "heating/homegear/instance1/set/48/1/SET_TEMPERATURE"
"output_topic": "heating/homegear/instance1/set/48/1/SET_TEMPERATURE",
"output_converter": "max"
}
}

34
src/message_processor.py
View File

@ -2,6 +2,16 @@ from loguru import logger
import json
CONVERTERS = {
"target_temperature_output": {
"max": lambda x: x["output_temperature"],
},
"window_contact_input": {
"max": lambda x: 'closed' if (x.lower() in ('false', 'close', 'closed')) else 'open'
}
}
# context
# boxes: structure of boxes
# client: MQTT client
@ -59,13 +69,13 @@ def process_message(box_name, topic_key, payload, context):
raise Error(f"Unexcepted topic_key: {topic_key}, {payload}")
if result:
(result_message, status) = result
publish_topic = box["output_topic"] if not status else context['status_topic']
result_message = CONVERTERS["target_temperature_output"][box["output_converter"]](local_context)
publish_topic = box["output_topic"]
context['client'].publish(publish_topic, result_message)
logger.info(f"[{box_name}] Result published on '{publish_topic}': {status} {result_message}")
logger.info(f"[{box_name}] Result published on '{publish_topic}': {result_message}")
context_topic = f"{context['context_topic_prefix']}{box['label']}"
context['client'].publish(context_topic, json.dumps(local_context))
context_topic = f"{context['context_topic_prefix']}{box['label']}"
context['client'].publish(context_topic, json.dumps(local_context))
logger.info(f"[{box_name}] Local context after: {local_context}")
except Exception as e:
@ -101,17 +111,17 @@ def _calculate_output_temperature(local_context):
return
def process_status(box_name, context, local_context, payload):
return (f"{local_context}", True)
return False
def process_general_off(box_name, context, local_context, payload):
local_context['general_off'] = (payload.lower() in ('true'))
_calculate_output_temperature(local_context)
return (local_context['output_temperature'], False)
return True
def process_maintenance_mode(box_name, context, local_context, payload):
local_context['maintenance_mode'] = (payload.lower() in ('true'))
_calculate_output_temperature(local_context)
return (local_context['output_temperature'], False)
return True
def process_cmd(box_name, context, local_context, payload):
if payload.lower() in ('high', 'low', 'off'):
@ -119,20 +129,20 @@ def process_cmd(box_name, context, local_context, payload):
_calculate_output_temperature(local_context)
else:
logger.error(f"Invalid cmd for {box_name} received: {payload}")
return (local_context['output_temperature'], False)
return True
def process_overwrite_window(box_name, context, local_context, payload):
local_context['overwrite_window'] = (payload.lower() in ('true'))
_calculate_output_temperature(local_context)
return (local_context['output_temperature'], False)
return True
def process_high_temp(box_name, context, local_context, payload):
local_context['high_temperature'] = payload
_calculate_output_temperature(local_context)
return (local_context['output_temperature'], False)
return True
def process_window(box_name, context, local_context, sub_key, payload):
local_context['window_state'][sub_key] = 'closed' if (payload.lower() in ('false', 'close', 'closed')) else 'open'
_calculate_output_temperature(local_context)
return (local_context['output_temperature'], False)
return True