refactor(solareast_aurora2_heatpump): use water_heater and climate

- renamed the config to follow BRAND_MODEL_TYPE.yaml naming convention
- refactor the low level entities into climate and water_heater entities

PR #3429

custom_components/tuya_local/devices/solareast_heatpump_adlarcastra.yaml → custom_components/tuya_local/devices/solareast_aurora2_heatpump.yaml

@@ -1,69 +1,156 @@
-name: Heat pump Adlår Castra / SolarEast
+name: Heat pump
 products:
   - id: g9m7honkxjweukvt
-    manufacturer: SolarEast
+    manufacturer: SolarEast/Adlår Castra
     model: Aurora II
-    name: Adlår Castra Aurora II 6kWh
 entities:
-  - entity: switch
-    translation_key: switch_x
-    translation_placeholders:
-      x: ""
-    class: switch
-    category: config
+  - entity: water_heater
+    translation_key: water_air
     dps:
       - id: 1
         name: switch
         type: boolean
+        mapping:
+          - dps_val: false
+            value: "off"
+          - dps_val: true
+            value: heat_pump
+      - id: 38
+        name: current_temperature
+        type: integer
+      - id: 101
+        name: temperature
+        type: integer
+        unit: "C"
+        range:
+          min: 10
+          max: 75
   - entity: select
-    name: mode
+    translation_key: heat_pump_mode
     category: config
     dps:
       - id: 2
         name: option
         type: string
         mapping:
-          - dps_val: "cold"
-            value: "cold"
-          - dps_val: "heating"
-            value: "heating"
-          - dps_val: "floor_heating"
-            value: "floor_heating"
-          - dps_val: "hot_water"
-            value: "hot_water"
-          - dps_val: "cold_and_hotwater"
-            value: "cold_and_hotwater"
-          - dps_val: "heating_and_hot_water"
-            value: "heating_and_hot_water"
-          - dps_val: "floor_heating_and_hot_water"
-            value: "floor_heating_and_hot_water"
-  - entity: number
-    name: temp_set
-    category: config
+          - dps_val: cold
+            value: cool
+          - dps_val: heating
+            value: heat
+          - dps_val: floor_heating
+            value: floor_heat
+          - dps_val: hot_water
+            value: hotwater
+          - dps_val: cold_and_hot_water
+            value: hotwater_cool
+          - dps_val: heating_and_hot_water
+            value: hotwater_heat
+          - dps_val: floor_heating_and_hot_water
+            value: hotwater_floor_heat
+  - entity: climate
     dps:
+      - id: 1
+        type: boolean
+        name: hvac_mode
+        mapping:
+          - dps_val: false
+            value: "off"
+            available: wth_off
+          - dps_val: true
+            constraint: work_mode
+            conditions:
+              - dps_val: cold
+                value: cool
+                available: wth_off
+              # Since there are both heating and floor_heating, model
+              # the air heating as dry, and floor_heating as heat
+              - dps_val: heating
+                value: dry
+                available: wth_off
+              - dps_val: floor_heating
+                value: heat
+                available: wth_off
+              - dps_val: hot_water
+                value: "off"
+                available: wth_on
+              - dps_val: cold_and_hot_water
+                value: cool
+                available: wth_on
+              - dps_val: heating_and_hot_water
+                value: dry
+                available: wth_on
+              - dps_val: floor_heating_and_hot_water
+                value: heat
+                available: wth_on
+      - id: 2
+        type: string
+        name: work_mode
+        hidden: true
+      - id: 2
+        type: string
+        name: wth_off
+        mapping:
+          - dps_val: hot_water
+            value: false
+          - dps_val: cold_and_hot_water
+            value: false
+          - dps_val: heating_and_hot_water
+            value: false
+          - dps_val: floor_heating_and_hot_water
+            value: false
+          - value: true
+      - id: 2
+        type: string
+        name: wth_on
+        mapping:
+          - dps_val: hot_water
+            value: true
+          - dps_val: cold_and_hot_water
+            value: true
+          - dps_val: heating_and_hot_water
+            value: true
+          - dps_val: floor_heating_and_hot_water
+            value: true
+          - value: false
       - id: 4
