Use fan entity for wind speed

README.md

@@ -61,42 +61,18 @@ Translation of internal names like programs are available for all languages whic
 
 ## Supported Models
 Support has been confirmed for these models, but many more will work. Please add already supported devices [with this form to complete the list](https://forms.gle/bTSD8qFotdZFytbf8).
-- Haier AD105S2SM3FA
+
-- Haier AS20HPL1HRA
+|                    | **Haier**                                                                                                        | **Hoover**                                                                                                            | **Candy**                                           |
-- Haier AS25PBAHRA
+|--------------------|------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------|
-- Haier AS25S2SF1FA-WH
+| **Washing Machine** | HW90-B14TEAM5 <br/> HW100-B14959U1                                                                               | H-WASH 500 <br/> H7W4 48MBC-S                                                                                         | RO44 1286DWMC4-07 <br/> HW 68AMC/1-80 <br/> HWPD 69AMBC/1-S        |
-- Haier AS25TADHRA-2
+| **Tumble Dryer**   | HD80-A3959                                                                                                       | H-DRY 500 <br/> H9A3TCBEXS-S <br/> HLE C10DCE-80 <br/> NDE H10A2TCE-80 <br/> NDE H9A2TSBEXS-S <br/> NDPHY10A2TCBEXSS  | BCTDH7A1TE <br/> CSOE C10DE-80 <br/> ROE H9A3TCEX-S |
-- Haier AS35TADHRA-2
+| **Washer Dryer**   | HWD100-B14979                                                                                                    | HWPS4954DAMR-11                                                                                                       | RPW41066BWMR/1-S                                    |
-- Haier EG9012B19SU1JD
+| **Oven**           | HWO60SM2F3XH                                                                                                     | HSOT3161WG                                                                                                            |                                                     |
-- Haier HA2MTSJ68MC
+| **Dish Washer**    | XIB 3B2SFS-80 <br/> XIB 6B2D3FB                                                                                  | HFB 6B2S3FX                                                                                                           |                                                     |
-- Haier HADG6DS46BWIFI
+| **Air conditioner** | AD105S2SM3FA <br/> AS20HPL1HRA <br/> AS25PBAHRA <br/> AS25S2SF1FA-WH <br/> AS25TADHRA-2 <br/> AS35TADHRA-2 <br/> |                                                                                                                       |                                                     |
-- Haier HD80-A3959
+| **Fridge**         | HFW7720ENMB                                                                                                                 |                                                                                                                       | CCE4T620EWU                                         |
-- Haier HW90-B14TEAM5
+| **Hob**            | HA2MTSJ68MC                                                                                                      |                                                                                                                       | CIS633SCTTWIFI                                      |
-- Haier HW100-B14959U1
+| **Hood**           | HADG6DS46BWIFI                                                                                                   |                                                                                                                       |                                                     |
-- Haier HWD100-B14979
-- Haier HWO60SM2F3XH
-- Haier XIB 3B2SFS-80
-- Haier XIB 6B2D3FB
-- Candy BCTDH7A1TE
-- Candy CCE4T620EWU
-- Candy CIS633SCTTWIFI
-- Candy CSOE C10DE-80
-- Candy RO44 1286DWMC4-07
-- Candy ROE H9A3TCEX-S
-- Candy RPW41066BWMR/1-S
-- Hoover H-WASH 500
-- Hoover H-DRY 500
-- Hoover H7W4 48MBC-S
-- Hoover H9A3TCBEXS-S
-- Hoover HFB 6B2S3FX
-- Hoover HLE C10DCE-80
-- Hoover HSOT3161WG
-- Hoover HW 68AMC/1-80
-- Hoover HWPD 69AMBC/1-S
-- Hoover HWPS4954DAMR-11
-- Hoover NDE H10A2TCE-80
-- Hoover NDE H9A2TSBEXS-S
-- Hoover NDPHY10A2TCBEXSS
 
 ## Contribute
 Any kind of contribution is welcome!
@@ -237,11 +213,11 @@ For every device exists a hidden button which can be used to log all infos of yo
 | --- | --- | --- | --- |
 | Start Program | `hvac` | `button` | `startProgram` |
 | Stop Program | `hvac-off` | `button` | `stopProgram` |
+| Wind Speed |  | `fan` | `settings.windSpeed` |
 #### Configs
 | Name | Icon | Entity | Key |
 | --- | --- | --- | --- |
 | Light status | `lightbulb` | `number` | `startProgram.lightStatus` |
-| Wind speed | `fan` | `number` | `startProgram.windSpeed` |
 #### Sensors
 | Name | Icon | Entity | Key |
 | --- | --- | --- | --- |
@@ -257,7 +233,6 @@ For every device exists a hidden button which can be used to log all infos of yo
 | Quick Delay Time Status |  | `sensor` | `quickDelayTimeStatus` |
 | RGB Light Color | `lightbulb` | `sensor` | `rgbLightColors` |
 | RGB Light Status | `lightbulb` | `sensor` | `rgbLightStatus` |
-| Wind Speed | `fan` | `sensor` | `windSpeed` |
 
 ### Hob
 #### Controls

custom_components/hon/climate.py

@@ -213,7 +213,7 @@ class HonACClimateEntity(HonEntity, ClimateEntity):
 
 
 class HonClimateEntity(HonEntity, ClimateEntity):
-    entity_description = HonClimateEntityDescription
+    entity_description: HonClimateEntityDescription
 
     def __init__(self, hass, entry, device: HonAppliance, description) -> None:
         super().__init__(hass, entry, device, description)

custom_components/hon/const.py

@@ -17,6 +17,7 @@ PLATFORMS = [
     "button",
     "binary_sensor",
     "climate",
+    "fan",
 ]
 
 HON_HVAC_MODE = {

custom_components/hon/fan.py

@@ -0,0 +1,122 @@
+import logging
+import math
+from dataclasses import dataclass
+from typing import Any
+
+from homeassistant.components.fan import (
+    FanEntityDescription,
+    FanEntity,
+    FanEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import callback
+from homeassistant.util.percentage import (
+    percentage_to_ranged_value,
+    ranged_value_to_percentage,
+)
+from pyhon.appliance import HonAppliance
+from pyhon.parameter.range import HonParameterRange
+
+from .const import DOMAIN
+from .hon import HonEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class HonFanEntityDescription(FanEntityDescription):
+    pass
+
+
+FANS = {
+    "HO": (
+        HonFanEntityDescription(
+            key="settings.windSpeed",
+            name="Wind Speed",
+            translation_key="air_extraction",
+        ),
+    ),
+}
+
+
+async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> None:
+    entities = []
+    for device in hass.data[DOMAIN][entry.unique_id].appliances:
+        for description in FANS.get(device.appliance_type, []):
+            if isinstance(description, HonFanEntityDescription):
+                if description.key not in device.available_settings or not device.get(
+                    description.key.split(".")[-1]
+                ):
+                    continue
+                entity = HonFanEntity(hass, entry, device, description)
+            else:
+                continue
+            await entity.coordinator.async_config_entry_first_refresh()
+            entities.append(entity)
+    async_add_entities(entities)
+
+
+class HonFanEntity(HonEntity, FanEntity):
+    entity_description: HonFanEntityDescription
+
+    def __init__(self, hass, entry, device: HonAppliance, description) -> None:
+        self._attr_supported_features = FanEntityFeature.SET_SPEED
+        self._wind_speed: HonParameterRange = device.settings.get(description.key)
+        self._speed_range = (
+            int(self._wind_speed.values[1]),
+            int(self._wind_speed.values[-1]),
+        )
+        self._command, self._parameter = description.key.split(".")
+
+        super().__init__(hass, entry, device, description)
+        self._handle_coordinator_update(update=False)
+
+    @property
+    def percentage(self) -> int | None:
+        """Return the current speed."""
+        value = int(self._device.get(self._parameter, "0"))
+        return ranged_value_to_percentage(self._speed_range, value)
+
+    @property
+    def speed_count(self) -> int:
+        """Return the number of speeds the fan supports."""
+        return len(self._wind_speed.values[1:])
+
+    async def async_set_percentage(self, percentage: int) -> None:
+        """Set the speed percentage of the fan."""
+        mode = math.ceil(percentage_to_ranged_value(self._speed_range, percentage))
+        self._device.settings[self.entity_description.key].value = mode
+        await self._device.commands[self._command].send()
+        self.async_write_ha_state()
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return true if device is on."""
+        mode = math.ceil(percentage_to_ranged_value(self._speed_range, self.percentage))
+        return mode > self._wind_speed.min
+
+    async def async_turn_on(
+        self,
+        percentage: int | None = None,
+        preset_mode: str | None = None,
+        **kwargs: Any,
+    ) -> None:
+        """Turn the entity on."""
+        if percentage is None:
+            percentage = ranged_value_to_percentage(
+                self._speed_range, int(self._wind_speed.values[1])
+            )
+        await self.async_set_percentage(percentage)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the entity off."""
+        self._device.settings[self.entity_description.key].value = 0
+        await self._device.commands[self._command].send()
+        self.async_write_ha_state()
+
+    @callback
+    def _handle_coordinator_update(self, update=True) -> None:
+        self._wind_speed = self._device.settings.get(self.entity_description.key)
+        self._attr_percentage = self.percentage
+        if update:
+            self.async_write_ha_state()

custom_components/hon/number.py

@@ -163,12 +163,6 @@ NUMBERS: dict[str, tuple[NumberEntityDescription, ...]] = {
         ),
     ),
     "HO": (
-        HonNumberEntityDescription(
-            key="startProgram.windSpeed",
-            name="Wind speed",
-            icon="mdi:fan",
-            entity_category=EntityCategory.CONFIG,
-        ),
         HonNumberEntityDescription(
             key="startProgram.lightStatus",
             name="Light status",

custom_components/hon/sensor.py

@@ -593,11 +593,6 @@ SENSORS: dict[str, tuple[SensorEntityDescription, ...]] = {
             name="RGB Light Status",
             icon="mdi:lightbulb",
         ),
-        HonSensorEntityDescription(
-            key="windSpeed",
-            name="Wind Speed",
-            icon="mdi:fan",
-        ),
     ),
 }
 SENSORS["WD"] = unique_entities(SENSORS["WM"], SENSORS["TD"])

custom_components/hon/translations/cs.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Odsávání vzduchu"
+            }
         }
     },
     "config": {

custom_components/hon/translations/de.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Dunstabzug"
+            }
         }
     },
     "config": {

custom_components/hon/translations/el.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Εξαγωγή αέρα"
+            }
         }
     },
     "config": {

custom_components/hon/translations/en.json

@@ -2056,6 +2056,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Air extraction"
+            }
         }
     }
 }

