thermostat bad unten replaced 2

.woodpecker/namespace.yml

@@ -1,5 +1,8 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 steps:
   create_namespace:

apps/api/main.py

@@ -127,27 +127,19 @@ async def redis_state_listener():
         
         logger.info("Redis state listener connected")
         
-        while True:
+        # listen() blocks async and waits for messages - prevents busy loop
-            try:
+        async for message in pubsub.listen():
-                message = await asyncio.wait_for(
+            if message["type"] == "message":
-                    pubsub.get_message(ignore_subscribe_messages=True),
+                data = message["data"]
-                    timeout=1.0
+                try:
-                )
+                    state_data = json.loads(data)
-                
+                    if state_data.get("type") == "state" and state_data.get("device_id"):
-                if message and message["type"] == "message":
+                        device_id = state_data["device_id"]
-                    data = message["data"]
+                        payload = state_data.get("payload", {})
-                    try:
+                        device_states[device_id] = payload
-                        state_data = json.loads(data)
+                        logger.debug(f"Updated state cache for {device_id}: {payload}")
-                        if state_data.get("type") == "state" and state_data.get("device_id"):
+                except Exception as e:
-                            device_id = state_data["device_id"]
+                    logger.warning(f"Failed to parse state data: {e}")
-                            payload = state_data.get("payload", {})
-                            device_states[device_id] = payload
-                            logger.debug(f"Updated state cache for {device_id}: {payload}")
-                    except Exception as e:
-                        logger.warning(f"Failed to parse state data: {e}")
-                        
-            except asyncio.TimeoutError:
-                pass  # No message, continue
                 
     except asyncio.CancelledError:
         logger.info("Redis state listener cancelled")
@@ -567,25 +559,31 @@ async def event_generator(request: Request) -> AsyncGenerator[str, None]:
             redis_client = None
             pubsub = None
         
-        # Heartbeat tracking
-        last_heartbeat = asyncio.get_event_loop().time()
         heartbeat_interval = 15  # Safari-friendly: shorter interval
         
+        # Use listen() iterator for blocking reads with heartbeat timeout
+        if pubsub:
+            listener = pubsub.listen()
+        else:
+            listener = None
+        
         while True:
             # Check if client disconnected
             if await request.is_disconnected():
                 logger.info("SSE client disconnected")
                 break
             
-            # Try to get message from Redis (if available)
+            # Try to get message from Redis with timeout for heartbeat
-            if pubsub:
+            if listener:
                 try:
+                    # Wait for message with heartbeat timeout
+                    # If no message arrives within timeout, send heartbeat
                     message = await asyncio.wait_for(
-                        pubsub.get_message(ignore_subscribe_messages=True),
+                        anext(listener),
-                        timeout=0.1
+                        timeout=heartbeat_interval
                     )
                     
-                    if message and message["type"] == "message":
+                    if message["type"] == "message":
                         data = message["data"]
                         logger.debug(f"Sending SSE message: {data[:100]}...")
                         
@@ -598,24 +596,21 @@ async def event_generator(request: Request) -> AsyncGenerator[str, None]:
                             logger.warning(f"Failed to parse state data for cache: {e}")
                         
                         yield f"event: message\ndata: {data}\n\n"
-                        last_heartbeat = asyncio.get_event_loop().time()
-                        continue  # Skip sleep, check for more messages immediately
                         
                 except asyncio.TimeoutError:
-                    pass  # No message, continue to heartbeat check
+                    # No message within heartbeat interval - send heartbeat
+                    yield ": ping\n\n"
+                except StopAsyncIteration:
+                    logger.warning("Redis listener stopped")
+                    break
                 except Exception as e:
                     logger.error(f"Redis error: {e}")
-                    # Continue with heartbeats even if Redis fails
+                    # Continue with heartbeat-only mode
-            
+                    listener = None
-            # Sleep briefly to avoid busy loop
+            else:
-            await asyncio.sleep(0.1)
+                # Heartbeat-only mode (no Redis)
-            
+                await asyncio.sleep(heartbeat_interval)
-            # Send heartbeat if interval elapsed
-            current_time = asyncio.get_event_loop().time()
-            if current_time - last_heartbeat >= heartbeat_interval:
-                # Comment-style ping (Safari-compatible, no event type)
                 yield ": ping\n\n"
-                last_heartbeat = current_time
             
     except asyncio.CancelledError:
         logger.info("SSE connection cancelled by client")

config/devices.yaml

@@ -326,41 +326,6 @@ devices:
     ieee_address: "0xf0d1b8be2409f569"
     model: "4058075729063"
     vendor: "LEDVANCE"
-- device_id: licht_flur_oben_am_spiegel
-  homekit_aid: 22
-  name: Spiegel
-  type: light
-  cap_version: "light@1.2.0"
-  technology: zigbee2mqtt
-  features:
-    power: true
-    brightness: true
-    color_temperature: true
-  topics:
-    state: "zigbee2mqtt/0x842e14fffefe4ba4"
-    set: "zigbee2mqtt/0x842e14fffefe4ba4/set"
-  metadata:
-    friendly_name: "Licht Flur oben am Spiegel"
-    ieee_address: "0x842e14fffefe4ba4"
-    model: "LED1732G11"
-    vendor: "IKEA"
-- device_id: experimentlabtest
-  homekit_aid: 23
-  name: Test Lampe
-  type: light
-  cap_version: "light@1.2.0"
-  technology: zigbee2mqtt
-  features:
-    power: true
-    brightness: true
-  topics:
-    state: "zigbee2mqtt/0xf0d1b80000195038"
-    set: "zigbee2mqtt/0xf0d1b80000195038/set"
-  metadata:
-    friendly_name: "ExperimentLabTest"
-    ieee_address: "0xf0d1b80000195038"
-    model: "4058075208421"
-    vendor: "LEDVANCE"
 - device_id: thermostat_wolfgang
   homekit_aid: 24
   name: Heizung
