Bump to v0.4.0

Add oven support

README.md

@@ -1,24 +1,27 @@
 # Haier hOn
-[![hacs_badge](https://img.shields.io/badge/HACS-Custom-41BDF5.svg)](https://github.com/hacs/integration)
+[![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg)](https://github.com/hacs/integration)
-
+[![GitHub manifest version (path)](https://img.shields.io/github/manifest-json/v/andre0512/hon?color=g&filename=custom_components%2Fhon%2Fmanifest.json)](https://github.com/Andre0512/hon/releases/latest)
-Home Assistant component supporting devices of Haier's mobile app **hOn**.
+[![Home Assistant installs](https://img.shields.io/badge/dynamic/json?color=41BDF5&label=usage&suffix=%20installs&cacheSeconds=15600&url=https://analytics.home-assistant.io/custom_integrations.json&query=$.hon.total)](https://analytics.home-assistant.io/)  
-
+Home Assistant integration for Haier hOn: support for Haier/Candy/Hoover home appliances like washing machines.
 ## Supported Appliances
-- Washing Machine
 - Tumble Dryer
+- Washer Dryer
+- Washing Machine
+- Oven
 
 ## Installation
-#### Installing via HACS
+**Method 1:** [![Open your Home Assistant instance and open a repository inside the Home Assistant Community Store.](https://my.home-assistant.io/badges/hacs_repository.svg)](https://my.home-assistant.io/redirect/hacs_repository/?owner=Andre0512&repository=hon&category=integration)
-1. You need to have installed [HACS](https://hacs.xyz/)
+
-2. Go to HACS->Integrations
+**Method 2:** [HACS](https://hacs.xyz/) > Integrations > Add Integration > **Haier hOn** > Install  
-3. Add this repo (`https://github.com/Andre0512/hon.git`) into your HACS custom repositories
+
-4. Search for Haier hOn and Download it
+**Method 3:** Manually copy `hon` folder from [latest release](https://github.com/Andre0512/hon/releases/latest) to `config/custom_components` folder.
-5. Restart your HomeAssistant
+
-6. Go to Settings->Devices & Services
+## Configuration
-7. Shift reload your browser
+
-8. Click Add Integration
+**Method 1**: [![Open your Home Assistant instance and start setting up a new integration.](https://my.home-assistant.io/badges/config_flow_start.svg)](https://my.home-assistant.io/redirect/config_flow_start/?domain=hon)
-9. Search for Haier hOn 
+
-10. Type your username used in the hOn App and hit submit
+**Method 2**: Settings > Devices & Services > Add Integration > **Haier hOn**  
+_If the integration is not in the list, you need to clear the browser cache._
 
 ## Contribute
 Any kind of contribution is welcome!
@@ -68,6 +71,8 @@ Any kind of contribution is welcome!
 ## Tested Devices
 - Haier WD90-B14TEAM5
 - Haier HD80-A3959
+- Haier HWO60SM2F3XH
+- Hoover H-WASH 500
 
 ## About this Repo
 The existing integrations missed some features from the app I liked to have in HomeAssistant.

custom_components/hon/binary_sensor.py

@@ -27,15 +27,22 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
     "WM": (
         HonBinarySensorEntityDescription(
             key="attributes.lastConnEvent.category",
-            name="Connection",
+            name="Remote Control",
             device_class=BinarySensorDeviceClass.CONNECTIVITY,
             on_value="CONNECTED",
+            icon="mdi:remote"
         ),
         HonBinarySensorEntityDescription(
             key="doorLockStatus",
+            name="Door Lock",
+            device_class=BinarySensorDeviceClass.LOCK,
+            on_value="0",
+        ),
+        HonBinarySensorEntityDescription(
+            key="doorStatus",
             name="Door",
             device_class=BinarySensorDeviceClass.DOOR,
-            on_value="0",
+            on_value="1",
         ),
     ),
     "TD": (
@@ -51,7 +58,67 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
             device_class=BinarySensorDeviceClass.DOOR,
             on_value="1",
         ),
-    )
+    ),
+    "WD": (
+        HonBinarySensorEntityDescription(
+            key="attributes.lastConnEvent.category",
+            name="Remote Control",
+            device_class=BinarySensorDeviceClass.CONNECTIVITY,
+            on_value="CONNECTED",
+            icon="mdi:remote"
+        ),
+        HonBinarySensorEntityDescription(
+            key="startProgram.prewash",
+            name="Pre Wash",
+        ),
+        HonBinarySensorEntityDescription(
+            key="extraRinse1",
+            name="Extra Rinse 1",
+        ),
+        HonBinarySensorEntityDescription(
+            key="extraRinse2",
+            name="Extra Rinse 2",
+        ),
+        HonBinarySensorEntityDescription(
+            key="extraRinse3",
+            name="Extra Rinse 3",
+        ),
+        HonBinarySensorEntityDescription(
+            key="goodNight",
+            name="Good Night Mode",
+        ),
+        HonBinarySensorEntityDescription(
+            key="acquaplus",
+            name="Acqua Plus",
+        ),
+        HonBinarySensorEntityDescription(
+            key="anticrease",
+            name="Anti-Crease",
+        ),
+    ),
+    "OV": (
+        HonBinarySensorEntityDescription(
+            key="attributes.lastConnEvent.category",
+            name="Online",
+            device_class=BinarySensorDeviceClass.CONNECTIVITY,
+            on_value="CONNECTED",
+            icon="mdi:wifi"
+        ),
+        HonBinarySensorEntityDescription(
+            key="attributes.parameters.remoteCtrValid",
+            name="On",
+            device_class=BinarySensorDeviceClass.CONNECTIVITY,
+            on_value="1",
+            icon="mdi:remote"
+        ),
+        HonBinarySensorEntityDescription(
+            key="attributes.parameters.onOffStatus",
+            name="On",
+            device_class=BinarySensorDeviceClass.RUNNING,
+            on_value="1",
+            icon="mdi:power-cycle"
+        ),
+    ),
 }
 
 
@@ -70,7 +137,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
         if descriptions := BINARY_SENSORS.get(device.appliance_type):
             for description in descriptions:
                 if not device.get(description.key):
-                    _LOGGER.info("Can't setup %s", description.key)
+                    _LOGGER.warning("[%s] Can't setup %s", device.appliance_type, description.key)
                     continue
                 appliances.extend([
                     HonBinarySensorEntity(hass, coordinator, entry, device, description)]

custom_components/hon/button.py

@@ -1,25 +1,24 @@
-from pyhon import HonConnection
-from pyhon.device import HonDevice
-
 from homeassistant.components.button import ButtonEntityDescription, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
+from pyhon import HonConnection
+from pyhon.device import HonDevice
 
 from .const import DOMAIN
 from .hon import HonCoordinator, HonEntity
 
 BUTTONS: dict[str, tuple[ButtonEntityDescription, ...]] = {
-    "WM": (
+    "OV": (
-        # ButtonEntityDescription(
+        ButtonEntityDescription(
-        #     key="pauseProgram",
+            key="startProgram",
-        #     name="Pause Program",
+            name="Start Program",
-        #     icon="mdi:pause",
+            icon="mdi:power-cycle",
-        # ),
-        # ButtonEntityDescription(
-        #     key="resumeProgram",
-        #     name="Resume Program",
-        #     icon="mdi:play-pause",
-        # ),
         ),
+        ButtonEntityDescription(
+            key="stopProgram",
+            name="Stop Program",
+            icon="mdi:power-off",
+        ),
+    )
 }
 
 

custom_components/hon/manifest.json

@@ -7,6 +7,6 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/Andre0512/hon/issues",
   "requirements": ["pyhOn==0.4.1"],
-  "version": "0.3.0"
+  "version": "0.4.0"
 }
 

custom_components/hon/number.py

@@ -8,7 +8,7 @@ from homeassistant.components.number import (
     NumberEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfTime
+from homeassistant.const import UnitOfTime, UnitOfTemperature
 from homeassistant.core import callback
 from homeassistant.helpers.entity import EntityCategory
 
@@ -74,6 +74,39 @@ NUMBERS: dict[str, tuple[NumberEntityDescription, ...]] = {
             entity_category=EntityCategory.CONFIG
         ),
     ),
+    "WD": (
+        NumberEntityDescription(
+            key="startProgram.delayTime",
+            name="Delay Time",
+            icon="mdi:timer-plus",
+            entity_category=EntityCategory.CONFIG,
+            native_unit_of_measurement=UnitOfTime.MINUTES
+        ),
+    ),
+    "OV": (
+        NumberEntityDescription(
+            key="startProgram.delayTime",
+            name="Delay time",
+            icon="mdi:timer-plus",
+            entity_category=EntityCategory.CONFIG,
+            native_unit_of_measurement=UnitOfTime.MINUTES
+        ),
+        NumberEntityDescription(
+            key="startProgram.tempSel",
+            name="Target Temperature",
+            entity_category=EntityCategory.CONFIG,
+            icon="mdi:thermometer",
+            native_unit_of_measurement=UnitOfTemperature.CELSIUS
+        ),
+
+        NumberEntityDescription(
+            key="startProgram.prTime",
+            name="Program Duration",
+            entity_category=EntityCategory.CONFIG,
+            icon="mdi:timelapse",
+            native_unit_of_measurement=UnitOfTime.MINUTES
+        ),
+    ),
 }
 
 
@@ -91,6 +124,8 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
 
         if descriptions := NUMBERS.get(device.appliance_type):
             for description in descriptions:
+                if not device.settings.get(description.key):
+                    continue
                 appliances.extend([
                     HonNumberEntity(hass, coordinator, entry, device, description)]
                 )

custom_components/hon/select.py

@@ -1,18 +1,22 @@
 from __future__ import annotations
 
+import logging
+
 from pyhon import HonConnection
 from pyhon.device import HonDevice
 from pyhon.parameter import HonParameterFixed
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfTemperature, REVOLUTIONS_PER_MINUTE
+from homeassistant.const import UnitOfTemperature, UnitOfTime, REVOLUTIONS_PER_MINUTE
 from homeassistant.core import callback
 from homeassistant.helpers.entity import EntityCategory
 
 from .const import DOMAIN
 from .hon import HonEntity, HonCoordinator
 
+_LOGGER = logging.getLogger(__name__)
+
 SELECTS = {
     "WM": (
         SelectEntityDescription(
@@ -43,7 +47,34 @@ SELECTS = {
             entity_category=EntityCategory.CONFIG,
             translation_key="programs"
         ),
-    )
+        SelectEntityDescription(
+            key="startProgram.dryTimeMM",
+            name="Time",
+            entity_category=EntityCategory.CONFIG,
+            icon="mdi:timer",
+            unit_of_measurement=UnitOfTime.MINUTES
+        ),
+    ),
+    "WD": (
+        SelectEntityDescription(
+            key="startProgram.program",
+            name="Program",
+            entity_category=EntityCategory.CONFIG,
+            translation_key="programs"
+        ),
+    ),
+    "OV": (
+        SelectEntityDescription(
+            key="startProgram.program",
+            name="Program",
+            entity_category=EntityCategory.CONFIG,
+        ),
+        SelectEntityDescription(
+            key="startProgram.preheatStatus",
+            name="Preheat",
+            entity_category=EntityCategory.CONFIG
+        ),
+    ),
 }
 
 
@@ -61,7 +92,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
 
         if descriptions := SELECTS.get(device.appliance_type):
             for description in descriptions:
-                if not device.get(description.key):
+                if not device.settings.get(description.key):
                     continue
                 appliances.extend([
                     HonSelectEntity(hass, coordinator, entry, device, description)]

custom_components/hon/sensor.py

@@ -9,7 +9,15 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfEnergy, UnitOfVolume, UnitOfMass, UnitOfPower, UnitOfTime
+from homeassistant.const import (
+    REVOLUTIONS_PER_MINUTE,
+    UnitOfEnergy,
+    UnitOfVolume,
+    UnitOfMass,
+    UnitOfPower,
+    UnitOfTime,
+    UnitOfTemperature
+)
 from homeassistant.core import callback
 from homeassistant.helpers.entity import EntityCategory
 from homeassistant.helpers.typing import StateType
@@ -85,7 +93,7 @@ SENSORS: dict[str, tuple[SensorEntityDescription, ...]] = {
         SensorEntityDescription(
             key="spinSpeed",
             name="Spin Speed",
-            icon="mdi:timer",
+            icon="mdi:speedometer",
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfTime.MINUTES,
         ),
@@ -141,7 +149,84 @@ SENSORS: dict[str, tuple[SensorEntityDescription, ...]] = {
             icon="mdi:thermometer",
             translation_key="tumbledryertemplevel"
         ),
-    )
+    ),
+    "WD": (
+        SensorEntityDescription(
+            key="machMode",
+            name="Machine Status",
+            icon="mdi:information",
+            translation_key="mode"
+        ),
+        SensorEntityDescription(
+            key="spinSpeed",
+            name="Spin Speed",
+            icon="mdi:fast-forward-outline",
+            state_class=SensorStateClass.MEASUREMENT,
+            native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
+        ),
+        SensorEntityDescription(
+            key="remainingTimeMM",
+            name="Remaining Time",
+            icon="mdi:timer",
+            state_class=SensorStateClass.MEASUREMENT,
+            native_unit_of_measurement=UnitOfTime.MINUTES,
+        ),
+        SensorEntityDescription(
+            key="prCode",
+            name="Current Program",
+            icon="mdi:tumble-dryer",
+        ),
+        SensorEntityDescription(
+            key="prPhase",
+            name="Program Phase",
+            icon="mdi:tumble-dryer",
+        ),
+        SensorEntityDescription(
+            key="dryLevel",
+            name="Dry level",
+            icon="mdi:hair-dryer",
+        ),
+        SensorEntityDescription(
+            key="dirtyLevel",
+            name="Dirt level",
+            icon="mdi:liquid-spot",
+        ),
+        SensorEntityDescription(
+            key="steamLevel",
+            name="Steam level",
+            icon="mdi:smoke",
+        ),
+        SensorEntityDescription(
+            key="temp",
+            name="Current Temperature",
+            icon="mdi:thermometer",
+            state_class=SensorStateClass.MEASUREMENT,
+            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        ),
+    ),
+    "OV": (
+        SensorEntityDescription(
+            key="remainingTimeMM",
+            name="Remaining Time",
+            icon="mdi:timer",
+            native_unit_of_measurement=UnitOfTime.MINUTES,
+        ),
+        SensorEntityDescription(
+            key="delayTime",
+            name="Start Time",
+            icon="mdi:clock-start",
+        ),
+        SensorEntityDescription(
+            key="temp",
+            name="Temperature",
+            icon="mdi:thermometer",
+        ),
+        SensorEntityDescription(
+            key="tempSel",
+            name="Temperature Selected",
+            icon="mdi:thermometer",
+        ),
+    ),
 }
 
 
@@ -160,6 +245,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
         if descriptions := SENSORS.get(device.appliance_type):
             for description in descriptions:
                 if not device.get(description.key):
+                    _LOGGER.warning("[%s] Can't setup %s", device.appliance_type, description.key)
                     continue
                 appliances.extend([
                     HonSensorEntity(hass, coordinator, entry, device, description)]

custom_components/hon/switch.py

@@ -1,3 +1,5 @@
+import logging
+
 from dataclasses import dataclass
 from typing import Any
 
@@ -10,6 +12,8 @@ from pyhon.device import HonDevice
 from .const import DOMAIN
 from .hon import HonCoordinator, HonEntity
 
+_LOGGER = logging.getLogger(__name__)
+
 
 @dataclass
 class HonSwitchEntityDescriptionMixin:
@@ -20,7 +24,7 @@ class HonSwitchEntityDescriptionMixin:
 @dataclass
 class HonSwitchEntityDescription(HonSwitchEntityDescriptionMixin,
                                  SwitchEntityDescription
-):
+                                 ):
     pass
 
 
@@ -69,6 +73,22 @@ SWITCHES: dict[str, tuple[HonSwitchEntityDescription, ...]] = {
             turn_off_key="resumeProgram",
         ),
     ),
+    "WD": (
+        HonSwitchEntityDescription(
+            key="active",
+            name="Washing Machine",
+            icon="mdi:washing-machine",
+            turn_on_key="startProgram",
+            turn_off_key="stopProgram",
+        ),
+        HonSwitchEntityDescription(
+            key="pause",
+            name="Pause Washing Machine",
+            icon="mdi:pause",
+            turn_on_key="pauseProgram",
+            turn_off_key="resumeProgram",
+        ),
+    ),
 }
 
 
@@ -90,6 +110,8 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
                     appliances.extend([
                         HonSwitchEntity(hass, coordinator, entry, device, description)]
                     )
+                else:
+                    _LOGGER.warning("[%s] Can't setup %s", device.appliance_type, description.key)
 
     async_add_entities(appliances)
 
@@ -132,5 +154,3 @@ class HonSwitchEntity(HonEntity, SwitchEntity):
             self.async_write_ha_state()
         else:
             await self._device.commands[self.entity_description.turn_off_key].send()
-
-

custom_components/hon/translations/bg.json

@@ -377,6 +377,7 @@
           "single_item_steam": "Single Item + Steam",
           "smart_wash": "Smart Wash",
           "soft_care": "Soft Care",
+          "soft_care_steam": "Soft Care + Steam",
           "soft_care_steam_title": "Soft Care + Steam",
           "special_39": "Special 39'",
           "special_39_full_load": "Special 39'",

custom_components/hon/translations/en.json

@@ -377,6 +377,7 @@
           "single_item_steam": "Single Item + Steam",
           "smart_wash": "Smart Wash",
           "soft_care": "Soft Care",
+          "soft_care_steam": "Soft Care + Steam",
           "soft_care_steam_title": "Soft Care + Steam",
           "special_39": "Special 39'",
           "special_39_full_load": "Special 39'",