-        name: value
+        name: temperature
         type: integer
-        unit: "C"
+        unit: C
         range:
           min: 5
           max: 75
-  - entity: select
-    name: working_mode
-    category: config
-    dps:
       - id: 5
-        name: option
+        name: preset_mode
         type: string
         mapping:
-          - dps_val: "ECO"
-            value: "ECO"
-          - dps_val: "Normal"
-            value: "Normal"
+          - dps_val: ECO
+            value: eco
+          - dps_val: Normal
+            value: normal
           - dps_val: "Boost"
-            value: "Boost"
+            value: boost
+      # Inlet temperature used here, as ambient is often the outdoor unit
+      # I don't see an indoor_temp, but if ambient is, then it may be more
+      # suitable to use here
+      - id: 21
+        name: temperature
+        type: integer
+      - id: 27
+        name: hvac_action
+        type: boolean
+        mapping:
+          - dps_val: false
+            value: idle
+          - dps_val: true
+            value: heating
+            constraint: work_mode
+            conditions:
+              - dps_val: [cold, cold_and_hot_water]
+                value: cooling
+              - dps_val: hotwater
+                value: "off"
   - entity: select
-    name: hot_water_curve_set
+    name: Hot water curve
     category: config
     hidden: true
     dps:
@@ -82,7 +169,7 @@ entities:
           - dps_val: "H4"
             value: "H4"
   - entity: select
-    name: heat_curve_set
+    name: Heat curve
     category: config
     dps:
       - id: 13
@@ -124,19 +211,9 @@ entities:
           - dps_val: "L8"
             value: "L8"
   - entity: sensor
-    name: today_power_used
-    class: energy
-    dps:
-      - id: 18
-        name: sensor
-        type: integer
-        unit: kWh
-        class: total_increasing
-        mapping:
-          - scale: 100
-  - entity: sensor
-    name: compressor_frequency
+    name: Compressor frequency
     category: diagnostic
+    class: frequency
     hidden: true
     dps:
       - id: 20
@@ -144,7 +221,8 @@ entities:
         type: integer
         unit: Hz
   - entity: sensor
-    name: inlet_temp
+    name: Inlet temperature
+    category: diagnostic
     class: temperature
     dps:
       - id: 21
@@ -153,7 +231,8 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: outlet_temp
+    name: Outlet temperature
+    category: diagnostic
     class: temperature
     dps:
       - id: 22
@@ -162,7 +241,7 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: coiler_temp
+    name: Coil temperature
     category: diagnostic
     class: temperature
     dps:
@@ -172,7 +251,7 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: discharge_temp
+    name: Discharge temperature
     category: diagnostic
     class: temperature
     dps:
@@ -182,7 +261,7 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: ambient_temp
+    name: Ambient temperature
     class: temperature
     dps:
       - id: 26
@@ -191,28 +270,21 @@ entities:
         unit: "C"
         class: measurement
   - entity: binary_sensor
-    name: compressor_state
-    category: diagnostic
-    dps:
-      - id: 27
-        name: sensor
-        type: boolean
-  - entity: binary_sensor
-    name: backwater_state
+    name: Backflow
+    class: problem
     category: diagnostic
     dps:
       - id: 31
         name: sensor
         type: boolean
   - entity: binary_sensor
-    #  name: defrost_state
     translation_key: defrost
     dps:
       - id: 33
         name: sensor
         type: boolean
   - entity: sensor
-    name: high_pressure_temp
+    name: High pressure temperature
     category: diagnostic
     class: temperature
     dps:
@@ -222,7 +294,7 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: low_pressure_temp
+    name: Low pressure temp
     category: diagnostic
     class: temperature
     dps:
@@ -232,7 +304,7 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: incoiler_temp
+    name: Indoor coil temperature
     category: diagnostic
     class: temperature
     dps:
@@ -242,25 +314,16 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: tank_temp
-    category: diagnostic
-    class: temperature
-    dps:
-      - id: 38
-        name: sensor
-        type: integer
-        unit: "C"
-        class: measurement
-  - entity: sensor
-    name: water_flow
+    class: volume_flow_rate
     dps:
       - id: 39
         name: sensor
         type: integer
-        unit: L/Min
+        unit: L/min
         class: measurement
   - entity: sensor
-    name: fan_motor_frequency
+    name: Fan motor frequency
+    class: frequency
     category: diagnostic
     hidden: true
     dps:
@@ -270,7 +333,7 @@ entities:
         unit: Hz
         class: measurement
   - entity: sensor
-    name: suction_temp
+    name: Suction temperature
     category: diagnostic
     class: temperature
     dps:
@@ -279,19 +342,6 @@ entities:
         type: integer
         unit: "C"
         class: measurement
-  - entity: sensor
-    name: hot_water_temp_set
-    class: temperature
-    hidden: true
-    dps:
-      - id: 101
-        name: sensor
-        type: integer
-        unit: "C"
-        range:
-          min: 10
-          max: 75
-        class: measurement
   - entity: sensor
     class: current
     dps:
@@ -323,7 +373,6 @@ entities:
           - scale: 10
         class: measurement
   - entity: sensor
-    name: total_power_used
     class: energy
     dps:
       - id: 105
@@ -332,9 +381,15 @@ entities:
         unit: kWh
         mapping:
           - scale: 100
-        class: total
+        class: total_increasing
+      - id: 18
+        name: today
+        type: integer
+        unit: kWh
+        mapping:
+          - scale: 100
   - entity: sensor
-    name: economizer_inlet_temp
+    name: Economizer inlet temp
     category: diagnostic
     class: temperature
     dps:
@@ -344,7 +399,7 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    name: economy_inlet_temp
+    name: Economy inlet temp
     category: diagnostic
     class: temperature
     dps:
@@ -354,7 +409,6 @@ entities:
         unit: "C"
         class: measurement
   - entity: sensor
-    #  name: currentB
     translation_key: current_x
     translation_placeholders:
       x: "B"
@@ -368,7 +422,6 @@ entities:
           - scale: 1000
         class: measurement
   - entity: sensor
-    #  name: voltageB
     translation_key: voltage_x
     translation_placeholders:
       x: "B"
@@ -383,7 +436,6 @@ entities:
           - scale: 10
         class: measurement
   - entity: sensor
-    #  name: voltageC
     translation_key: voltage_x
     translation_placeholders:
       x: "C"

custom_components/tuya_local/translations/bg.json

@@ -426,11 +426,13 @@
                     "heat": "Нагряване",
                     "cool": "Охлаждане",
                     "auto": "Автоматично",
+                    "floor_heat": "Подово отопление",
                     "off": "Изключено",
                     "hotwater": "Гореща вода",
                     "hotwater_cool": "Гореща вода и охлаждане",
                     "hotwater_heat": "Гореща вода и отопление",
-                    "hotwater_auto": "Гореща вода и автоматично"
+                    "hotwater_auto": "Гореща вода и автоматично",
+                    "hotwater_floor_heat": "Гореща вода и подово отопление"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/ca.json

@@ -561,11 +561,13 @@
                     "heat": "Escalfament",
                     "cool": "Refredament",
                     "auto": "Automàtic",
+                    "floor_heat": "Escalfament de terra",
                     "off": "Apagat",
                     "hotwater": "Aigua calenta",
                     "hotwater_cool": "Aigua calenta i refredament",
                     "hotwater_heat": "Aigua calenta i escalfament",
