changes
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful

This commit is contained in:
Wolfgang Hottgenroth 2024-11-18 14:30:28 +01:00
parent c502ce8f69
commit 21f49ae91b
Signed by: wn
GPG Key ID: 18FDFA577A8871AD
2 changed files with 39 additions and 45 deletions

View File

@ -4,7 +4,9 @@ WORKDIR /app
COPY src/requirements.txt .
COPY src/main.py .
COPY src/message_processor.py .
COPY src/converters.py .
COPY src/config.py .
COPY src/box.py .
RUN \
addgroup -S appgroup && \
@ -16,9 +18,9 @@ RUN \
ENV MQTT_BROKER=""
ENV MQTT_PORT=""
ENV MQTT_CLIENT_PREFIX=""
ENV MQTT_BOX_TOPIC_PREFIXES=""
ENV MQTT_CENTRAL_TOPICS=""
ENV MQTT_STATUS_TOPIC=""
ENV BOX_TOPIC_PREFIXES=""
ENV CENTRAL_TOPICS=""
ENV STATUS_TOPIC=""
ENV OFF_TEMPERATURE=""
ENV LOW_TEMPERATURE=""
ENV DEFAULT_HIGH_TEMPERATURE=""

View File

@ -7,20 +7,20 @@ data:
MQTT_BROKER: "emqx01-anonymous-cluster-internal.broker.svc.cluster.local"
MQTT_PORT: "1883"
MQTT_CLIENT_PREFIX: "HeatingController"
MQTT_BOX_TOPIC_PREFIXES: |
BOX_TOPIC_PREFIXES: |
{
"high_temp": "heating/config/high_temp/",
"overwrite_window": "heating/overwrite_window/",
"cmd": "heating/command/"
}
MQTT_CENTRAL_TOPICS: |
CENTRAL_TOPICS: |
{
"general_off": "heating/system/general_off",
"maintenance_mode": "heating/system/maintenance_mode",
"status": "heating/system/status"
}
MQTT_STATUS_TOPIC: "heating/status"
MQTT_CONTEXT_TOPIC_PREFIX: "heating/context/"
STATUS_TOPIC: "heating/status"
CONTEXT_TOPIC_PREFIX: "heating/context/"
OFF_TEMPERATURE: "5.0"
LOW_TEMPERATURE: "15.0"
DEFAULT_HIGH_TEMPERATURE: "21.0"
@ -28,71 +28,63 @@ data:
BOXES: |
{
"patty": {
"label": "patty",
"windows": [
{ "topic": "homegear/instance1/plain/18/1/STATE", "label": "Garten rechts", "converter": "max" },
{ "topic": "homegear/instance1/plain/22/1/STATE", "label": "Garten links", "converter": "max" }
],
"windows": {
"garden_right": { "topic": "homegear/instance1/plain/18/1/STATE", "label": "Garten rechts", "converter": "max" },
"garden_left": { "topic": "homegear/instance1/plain/22/1/STATE", "label": "Garten links", "converter": "max" }
},
"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", "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" }
],
"windows": {
"garden_window": { "topic": "homegear/instance1/plain/37/1/STATE", "label": "Garten Fenster", "converter": "max" },
"garden_door": { "topic": "homegear/instance1/plain/36/1/STATE", "label": "Garten Tuer", "converter": "max" },
"street_right": { "topic": "homegear/instance1/plain/38/1/STATE", "label": "Strasse rechts", "converter": "max" },
"street_left": { "topic": "homegear/instance1/plain/13/1/STATE", "label": "Strasse links", "converter": "max" }
},
"output_topic": "heating/homegear/instance1/set/40/1/SET_TEMPERATURE",
"output_converter": "max"
},
"bad_oben": {
"label": "bad_oben",
"windows": [
],
"windows": {
},
"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", "converter": "max" }
],
"windows": {
"street": { "topic": "homegear/instance1/plain/52/1/STATE", "label": "Strasse", "converter": "max" }
},
"output_topic": "heating/homegear/instance1/set/42/1/SET_TEMPERATURE",
"output_converter": "max"
},
"wolfgang": {
"label": "wolfgang",
"windows": [
{ "topic": "zigbee2mqtt/0x00158d008b3328da", "label": "Garten", "converter": "aqara" }
],
"windows": {
"garden": { "topic": "zigbee2mqtt/0x00158d008b3328da", "label": "Garten", "converter": "aqara" }
},
"output_topic": "zigbee2mqtt/0x540f57fffe7e3cfe/set",
"output_converter": "brennenstuhl"
},
"esszimmer": {
"label": "esszimmer",
"windows": [
{ "topic": "homegear/instance1/plain/26/1/STATE", "label": "Strasse rechts", "converter": "max" },
{ "topic": "homegear/instance1/plain/27/1/STATE", "label": "Strasse links", "converter": "max" }
],
"windows": {
"street_right": { "topic": "homegear/instance1/plain/26/1/STATE", "label": "Strasse rechts", "converter": "max" },
"street_left": { "topic": "homegear/instance1/plain/27/1/STATE", "label": "Strasse links", "converter": "max" }
},
"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", "converter": "max" },
{ "topic": "homegear/instance1/plain/29/1/STATE", "label": "Garten links", "converter": "max" }
],
"windows": {
"garden_right": { "topic": "homegear/instance1/plain/28/1/STATE", "label": "Garten rechts", "converter": "max" },
"garden_left": { "topic": "homegear/instance1/plain/29/1/STATE", "label": "Garten links", "converter": "max" }
},
"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", "converter": "max" }
],
"windows": }
"street": { "topic": "homegear/instance1/plain/44/1/STATE", "label": "Strasse", "converter": "max" }
},
"output_topic": "heating/homegear/instance1/set/48/1/SET_TEMPERATURE",
"output_converter": "max"
}