Kaynağa Gözat

fix(water_heaters): remove erroneously added hot_water translation_only_key

This translation key was intended for kitchen hot water dispensors,
not general hot water systems.

In a couple of cases, operation_mode was incorrectly using
non-standard modes, so this has also been cleaned up.
Jason Rumney 2 ay önce
ebeveyn
işleme
bde64ebf3e
29 değiştirilmiş dosya ile 108 ekleme ve 59 silme
  1. 0 1
      custom_components/tuya_local/devices/apricus_heat_pump_water_heater.yaml
  2. 0 1
      custom_components/tuya_local/devices/aquatech_x6_water_heater.yaml
  3. 0 1
      custom_components/tuya_local/devices/axen_ks100w_heatpump.yaml
  4. 0 1
      custom_components/tuya_local/devices/ems_waterheater.yaml
  5. 0 1
      custom_components/tuya_local/devices/ferroli_titano_twin.yaml
  6. 0 1
      custom_components/tuya_local/devices/fisher_water_heatpump.yaml
  7. 0 1
      custom_components/tuya_local/devices/geyserwise_mws_water_heater.yaml
  8. 0 1
      custom_components/tuya_local/devices/geyserwise_water_heater.yaml
  9. 19 7
      custom_components/tuya_local/devices/giatsu_vaw2_waterheater.yaml
  10. 0 1
      custom_components/tuya_local/devices/hy_combo_heatpump.yaml
  11. 0 1
      custom_components/tuya_local/devices/hydrotherm_dynamic_x8_water_heater.yaml
  12. 0 1
      custom_components/tuya_local/devices/hydrotherm_dynamic_x8_water_heaterv6.yaml
  13. 1 2
      custom_components/tuya_local/devices/intaflo_intabloc_airwaterheatpump.yaml
  14. 0 1
      custom_components/tuya_local/devices/kiturami_nctr100_thermostat.yaml
  15. 0 1
      custom_components/tuya_local/devices/koiduo_water_heater.yaml
  16. 0 1
      custom_components/tuya_local/devices/lohxa_sr208c_waterheater.yaml
  17. 0 1
      custom_components/tuya_local/devices/macro_ma20wodp_waterheater.yaml
  18. 30 22
      custom_components/tuya_local/devices/modena_es15sky_waterheater.yaml
  19. 0 1
      custom_components/tuya_local/devices/neopower_heat_pump_water_heater.yaml
  20. 58 1
      custom_components/tuya_local/devices/nulite_nlb245_heatpump.yaml
  21. 0 1
      custom_components/tuya_local/devices/powerworld_pw58330_waterheater.yaml
  22. 0 1
      custom_components/tuya_local/devices/powerworld_pw58410_hvaconly.yaml
  23. 0 1
      custom_components/tuya_local/devices/powerworld_pw58410_waterheater.yaml
  24. 0 1
      custom_components/tuya_local/devices/rinnai_enviroflo_waterheater.yaml
  25. 0 1
      custom_components/tuya_local/devices/sanden_gaua45hpd_heatpumpcontroller.yaml
  26. 0 3
      custom_components/tuya_local/devices/sime_ecomaxi_vb200_waterheater.yaml
  27. 0 1
      custom_components/tuya_local/devices/thermann_r290_waterheater.yaml
  28. 0 1
      custom_components/tuya_local/devices/thermex_if50v_waterheater.yaml
  29. 0 1
      custom_components/tuya_local/devices/thermex_lima80v_waterheater.yaml

+ 0 - 1
custom_components/tuya_local/devices/apricus_heat_pump_water_heater.yaml

@@ -1,7 +1,6 @@
 name: Water heat pump
 name: Water heat pump
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         name: operation_mode
         name: operation_mode

+ 0 - 1
custom_components/tuya_local/devices/aquatech_x6_water_heater.yaml

@@ -2,7 +2,6 @@ name: Water heater
 # products: Aquatech RAPID/X6
 # products: Aquatech RAPID/X6
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/axen_ks100w_heatpump.yaml

@@ -160,7 +160,6 @@ entities:
         mapping:
         mapping:
           - scale: 10
           - scale: 10
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/ems_waterheater.yaml

@@ -6,7 +6,6 @@ products:
     model_id: TH200DT
     model_id: TH200DT
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/ferroli_titano_twin.yaml

@@ -6,7 +6,6 @@ products:
     model_id: DT EWH
     model_id: DT EWH
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         name: operation_mode
         name: operation_mode

+ 0 - 1
custom_components/tuya_local/devices/fisher_water_heatpump.yaml

@@ -46,7 +46,6 @@ entities:
         type: integer
         type: integer
         name: temp_current_f
         name: temp_current_f
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 7
       - id: 7
         name: operation_mode
         name: operation_mode

+ 0 - 1
custom_components/tuya_local/devices/geyserwise_mws_water_heater.yaml

@@ -6,7 +6,6 @@ products:
     name: Solar MPPT Geyser
     name: Solar MPPT Geyser
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/geyserwise_water_heater.yaml