-                    "hotwater_auto": "Aigua calenta i automàtic"
+                    "hotwater_auto": "Aigua calenta i automàtic",
+                    "hotwater_floor_heat": "Aigua calenta i escalfament de terra"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/cz.json

@@ -426,11 +426,13 @@
                     "heat": "Ohřátí",
                     "cool": "Chlazení",
                     "auto": "Auto",
+                    "floor_heat": "Tepelná podlaha",
                     "off": "Vypnuto",
                     "hotwater": "Horká voda",
                     "hotwater_cool": "Horká voda chlazení",
                     "hotwater_heat": "Horká voda ohřátí",
-                    "hotwater_auto": "Horká voda auto"
+                    "hotwater_auto": "Horká voda auto",
+                    "hotwater_floor_heat": "Horká voda tepelná podlaha"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/de.json

@@ -425,11 +425,13 @@
                     "heat": "Heizen",
                     "cool": "Kühlen",
                     "auto": "Auto",
+                    "floor_heat": "Bodenheizung",
                     "off": "Aus",
                     "hotwater": "Warmwasser",
                     "hotwater_cool": "Warmwasser Kühlen",
                     "hotwater_heat": "Warmwasser Heizen",
-                    "hotwater_auto": "Warmwasser Auto"
+                    "hotwater_auto": "Warmwasser Auto",
+                    "hotwater_floor_heat": "Warmwasser Bodenheizung"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/el.json

@@ -426,11 +426,13 @@
                     "heat": "Θέρμανση",
                     "cool": "Ψύξη",
                     "auto": "Αυτόματο",
+                    "floor_heat": "Θέρμανση πατώματος",
                     "off": "Απενεργοποίηση",
                     "hotwater": "Ζεστό νερό",
                     "hotwater_cool": "Ζεστό νερό και ψύξη",
                     "hotwater_heat": "Ζεστό νερό και θέρμανση",
-                    "hotwater_auto": "Αυτόματο ζεστό νερό"
+                    "hotwater_auto": "Αυτόματο ζεστό νερό",
+                    "hotwater_floor_heat": "Ζεστό νερό και θέρμανση πατώματος"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/en.json

@@ -426,11 +426,13 @@
                     "off": "Off",
                     "heat": "Heat",
                     "cool": "Cool",
+                    "floor_heat": "Floor heat",
                     "auto": "Auto",
                     "hotwater": "Hot water",
                     "hotwater_cool": "Hot water & Cool",
                     "hotwater_heat": "Hot water & Heat",
-                    "hotwater_auto": "Hot water & Auto"
+                    "hotwater_auto": "Hot water & Auto",
+                    "hotwater_floor_heat": "Hot water & Floor heat"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/es.json

@@ -426,11 +426,13 @@
                     "cool": "Enfriar",
                     "heat": "Calentar",
                     "auto": "Auto",
+                    "floor_heat": "Calor de piso",
                     "off": "Apagar",
                     "hotwater": "Agua caliente",
                     "hotwater_cool": "Agua caliente y enfriar",
                     "hotwater_heat": "Agua caliente y calentar",
-                    "hotwater_auto": "Agua caliente y auto"
+                    "hotwater_auto": "Agua caliente y auto",
+                    "hotwater_floor_heat": "Agua caliente y calor de piso"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/fr.json

@@ -426,11 +426,13 @@
                     "heat": "Chauffage",
                     "cool": "Refroidissement",
                     "auto": "Auto",
+                    "floor_heat": "Chauffage de sol",
                     "off": "Éteint",
                     "hotwater": "Eau chaude",
                     "hotwater_cool": "Eau chaude et refroidissement",
                     "hotwater_heat": "Eau chaude et chauffage",
-                    "hotwater_auto": "Eau chaude et auto"
+                    "hotwater_auto": "Eau chaude et auto",
+                    "hotwater_floor_heat": "Eau chaude et chauffage de sol"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/hu.json

