4 Commits

Author SHA1 Message Date
78a68f9009 fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-11-07 22:10:39 +01:00
fbb9aa6665 fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-11-07 22:05:13 +01:00
51995fc489 status text output
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-11-07 20:02:03 +01:00
e6b4733a60 overwrite window added
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-11-07 19:22:41 +01:00
3 changed files with 24 additions and 5 deletions

View File

@ -10,6 +10,7 @@ data:
MQTT_BOX_TOPIC_PREFIXES: |
{
"high_temp": "heating/config/high_temp/",
"overwrite_window": "heating/overwrite_window/",
"cmd": "heating/command/"
}
MQTT_CENTRAL_TOPICS: |
@ -19,6 +20,7 @@ data:
"status": "heating/system/status"
}
MQTT_STATUS_TOPIC: "heating/status"
MQTT_STATUSTEXT_TOPIC_PREFIX: "heating/statustext/"
OFF_TEMPERATURE: "5.0"
LOW_TEMPERATURE: "15.0"
DEFAULT_HIGH_TEMPERATURE: "21.0"

View File

@ -19,6 +19,7 @@ LOW_TEMPERATURE = os.getenv("LOW_TEMPERATURE", "15.0")
DEFAULT_HIGH_TEMPERATURE = os.getenv("DEFAULT_HIGH_TEMPERATURE", "21.0")
MAINTENANCE_TEMPERATURE = os.getenv("MAINTENANCE_TEMPERATURE", "30.0")
STATUS_TOPIC = os.getenv("MQTT_STATUS_TOPIC")
STATUSTEXT_TOPIC_PREFIX = os.getenv("MQTT_STATUSTEXT_TOPIC_PREFIX")
# Check if required environment variables are set
missing_vars = []
@ -32,6 +33,8 @@ if not CENTRAL_TOPICS_CONFIG:
missing_vars.append('MQTT_CENTRAL_TOPICS')
if not STATUS_TOPIC:
missing_vars.append('MQTT_STATUS_TOPIC')
if not STATUSTEXT_TOPIC_PREFIX:
missing_vars.append('MQTT_STATUSTEXT_TOPIC_PREFIX')
if missing_vars:
logger.error(f"Error: The following environment variables are not set: {', '.join(missing_vars)}")
@ -46,6 +49,7 @@ context['low_temperature'] = LOW_TEMPERATURE
context['default_high_temperature'] = DEFAULT_HIGH_TEMPERATURE
context['maintenance_temperature'] = MAINTENANCE_TEMPERATURE
context['status_topic'] = STATUS_TOPIC
context['statustext_topic_prefix'] = STATUSTEXT_TOPIC_PREFIX
# Load box configurations from JSON
try:
@ -66,7 +70,7 @@ try:
box_topic_prefixes = json.loads(BOX_TOPIC_PREFIXES_CONFIG)
# Validation: Check if the required keys are present
required_keys = {'high_temp', 'cmd'}
required_keys = {'high_temp', 'cmd', 'overwrite_window'}
missing_keys = required_keys - box_topic_prefixes.keys()
if missing_keys:

View File

@ -1,4 +1,5 @@
from loguru import logger
import json
# context
@ -20,6 +21,7 @@ def prepare_context(box_name, context):
local_context['general_off'] = False
local_context['maintenance_mode'] = False
local_context['overwrite_window'] = False
local_context['window_state'] = {}
for w in context['boxes'][box_name]['windows']:
@ -45,6 +47,8 @@ def process_message(box_name, topic_key, payload, context):
result = process_high_temp(box_name, context, local_context, payload)
case [ primary_key ] if primary_key == 'cmd':
result = process_cmd(box_name, context, local_context, payload)
case [ primary_key ] if primary_key == 'overwrite_window':
result = process_overwrite_window(box_name, context, local_context, payload)
case [ primary_key ] if primary_key == 'general_off':
result = process_general_off(box_name, context, local_context, payload)
case [ primary_key ] if primary_key == 'maintenance_mode':
@ -60,6 +64,9 @@ def process_message(box_name, topic_key, payload, context):
context['client'].publish(publish_topic, result_message)
logger.info(f"[{box_name}] Result published on '{publish_topic}': {status} {result_message}")
statustext_topic = f"{context['statustext_topic_prefix']}{box['label']}"
context['client'].publish(statustext_topic, json.dumps(local_context))
logger.info(f"[{box_name}] Local context after: {local_context}")
except Exception as e:
logger.error(f"[{box_name}] Error processing '{topic_key}': {e}")
@ -74,6 +81,7 @@ def _calculate_output_temperature(local_context):
local_context['output_temperature'] = local_context['off_temperature']
return
# an open window shuts off the heating
if not local_context['overwrite_window']:
for w in local_context['window_state'].values():
if w == 'open':
local_context['output_temperature'] = local_context['off_temperature']
@ -113,6 +121,11 @@ def process_cmd(box_name, context, local_context, payload):
logger.error(f"Invalid cmd for {box_name} received: {payload}")
return (local_context['output_temperature'], False)
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)
def process_high_temp(box_name, context, local_context, payload):
local_context['high_temperature'] = payload
_calculate_output_temperature(local_context)