merged

config/devices.yaml

@@ -466,6 +466,21 @@ 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: zigbee2mqtt
+  features:
+    heating: true
+    temperature_range:
+    - 5
+    - 30
+    temperature_step: 0.5
+  topics:
+    state: "zigbee2mqtt/0x003c84fffebdcc28"
+    set: "zigbee2mqtt/0x003c84fffebdcc28/set"
 - device_id: sterne_wohnzimmer
   homekit_aid: 32
   name: Sterne
@@ -1137,19 +1152,3 @@ devices:
   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

@@ -9,7 +9,11 @@ rules:
     thermostats:
     - thermostat_bad_unten
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_esszimmer
@@ -23,7 +27,11 @@ rules:
     thermostats:
     - thermostat_esszimmer
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -38,7 +46,11 @@ rules:
     thermostats:
     - thermostat_wohnzimmer
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -55,7 +67,11 @@ rules:
     thermostats:
     - thermostat_kueche
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -71,7 +87,11 @@ rules:
     thermostats:
     - thermostat_patty
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -85,7 +105,11 @@ rules:
     thermostats:
     - thermostat_schlafzimmer
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -99,7 +123,11 @@ rules:
     thermostats:
     - thermostat_wolfgang
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_bad_oben
@@ -112,6 +140,10 @@ rules:
     thermostats:
     - thermostat_bad_oben
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20