From 39adf907b1231eff2d554f0f055136ecaf50ce09 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Thu, 7 Nov 2024 14:19:00 +0100
Subject: [PATCH] configuration and fix concerning window state

---
 deployment/configmap.yml | 61 ++++++++++++++++++++++++++++++++++------
 src/message_processor.py |  2 +-
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/deployment/configmap.yml b/deployment/configmap.yml
index a1e7930..8d37fbc 100644
--- a/deployment/configmap.yml
+++ b/deployment/configmap.yml
@@ -26,20 +26,65 @@ data:
   BOXES: |
     {
       "box1": {
-        "label": "living_room",
+        "label": "patty",
         "windows": [ 
-          { "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"
       }
     }
 
diff --git a/src/message_processor.py b/src/message_processor.py
index 30e1c23..e219792 100644
--- a/src/message_processor.py
+++ b/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)