@@ -6,7 +6,6 @@ products:
     name: Geyser timer and controller
     name: Geyser timer and controller
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 19 - 7
custom_components/tuya_local/devices/giatsu_vaw2_waterheater.yaml

@@ -5,7 +5,6 @@ products:
     model: GIA-ATS-O-300VAWT
     model: GIA-ATS-O-300VAWT
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean
@@ -14,12 +13,7 @@ entities:
           - dps_val: false
           - dps_val: false
             value: "off"
             value: "off"
           - dps_val: true
           - dps_val: true
-            constraint: mode
-            conditions:
-              - dps_val: heat
-                value: Heating
-              - dps_val: heatfan
-                value: "Heating + Ventilation"
+            value: heat_pump
       - id: 2
       - id: 2
         type: integer
         type: integer
         name: temperature
         name: temperature
@@ -27,18 +21,36 @@ entities:
           min: 10
           min: 10
           max: 70
           max: 70
         unit: C
         unit: C
+      - id: 3
+        type: integer
+        name: current_temperature
       - id: 4
       - id: 4
         type: string
         type: string
         name: mode
         name: mode
         hidden: true
         hidden: true
   - entity: sensor
   - entity: sensor
     class: temperature
     class: temperature
+    category: diagnostic
+    deprecated: water_heater.current_temperature  # 2026-04-18
     dps:
     dps:
       - id: 3
       - id: 3
         type: integer
         type: integer
         name: sensor
         name: sensor
         unit: C
         unit: C
         class: measurement
         class: measurement
+  - entity: select
+    translation_key: mode
+    category: config
+    dps:
+      - id: 4
+        type: string
+        name: option
+        mapping:
+          - dps_val: heat
+            value: Heating
+          - dps_val: heatfan
+            value: Heating and ventilation
+
   - entity: binary_sensor
   - entity: binary_sensor
     class: problem
     class: problem
     category: diagnostic
     category: diagnostic

+ 0 - 1
custom_components/tuya_local/devices/hy_combo_heatpump.yaml

@@ -91,7 +91,6 @@ entities:
           min: 7
           min: 7
           max: 25
           max: 25
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/hydrotherm_dynamic_x8_water_heater.yaml

@@ -2,7 +2,6 @@ name: Hot water
 # products: Hydrotherm DYNAMIC/X8
 # products: Hydrotherm DYNAMIC/X8
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/hydrotherm_dynamic_x8_water_heaterv6.yaml

@@ -5,7 +5,6 @@ products:
     model: Dynamic X8 gen 6
     model: Dynamic X8 gen 6
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 1 - 2
custom_components/tuya_local/devices/intaflo_intabloc_airwaterheatpump.yaml

@@ -94,8 +94,7 @@ entities:
         type: integer
         type: integer
         name: current_temperature
         name: current_temperature
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
-    dps:
+     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean
         name: operation_mode
         name: operation_mode

+ 0 - 1
custom_components/tuya_local/devices/kiturami_nctr100_thermostat.yaml

@@ -54,7 +54,6 @@ entities:
         type: integer
         type: integer
         name: room_temperature
         name: room_temperature
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/koiduo_water_heater.yaml

@@ -5,7 +5,6 @@ products:
     model: HTW-TD-080
     model: HTW-TD-080
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/lohxa_sr208c_waterheater.yaml

@@ -5,7 +5,6 @@ products:
     model: SR208C
     model: SR208C
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/macro_ma20wodp_waterheater.yaml

@@ -6,7 +6,6 @@ products:
     model: MA-20WODP
     model: MA-20WODP
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 30 - 22
custom_components/tuya_local/devices/modena_es15sky_waterheater.yaml

@@ -5,14 +5,41 @@ products:
     model: ES-15-SKY
     model: ES-15-SKY
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean
-        name: switch
+        name: operation_mode
+        mapping:
+          - dps_val: false
+            value: "off"
+          - dps_val: true
+            value: electric
+      - id: 103
+        type: integer
+        name: temperature
+        unit: C
+        range:
+          min: 30
+          max: 75
+      - id: 108
+        type: integer
+        name: current_temperature
+      - id: 115
+        type: integer
+        name: reserve1
+      - id: 116
+        type: integer
+        name: reserve2
+      - id: 117
+        type: integer
+        name: reserve3
+  - entity: select
+    translation_key: mode
+    category: config
+    dps:
       - id: 101
       - id: 101
         type: integer
         type: integer
-        name: operation_mode
+        name: option
         mapping:
         mapping:
           - dps_val: 0
           - dps_val: 0
             value: Mode 0
             value: Mode 0
@@ -36,25 +63,6 @@ entities:
             value: Mode 9
             value: Mode 9
           - dps_val: 10
           - dps_val: 10
             value: Mode 10
             value: Mode 10
-      - id: 103
-        type: integer
-        name: temperature
-        unit: C
-        range:
-          min: 30
-          max: 75
-      - id: 108
-        type: integer
-        name: current_temperature
-      - id: 115
-        type: integer
-        name: reserve1
-      - id: 116
-        type: integer
-        name: reserve2
-      - id: 117
-        type: integer
-        name: reserve3
   - entity: sensor
   - entity: sensor
     name: Energy
     name: Energy
     category: diagnostic
     category: diagnostic

