configuration and fix concerning window state

deployment/configmap.yml

@@ -26,21 +26,65 @@ data:
   BOXES: |
     {
       "box1": {
-        "label": "living_room",
+        "label": "patty",
         "windows": [ 
-          { "topic": "window/living_room/street_side", "label": "street_side" },
-          { "topic": "window/living_room/garden_side", "label": "garden_side" }
+          { "topic": "homegear/instance1/plain/18/1/STATE", "label": "Garten rechts" },
+          { "topic": "homegear/instance1/plain/22/1/STATE", "label": "Garten links" }
         ],
-        "output_topic": "output/living_room"
+        "output_topic": "heating/homegear/instance1/set/39/1/SET_TEMPERATURE"
       },
       "box2": {
-        "label": "kitchen",
+        "label": "kueche",
         "windows": [ 
-          { "topic": "window/kitchen/street_side", "label": "street_side" },
-          { "topic": "window/kitchen/garden_side", "label": "garden_side" },
-          { "topic": "window/kitchen/garden_door", "label": "garden_door" }
+          { "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" }
         ],
-        "output_topic": "output/kitchen"
+        "output_topic": "heating/homegear/instance1/set/40/1/SET_TEMPERATURE"
+      },
+      "box3": {
+        "label": "bad_oben",
+        "windows": [ 
+        ],
+        "output_topic": "heating/homegear/instance1/set/41/1/SET_TEMPERATURE"
+      },
+      "box4": {
+        "label": "schlafzimmer",
+        "windows": [ 
+          { "topic": "homegear/instance1/plain/52/1/STATE", "label": "Strasse" }
+        ],
+        "output_topic": "heating/homegear/instance1/set/42/1/SET_TEMPERATURE"
+      },
+      "box5": {
+        "label": "wolfgang",
+        "windows": [ 
+          { "topic": "homegear/instance1/plain/24/1/STATE", "label": "Garten" }
+        ],
+        "output_topic": "heating/homegear/instance1/set/43/1/SET_TEMPERATURE"
+      },
+      "box6": {
+        "label": "esszimmer",
+        "windows": [ 
+          { "topic": "homegear/instance1/plain/26/1/STATE", "label": "Strasse rechts" },
+          { "topic": "homegear/instance1/plain/27/1/STATE", "label": "Strasse links" }
+        ],
+        "output_topic": "heating/homegear/instance1/set/45/1/SET_TEMPERATURE"
+      },
+      "box7": {
+        "label": "wohnzimmer",
+        "windows": [ 
+          { "topic": "homegear/instance1/plain/28/1/STATE", "label": "Garten rechts" },
+          { "topic": "homegear/instance1/plain/29/1/STATE", "label": "Garten links" }
+        ],
+        "output_topic": "heating/homegear/instance1/set/46/1/SET_TEMPERATURE"
+      },
+      "box8": {
+        "label": "bad_unten",
+        "windows": [ 
+          { "topic": "homegear/instance1/plain/44/1/STATE", "label": "Strasse" }
+        ],
+        "output_topic": "heating/homegear/instance1/set/48/1/SET_TEMPERATURE"
       }
     }
 

deployment/deploy-yml.tmpl

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: heating-controller
   annotations:
-    secret.reloader.stakater.com/reload: "heating-controller-config"
+    configmap.reloader.stakater.com/reload: "heating-controller-config"
 spec:
   replicas: 1
   selector:

src/main.py

@@ -91,8 +91,8 @@ CLIENT_ID = f"{CLIENT_PREFIX}_{uuid.uuid4()}"
 topic_mapping = {}
 
 # Callback function for successful connection to the broker
-def on_connect(client, userdata, flags, rc):
-    if rc == 0:
+def on_connect(client, userdata, flags, reason_code, properties):
+    if reason_code == 0:
         logger.info("Connected to the broker")
         
         # Subscribe to dynamically generated topics for each box and create mappings
@@ -125,7 +125,7 @@ def on_connect(client, userdata, flags, rc):
             topic_mapping[central_topic] = ("__central__", central_key)
             logger.info(f"Subscribed to central topic '{central_topic}' (Key: '{central_key}')")
     else:
-        logger.error(f"Connection error with code {rc}")
+        logger.error(f"Connection error with code {reason_code}")
 
 # Callback function for received messages
 def on_message(client, userdata, msg):
@@ -149,8 +149,8 @@ def on_message(client, userdata, msg):
         logger.error(f"Error processing message from '{msg.topic}': {e}")
 
 # Callback function for disconnection
-def on_disconnect(client, userdata, rc):
-    if rc != 0:
+def on_disconnect(client, userdata, flags, reason_code, properties):
+    if reason_code != 0:
         logger.warning("Unexpected disconnection, attempting to reconnect...")
     else:
         logger.info("Disconnected from the broker.")
@@ -161,7 +161,7 @@ def handle_exit_signal(signum, frame):
     client.disconnect()  # Disconnects from the broker and stops loop_forever()
 
 # Initialize the MQTT client and configure callbacks
-client = mqtt.Client(client_id=CLIENT_ID)
+client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2, client_id=CLIENT_ID, )
 
 context['client'] = client
 

src/message_processor.py

@@ -117,7 +117,7 @@ def process_high_temp(box_name, context, local_context, payload):
     return (local_context['output_temperature'], False)
 
 def process_window(box_name, context, local_context, sub_key, payload):
-    local_context['window_state'][sub_key] = 'closed' if (payload.lower() in ('true', 'close', 'closed')) else 'open'
+    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)