@@ -427,11 +427,13 @@
                     "heat": "Fűtés",
                     "cool": "Hűtés",
                     "auto": "Auto",
+                    "floor_heat": "Padlófűtés",
                     "off": "Ki",
                     "hotwater": "Meleg víz",
                     "hotwater_cool": "Meleg víz és hűtés",
                     "hotwater_heat": "Meleg víz és fűtés",
-                    "hotwater_auto": "Meleg víz és automatikus"
+                    "hotwater_auto": "Meleg víz és automatikus",
+                    "hotwater_floor_heat": "Meleg víz és padlófűtés"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/id.json

@@ -426,11 +426,13 @@
                     "heat": "Pemanas",
                     "cool": "Pendingin",
                     "auto": "Otomatis",
+                    "floor_heat": "Pemanas lantai",
                     "off": "Mati",
                     "hotwater": "Air panas",
                     "hotwater_cool": "Pendingin air panas",
                     "hotwater_heat": "Pemanas air panas",
-                    "hotwater_auto": "Otomatis air panas"
+                    "hotwater_auto": "Otomatis air panas",
+                    "hotwater_floor_heat": "Pemanas lantai air panas"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/it.json

@@ -427,11 +427,13 @@
                     "heat": "Riscaldamento",
                     "cool": "Raffreddamento",
                     "auto": "Auto",
+                    "floor_heat": "Riscaldamento pavimento",
                     "off": "Spento",
                     "hotwater": "Acqua calda",
                     "hotwater_cool": "Acqua calda e raffreddamento",
                     "hotwater_heat": "Acqua calda e riscaldamento",
-                    "hotwater_auto": "Acqua calda e auto"
+                    "hotwater_auto": "Acqua calda e auto",
+                    "hotwater_floor_heat": "Acqua calda e riscaldamento pavimento"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/ja.json

@@ -426,11 +426,13 @@
                     "heat": "加熱",
                     "cool": "冷却",
                     "auto": "自動",
+                    "floor_heat": "床暖房",
                     "off": "オフ",
                     "hotwater": "給湯",
                     "hotwater_cool": "給湯冷却",
                     "hotwater_heat": "給湯加熱",
-                    "hotwater_auto": "給湯自動"
+                    "hotwater_auto": "給湯自動",
+                    "hotwater_floor_heat": "給湯床暖房"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/no-NB.json

@@ -427,11 +427,13 @@
                     "heat": "Varm",
                     "cool": "Kald",
                     "auto": "Auto",
+                    "floor_heat": "Gulvvarme",
                     "off": "Av",
                     "hotwater": "Varmt vann",
                     "hotwater_cool": "Varmt vann og kald",
                     "hotwater_heat": "Varmt vann og varmt",
-                    "hotwater_auto": "Varmt vann og auto"
+                    "hotwater_auto": "Varmt vann og auto",
+                    "hotwater_floor_heat": "Varmt vann og gulvvarme"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/pl.json

@@ -426,11 +426,13 @@
                     "heat": "Ogrzewanie",
                     "cool": "Chłodzenie",
                     "auto": "Auto",
+                    "floor_heat": "Ogrzewanie podłogi",
                     "off": "Wyłączony",
                     "hotwater": "Podgrzewanie wody",
                     "hotwater_cool": "Podgrzewanie wody i chłodzenie",
                     "hotwater_heat": "Podgrzewanie wody i ogrzewanie",
-                    "hotwater_auto": "Podgrzewanie wody i auto"
+                    "hotwater_auto": "Podgrzewanie wody i auto",
+                    "hotwater_floor_heat": "Podgrzewanie wody i ogrzewanie podłogi"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/pt-BR.json

@@ -426,11 +426,13 @@
                     "heat": "Aquecimento",
                     "cool": "Resfriamento",
                     "auto": "Automático",
+                    "floor_heat": "Aquecimento do chão",
                     "off": "Desligado",
                     "hotwater": "Água quente",
                     "hotwater_cool": "Água quente e resfriamento",
                     "hotwater_heat": "Aquecimento de água quente",