+ 0 - 1
custom_components/tuya_local/devices/neopower_heat_pump_water_heater.yaml

@@ -5,7 +5,6 @@ products:
     model: Black Diamond all-in-one
     model: Black Diamond all-in-one
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 58 - 1
custom_components/tuya_local/devices/nulite_nlb245_heatpump.yaml

@@ -76,8 +76,64 @@ entities:
         type: bitfield
         type: bitfield
         name: fault_code
         name: fault_code
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
+      - id: 1
+        type: boolean
+        name: operation_mode
+        mapping:
+          - dps_val: false
+            value: "off"
+            available: dhw_only
+          - dps_val: true
+            constraint: mode
+            conditions:
+              - dps_val: Heat
+                value: "off"
+                available: air_heat
+              - dps_val: Cool
+                value: "off"
+                available: air_cool
+              - dps_val: HotWater
+                value: heat_pump
+                available: dhw_only
+              - dps_val: Heat_HotWater
+                value: heat_pump
+                available: air_heat
+              - dps_val: Cool_HotWater
+                value: heat_pump
+                available: air_cool
+      - id: 4
+        type: string
+        name: mode
+        hidden: true
+      - id: 4
+        type: string
+        name: dhw_only
+        hidden: true
+        mapping:
+          - dps_val: HotWater
+            value: true
+          - value: false
+      - id: 4
+        type: string
+        name: air_heat
+        hidden: true
+        mapping:
+          - dps_val: Heat
+            value: true
+          - dps_val: Heat_HotWater
+            value: true
+          - value: false
+      - id: 4
+        type: string
+        name: air_cool
+        hidden: true
+        mapping:
+          - dps_val: Cool
+            value: true
+          - dps_val: Cool_HotWater
+            value: true
+          - value: false
       - id: 101
       - id: 101
         type: integer
         type: integer
         name: temperature
         name: temperature
@@ -87,6 +143,7 @@ entities:
           max: 50
           max: 50
   - entity: select
   - entity: select
     translation_key: heat_pump_mode
     translation_key: heat_pump_mode
+    deprecated: climate.hvac_mode and water_heater.operation_mode  # 2026-04-18
     category: config
     category: config
     dps:
     dps:
       - id: 4
       - id: 4

+ 0 - 1
custom_components/tuya_local/devices/powerworld_pw58330_waterheater.yaml

@@ -8,7 +8,6 @@ products:
 #     model: PW58330
 #     model: PW58330
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/powerworld_pw58410_hvaconly.yaml

@@ -69,7 +69,6 @@ entities:
           min: 0
           min: 0
           max: 99
           max: 99
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/powerworld_pw58410_waterheater.yaml

@@ -5,7 +5,6 @@ products:
     model: PW58410
     model: PW58410
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/rinnai_enviroflo_waterheater.yaml

@@ -5,7 +5,6 @@ products:
     model: Enviroflo
     model: Enviroflo
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/sanden_gaua45hpd_heatpumpcontroller.yaml

@@ -6,7 +6,6 @@ products:
     name: Heat pump controller
     name: Heat pump controller
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 101
       - id: 101
         type: boolean
         type: boolean

+ 0 - 3
custom_components/tuya_local/devices/sime_ecomaxi_vb200_waterheater.yaml

@@ -5,7 +5,6 @@ products:
     model: EcoMaxi VB 200 WiFi
     model: EcoMaxi VB 200 WiFi
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         name: operation_mode
         name: operation_mode
@@ -13,10 +12,8 @@ entities:
         mapping:
         mapping:
           - dps_val: false
           - dps_val: false
             value: "off"
             value: "off"
-            icon: "mdi:water-boiler-off"
           - dps_val: true
           - dps_val: true
             value: heat_pump
             value: heat_pump
-            icon: "mdi:water-boiler"
       - id: 4
       - id: 4
         name: temperature
         name: temperature
         type: integer
         type: integer

+ 0 - 1
custom_components/tuya_local/devices/thermann_r290_waterheater.yaml

@@ -10,7 +10,6 @@ entities:
         type: boolean
         type: boolean
         name: switch
         name: switch
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 4
       - id: 4
         type: string
         type: string

+ 0 - 1
custom_components/tuya_local/devices/thermex_if50v_waterheater.yaml

@@ -8,7 +8,6 @@ products:
     model: ID 80 V pro
     model: ID 80 V pro
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 101
       - id: 101
         type: boolean
         type: boolean

+ 0 - 1
custom_components/tuya_local/devices/thermex_lima80v_waterheater.yaml

@@ -1,7 +1,6 @@
 name: Water heater
 name: Water heater
 entities:
 entities:
   - entity: water_heater
   - entity: water_heater
-    translation_only_key: hot_water
     dps:
     dps:
       - id: 1
       - id: 1
         type: boolean
         type: boolean