Move zuluft/abluft numbers to wp_base and fix them

kr0ner · Dec 10, 2024 · 4665aeb · 4665aeb
1 parent 18cc2ca
commit 4665aeb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/property.h b/src/property.h
@@ -123,6 +123,12 @@ struct Property : public detail::Property {
     PROPERTY(LUEFT_STUFE_NACHT, 0x056d);
     PROPERTY(LUEFT_STUFE_PARTY, 0x0570);
     PROPERTY(PASSIVKUEHLUNG, 0x0575);
+    PROPERTY(LUEFT_ZULUFT_STUFE1, 0x0576);
+    PROPERTY(LUEFT_ZULUFT_STUFE2, 0x0577);
+    PROPERTY(LUEFT_ZULUFT_STUFE3, 0x0578);
+    PROPERTY(LUEFT_ABLUFT_STUFE1, 0x0579);
+    PROPERTY(LUEFT_ABLUFT_STUFE2, 0x057a);
+    PROPERTY(LUEFT_ABLUFT_STUFE3, 0x057b);
     PROPERTY(NE_STUFE_WW, 0x058a);
     PROPERTY(ZULUFT_SOLL, 0x0596);
     PROPERTY(ZULUFT_IST, 0x0597);
@@ -158,12 +164,6 @@ struct Property : public detail::Property {
     PROPERTY(LUEFT_ZEIT_AUSSERPLAN_STUFE1, 0x0572);
     PROPERTY(LUEFT_ZEIT_AUSSERPLAN_STUFE2, 0x0573);
     PROPERTY(LUEFT_ZEIT_AUSSERPLAN_STUFE3, 0x0574);
-    PROPERTY(LUEFT_ZULUFT_STUFE1, 0x0576);
-    PROPERTY(LUEFT_ZULUFT_STUFE2, 0x0577);
-    PROPERTY(LUEFT_ZULUFT_STUFE3, 0x0578);
-    PROPERTY(LUEFT_ABLUFT_STUFE1, 0x0579);
-    PROPERTY(LUEFT_ABLUFT_STUFE2, 0x057a);
-    PROPERTY(LUEFT_ABLUFT_STUFE3, 0x057b);
     PROPERTY(SOMMERBETRIEB_HYSTERESE, 0x05a2, Type::et_dec_val);
     PROPERTY(LUEFT_STUFE_HAND, 0x0612);
 #endif

diff --git a/yaml/thz5_5_eco.yaml b/yaml/thz5_5_eco.yaml
@@ -9,11 +9,5 @@ packages:
 
   LUEFT_STUFE_BEREITSCHAFT:       !include { file: wp_ventilation.yaml, vars: { property: "LUEFT_STUFE_BEREITSCHAFT" }}
   LUEFT_STUFE_HAND:               !include { file: wp_ventilation.yaml, vars: { property: "LUEFT_STUFE_HAND" }}
-  LUEFT_ZULUFT_STUFE1:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ZULUFT_STUFE1",icon: "mdi:pump", unit: "m³/h"  }}
-  LUEFT_ZULUFT_STUFE2:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ZULUFT_STUFE2",icon: "mdi:pump", unit: "m³/h"  }}
-  LUEFT_ZULUFT_STUFE3:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ZULUFT_STUFE3",icon: "mdi:pump", unit: "m³/h"  }}
-  LUEFT_ABLUFT_STUFE1:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ABLUFT_STUFE1",icon: "mdi:pump", unit: "m³/h"  }}
-  LUEFT_ABLUFT_STUFE2:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ABLUFT_STUFE2",icon: "mdi:pump", unit: "m³/h"  }}
-  LUEFT_ABLUFT_STUFE3:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ABLUFT_STUFE3",icon: "mdi:pump", unit: "m³/h"  }}
   LAUFZEIT_FILTER_TAGE:           !include { file: wp_generic.yaml, vars: { property: "LAUFZEIT_FILTER_TAGE",icon: "mdi:air-filter", unit: "d", interval: $interval_once_in_a_while  }}
   SOMMERBETRIEB_TEMP:             !include { file: wp_number.yaml, vars:  { property: "SOMMERBETRIEB_TEMP", icon: "mdi:sun-thermometer", min: "15.0", max: "25.0", step: "1.0", unit: "°C"  }}
diff --git a/yaml/wp_base.yaml b/yaml/wp_base.yaml
@@ -286,5 +286,11 @@ packages:
   LEISTUNG_AUSLEGUNG_KUEHLEN:     !include { file: wp_number.yaml, vars: { property: "LEISTUNG_AUSLEGUNG_KUEHLEN" }}
   PUMPENDREHZAHL_HEIZEN:          !include { file: wp_number.yaml, vars: { property: "PUMPENDREHZAHL_HEIZEN"      , step: "0.1" }}
   HYSTERESE_WW:                   !include { file: wp_number.yaml, vars: { property: "HYSTERESE_WW"               , min: "2.0", max: "10.0", step: "0.1", unit: "°C" }}
+  LUEFT_ZULUFT_STUFE1:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ZULUFT_STUFE1", min: "0.0", max: "300.0", unit: "m³/h", icon: "mdi:air-filter"  }}
+  LUEFT_ZULUFT_STUFE2:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ZULUFT_STUFE2", min: "0.0", max: "300.0", unit: "m³/h", icon: "mdi:air-filter"  }}
+  LUEFT_ZULUFT_STUFE3:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ZULUFT_STUFE3", min: "0.0", max: "300.0", unit: "m³/h", icon: "mdi:air-filter"  }}
+  LUEFT_ABLUFT_STUFE1:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ABLUFT_STUFE1", min: "0.0", max: "300.0", unit: "m³/h", icon: "mdi:air-filter"  }}
+  LUEFT_ABLUFT_STUFE2:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ABLUFT_STUFE2", min: "0.0", max: "300.0", unit: "m³/h", icon: "mdi:air-filter"  }}
+  LUEFT_ABLUFT_STUFE3:            !include { file: wp_number.yaml, vars: { property: "LUEFT_ABLUFT_STUFE3", min: "0.0", max: "300.0", unit: "m³/h", icon: "mdi:air-filter"  }}
 
   WAERMEERTRAG_RUECKGE_TAG_SUMME_KWH:  !include { file: wp_daily_energy_combined.yaml, vars: { sensor_name: "WAERMEERTRAG_RUECKGE_TAG_SUMME_KWH" , property_wh: "WAERMEERTRAG_RUECKGE_TAG_WH"    , property_kwh: "WAERMEERTRAG_RUECKGE_TAG_KWH"     }}