custom_components/hon/translations/es.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Extracción de aire"
+            }
         }
     },
     "config": {

custom_components/hon/translations/fr.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Extraction de l'air"
+            }
         }
     },
     "config": {

custom_components/hon/translations/he.json

@@ -1065,6 +1065,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Air extraction"
+            }
         }
     },
     "config": {

custom_components/hon/translations/hr.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Odvođenje zraka"
+            }
         }
     },
     "config": {

custom_components/hon/translations/it.json

@@ -2031,6 +2031,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Aspirazione aria"
+            }
         }
     }
 }

custom_components/hon/translations/nl.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Luchtafvoer"
+            }
         }
     },
     "config": {

custom_components/hon/translations/pl.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Wyciąg powietrza"
+            }
         }
     },
     "config": {

custom_components/hon/translations/pt.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Extração de ar"
+            }
         }
     },
     "config": {

custom_components/hon/translations/ro.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Extracția aerului"
+            }
         }
     },
     "config": {

custom_components/hon/translations/ru.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Отвод воздуха"
+            }
         }
     },
     "config": {

custom_components/hon/translations/sk.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Odsávanie vzduchu"
+            }
         }
     },
     "config": {

custom_components/hon/translations/sl.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Odvajanje zraka"
+            }
         }
     },
     "config": {

custom_components/hon/translations/sr.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Usisavanje vazduha"
+            }
         }
     },
     "config": {

custom_components/hon/translations/tr.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "Hava tahliyesi"
+            }
         }
     },
     "config": {

custom_components/hon/translations/zh.json

@@ -1979,6 +1979,11 @@
                     }
                 }
             }