-                    "hotwater_auto": "Água quente automática"
+                    "hotwater_auto": "Água quente automática",
+                    "hotwater_floor_heat": "Aquecimento de água quente do chão"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/pt-PT.json

@@ -426,11 +426,13 @@
                     "heat": "Aquecimento",
                     "cool": "Arrefecimento",
                     "auto": "Automático",
+                    "floor_heat": "Aquecimento do chão",
                     "off": "Desligado",
                     "hotwater": "Água quente",
                     "hotwater_cool": "Água quente e resfriamento",
                     "hotwater_heat": "Água quente e aquecimento",
-                    "hotwater_auto": "Água quente e automática"
+                    "hotwater_auto": "Água quente e automática",
+                    "hotwater_floor_heat": "Água quente e aquecimento do chão"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/ru.json

@@ -426,11 +426,13 @@
                     "heat": "Нагрев",
                     "cool": "Охлаждение",
                     "auto": "Авто",
+                    "floor_heat": "Теплый пол",
                     "off": "Выкл",
                     "hotwater": "Горячая вода",
                     "hotwater_cool": "Горячая вода и охлаждение",
                     "hotwater_heat": "Горячая вода и нагрев",
-                    "hotwater_auto": "Горячая вода и авто"
+                    "hotwater_auto": "Горячая вода и авто",
+                    "hotwater_floor_heat": "Горячая вода и теплый пол"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/uk.json

@@ -429,11 +429,13 @@
                     "heat": "Нагрівання",
                     "cool": "Охолодження",
                     "auto": "Авто",
+                    "floor_heat": "Тепла підлога",
                     "off": "Вимк",
                     "hotwater": "Гаряча вода",
                     "hotwater_cool": "Гаряча вода та охолодження",
                     "hotwater_heat": "Гаряча вода та нагрівання",
-                    "hotwater_auto": "Гаряча вода та авто"
+                    "hotwater_auto": "Гаряча вода та авто",
+                    "hotwater_floor_heat": "Гаряча вода та тепла підлога"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/ur.json

@@ -429,11 +429,13 @@
                     "heat": "گرم",
                     "cool": "ٹھنڈا",
                     "auto": "خود کار",
+                    "floor_heat": "فرش گرم",
                     "off": "آف",
                     "hotwater": "گرم پانی",
                     "hotwater_cool": "گرم پانی اور ٹھنڈا",
                     "hotwater_heat": "گرم پانی اور گرم",
-                    "hotwater_auto": "گرم پانی اور خود کار"
+                    "hotwater_auto": "گرم پانی اور خود کار",
+                    "hotwater_floor_heat": "گرم پانی اور فرش گرم"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/zh-Hans.json

@@ -426,11 +426,13 @@
                     "heat": "加热",
                     "cool": "制冷",
                     "auto": "自动",
+                    "floor_heat": "地板加热",
                     "off": "关闭",
                     "hotwater": "热水",
                     "hotwater_cool": "热水制冷",
                     "hotwater_heat": "热水加热",
-                    "hotwater_auto": "热水自动"
+                    "hotwater_auto": "热水自动",
+                    "hotwater_floor_heat": "热水地板加热"
                 }
             },
             "initial_state": {

custom_components/tuya_local/translations/zh-Hant.json

@@ -427,11 +427,13 @@
                     "heat": "加熱",
                     "cool": "冷卻",
                     "auto": "自動",
+                    "floor_heat": "地板加熱",
                     "off": "關",
                     "hotwater": "熱水",
                     "hotwater_cool": "熱水冷卻",
                     "hotwater_heat": "熱水加熱",
-                    "hotwater_auto": "熱水自動"
+                    "hotwater_auto": "熱水自動",
+                    "hotwater_floor_heat": "熱水地板加熱"
                 }
             },
             "initial_state": {