@@ -501,26 +466,6 @@ devices:
     model: "MAX! Thermostat"
     peer_id: "41"
     channel: "1"
-- device_id: thermostat_bad_unten
-  homekit_aid: 31
-  name: Heizung
-  type: thermostat
-  cap_version: "thermostat@1.0.0"
-  technology: max
-  features:
-    mode: true
-    target: true
-    current: false
-  topics:
-    set: "homegear/instance1/set/48/1/SET_TEMPERATURE"
-    state: "homegear/instance1/plain/48/1/SET_TEMPERATURE"
-  metadata:
-    friendly_name: "Thermostat Bad Unten"
-    location: "Bad Unten"
-    vendor: "eQ-3"
-    model: "MAX! Thermostat"
-    peer_id: "48"
-    channel: "1"
 - device_id: sterne_wohnzimmer
   homekit_aid: 32
   name: Sterne
@@ -843,17 +788,6 @@ devices:
   topics:
     state: "zigbee2mqtt/0xf0d1b8000017515d"
     set: "zigbee2mqtt/0xf0d1b8000017515d/set"
-- device_id: licht_kommode_schlafzimmer
-  homekit_aid: 65
-  name: Kommode Schlafzimmer
-  type: relay
-  cap_version: "relay@1.0.0"
-  technology: tasmota
-  features:
-    power: true
-  topics:
-    set: "cmnd/tasmota/04/POWER"
-    state: "stat/tasmota/04/POWER"
 - device_id: licht_fensterbank_esszimmer
   homekit_aid: 66
   name: Fensterbank Esszimmer
@@ -1033,9 +967,9 @@ devices:
 - device_id: herdlicht
   homekit_aid: 82
   name: Herdlicht
-  type: relay
+  type: light
-  cap_version: "relay@1.0.0"
+  cap_version: "light@1.2.0"
-  technology: tasmota
+  technology: zigbee2mqtt
   features:
     power: true
     brightness: true
@@ -1177,3 +1111,45 @@ devices:
   topics:
     set: "pulsegen/command/5/18"
     state: "pulsegen/status/5"
+
+- device_id: licht_flur_oben_am_spiegel
+  homekit_aid: 95
+  name: Spiegel
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000195038"
+    set: "zigbee2mqtt/0xf0d1b80000195038/set"
+- device_id: licht_kommode_schlafzimmer
+  homekit_aid: 96
+  name: Kommode Schlafzimmer
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+    color_temperature: true
+  topics:
+    state: "zigbee2mqtt/0x842e14fffefe4ba4"
+    set: "zigbee2mqtt/0x842e14fffefe4ba4/set"
+
+- device_id: thermostat_bad_unten
+  homekit_aid: 31
+  name: Heizung
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    heating: true
+    temperature_range:
+    - 5
+    - 30
+    temperature_step: 0.5
+  topics:
+    state: "zigbee2mqtt/0x003c84fffebdcc28"
+    set: "zigbee2mqtt/0x003c84fffebdcc28/set"

config/rules.yaml

@@ -1,9 +1,19 @@
-# Rules Configuration
-# Auto-generated from devices.yaml
-
 rules:
+- id: window_setback_bad_unten
+  enabled: true
+  name: Fensterabsenkung Bad Unten
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_bad_unten_strasse
+    thermostats:
+    - thermostat_bad_unten
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
 - id: window_setback_esszimmer
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Esszimmer
   type: window_setback@1.0
   objects:
@@ -17,8 +27,23 @@ rules:
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
+- id: window_setback_wohnzimmer
+  enabled: true
+  name: Fensterabsenkung Wohnzimmer
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_wohnzimmer_garten_links
+    - kontakt_wohnzimmer_garten_rechts
+    thermostats:
+    - thermostat_wohnzimmer
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
+    previous_target_ttl_secs: 86400
 - id: window_setback_kueche
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Küche
   type: window_setback@1.0
   objects:
@@ -35,7 +60,7 @@ rules:
     close_min_secs: 20
     previous_target_ttl_secs: 86400
 - id: window_setback_patty
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Arbeitszimmer Patty
   type: window_setback@1.0
   objects:
@@ -51,7 +76,7 @@ rules:
     close_min_secs: 20
     previous_target_ttl_secs: 86400
 - id: window_setback_schlafzimmer
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Schlafzimmer
   type: window_setback@1.0
   objects:
@@ -64,21 +89,6 @@ rules:
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
-- id: window_setback_wohnzimmer
-  enabled: false
-  name: Fensterabsenkung Wohnzimmer
-  type: window_setback@1.0
-  objects:
-    contacts:
-    - kontakt_wohnzimmer_garten_links
-    - kontakt_wohnzimmer_garten_rechts
-    thermostats:
-    - thermostat_wohnzimmer
-  params:
-    eco_target: 16.0
-    open_min_secs: 20
-    close_min_secs: 20
-    previous_target_ttl_secs: 86400
 - id: window_setback_wolfgang
   enabled: true
   name: Fensterabsenkung Arbeitszimmer Wolfgang
@@ -92,3 +102,16 @@ rules:
     eco_target: 16.0
     open_min_secs: 20
     close_min_secs: 20
+- id: window_setback_bad_oben
+  enabled: true
+  name: Fensterabsenkung Bad Oben
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_bad_oben_strasse
+    thermostats:
+    - thermostat_bad_oben
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20