+        },
+        "fan": {
+            "air_extraction": {
+                "name": "抽气"
+            }
         }
     },
     "config": {

info.md

@@ -50,42 +50,18 @@ Translation of internal names like programs are available for all languages whic
 
 ## Supported Models
 Support has been confirmed for these models, but many more will work. Please add already supported devices [with this form to complete the list](https://forms.gle/bTSD8qFotdZFytbf8).
-- Haier AD105S2SM3FA
+
-- Haier AS20HPL1HRA
+|                    | **Haier**                                                                                                        | **Hoover**                                                                                                            | **Candy**                                           |
-- Haier AS25PBAHRA
+|--------------------|------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------|
-- Haier AS25S2SF1FA-WH
+| **Washing Machine** | HW90-B14TEAM5 <br/> HW100-B14959U1                                                                               | H-WASH 500 <br/> H7W4 48MBC-S                                                                                         | RO44 1286DWMC4-07 <br/> HW 68AMC/1-80 <br/> HWPD 69AMBC/1-S        |
-- Haier AS25TADHRA-2
+| **Tumble Dryer**   | HD80-A3959                                                                                                       | H-DRY 500 <br/> H9A3TCBEXS-S <br/> HLE C10DCE-80 <br/> NDE H10A2TCE-80 <br/> NDE H9A2TSBEXS-S <br/> NDPHY10A2TCBEXSS  | BCTDH7A1TE <br/> CSOE C10DE-80 <br/> ROE H9A3TCEX-S |
-- Haier AS35TADHRA-2
+| **Washer Dryer**   | HWD100-B14979                                                                                                    | HWPS4954DAMR-11                                                                                                       | RPW41066BWMR/1-S                                    |
-- Haier EG9012B19SU1JD
+| **Oven**           | HWO60SM2F3XH                                                                                                     | HSOT3161WG                                                                                                            |                                                     |
-- Haier HA2MTSJ68MC
+| **Dish Washer**    | XIB 3B2SFS-80 <br/> XIB 6B2D3FB                                                                                  | HFB 6B2S3FX                                                                                                           |                                                     |
-- Haier HADG6DS46BWIFI
+| **Air conditioner** | AD105S2SM3FA <br/> AS20HPL1HRA <br/> AS25PBAHRA <br/> AS25S2SF1FA-WH <br/> AS25TADHRA-2 <br/> AS35TADHRA-2 <br/> |                                                                                                                       |                                                     |
-- Haier HD80-A3959
+| **Fridge**         | HFW7720ENMB                                                                                                                 |                                                                                                                       | CCE4T620EWU                                         |
-- Haier HW90-B14TEAM5
+| **Hob**            | HA2MTSJ68MC                                                                                                      |                                                                                                                       | CIS633SCTTWIFI                                      |
-- Haier HW100-B14959U1
+| **Hood**           | HADG6DS46BWIFI                                                                                                   |                                                                                                                       |                                                     |
-- Haier HWD100-B14979
-- Haier HWO60SM2F3XH
-- Haier XIB 3B2SFS-80
-- Haier XIB 6B2D3FB
-- Candy BCTDH7A1TE
-- Candy CCE4T620EWU
-- Candy CIS633SCTTWIFI
-- Candy CSOE C10DE-80
-- Candy RO44 1286DWMC4-07
-- Candy ROE H9A3TCEX-S
-- Candy RPW41066BWMR/1-S
-- Hoover H-WASH 500
-- Hoover H-DRY 500
-- Hoover H7W4 48MBC-S
-- Hoover H9A3TCBEXS-S
-- Hoover HFB 6B2S3FX
-- Hoover HLE C10DCE-80
-- Hoover HSOT3161WG
-- Hoover HW 68AMC/1-80
-- Hoover HWPD 69AMBC/1-S
-- Hoover HWPS4954DAMR-11
-- Hoover NDE H10A2TCE-80
-- Hoover NDE H9A2TSBEXS-S
-- Hoover NDPHY10A2TCBEXSS
 
 ## Contribute
 Want to help us to support more appliances? Or add more sensors? Or help with translating? Or beautify some icons or captions? 

scripts/generate_translation.py

@@ -248,6 +248,7 @@ NAMES = {
         "freezer": "REF.ZONES.FREEZER",
         "oven": "GLOBALS.APPLIANCES_NAME.OV",
     },
+    "fan": {"air_extraction": "HO.DASHBOARD.AIR_EXTRACTION_TITLE"},
 }
 
 

scripts/sensor_docs.py

@@ -14,6 +14,7 @@ from custom_components.hon.climate import CLIMATES
 from custom_components.hon.number import NUMBERS
 from custom_components.hon.select import SELECTS
 from custom_components.hon.sensor import SENSORS
+from custom_components.hon.fan import FANS
 from custom_components.hon.switch import (
     SWITCHES,
     HonControlSwitchEntityDescription,
@@ -48,6 +49,7 @@ entities = {
     "sensor": SENSORS,
     "switch": SWITCHES,
     "climate": CLIMATES,
+    "fan": FANS,
 }
 
 result = {}