Compare commits

...

6 Commits

Author SHA1 Message Date
6519bef12a Bump version 2023-06-28 22:54:03 +02:00
a25510184e Bump version 2023-06-25 18:32:24 +02:00
e5e351272b Create data archive 2023-06-25 17:33:30 +02:00
4b1f500f90 Fix wrong name for silent mode #52 2023-06-22 13:36:24 +02:00
0d43eeff3d Merge branch 'main' into refactor 2023-06-22 13:18:45 +02:00
1ea9153c2e Apply changes for new pyhon version 2023-06-13 00:14:51 +02:00
36 changed files with 330 additions and 222 deletions

View File

@ -37,3 +37,11 @@ Post your device info here (if available)
_This button can be found in the diagnostic section of your device or in the entity overview if "show disabled entities" is enabled._
2. Press the button to create a notification
3. Open home assistant notifications and copy the message (Crtl+A, Ctrl+C)
**Data Archive**
For further analysis, please add your appliance data archive here.
Navigate to `Settings` -> `Device & Services` -> `Haier hOn` -> _your device_ and press the _Create Data Archive_ button.
Then open notifications to download the data zip archive.
To attach the file:
* GitHub Web: Use the "Attach files by dragging & dropping, selecting or pasting them." function
* GitHub Mobile: Upload the zip archive as image

View File

@ -24,3 +24,11 @@ _This button can be found in the diagnostic section of your device or in the ent
3. Open home assistant notifications and copy the message (Crtl+A, Ctrl+C)
**Additional context**
Add any other context or screenshots about the feature request here.
**Data Archive**
For further analysis, please add your appliance data archive here.
Navigate to `Settings` -> `Device & Services` -> `Haier hOn` -> _your device_ and press the _Create Data Archive_ button.
Then open notifications to download the data zip archive.
To attach the file:
* GitHub Web: Use the "Attach files by dragging & dropping, selecting or pasting them." function
* GitHub Mobile: Upload the zip archive as image

View File

@ -38,18 +38,21 @@ _If the integration is not in the list, you need to clear the browser cache._
## 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** | **Hoover** | **Candy** |
|---------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
| **Washing Machine** | HW90-B14TEAM5 <br/> HW100-B14959U1 | H-WASH 500 <br/> H7W4 48MBC-S | CO4 107T1/2-07 <br/> CBWO49TWME-S <br/> RO44 1286DWMC4-07 <br/> HW 68AMC/1-80 <br/> HWPD 69AMBC/1-S |
| **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 |
| **Washer Dryer** | HWD100-B14979 | HWPS4954DAMR-11 | RPW41066BWMR/1-S |
| **Oven** | HWO60SM2F3XH | HSOT3161WG | |
| **Dish Washer** | XIB 3B2SFS-80 <br/> XIB 6B2D3FB | HFB 6B2S3FX | |
| **Air Conditioner** | AD105S2SM3FA <br/> AS20HPL1HRA <br/> AS25PBAHRA <br/> AS25S2SF1FA-WH <br/> AS25TADHRA-2 <br/> AS35S2SF2FA-3 <br/> AS35TADHRA-2 <br/> AS35TAMHRA-C | | |
| **Fridge** | HFW7720ENMB | | CCE4T620EWU |
| **Hob** | HA2MTSJ68MC | | CIS633SCTTWIFI |
| **Hood** | HADG6DS46BWIFI | | |
| **Wine Cellar** | HWS247FDU1 | | |
| | **Haier** | **Hoover** | **Candy** |
|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
| **Washing Machine** | HW90-B14TEAM5 <br/> HW100-B14959U1 | H-WASH 500 <br/> H7W4 48MBC-S <br/> HW 410AMBCB/1-80 | CO4 107T1/2-07 <br/> CBWO49TWME-S <br/> RO44 1286DWMC4-07 <br/> HW 68AMC/1-80 <br/> HWPD 69AMBC/1-S |
| **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 |
| **Washer Dryer** | HWD100-B14979 | HWPS4954DAMR-11 | RPW41066BWMR/1-S |
| **Oven** | HWO60SM2F3XH | HSOT3161WG | |
| **Dish Washer** | XIB 3B2SFS-80 <br/> XIB 6B2D3FB | HFB 6B2S3FX | |
| **Air Conditioner** | AD105S2SM3FA <br/> AS20HPL1HRA <br/> AS25PBAHRA <br/> AS25S2SF1FA-WH <br/> AS25TADHRA-2 <br/> AS35S2SF2FA-3 <br/> AS35TADHRA-2 <br/> AS35TAMHRA-C | | |
| **Fridge** | HFW7720ENMB | | CCE4T620EWU |
| **Hob** | HA2MTSJ68MC | | CIS633SCTTWIFI |
| **Hood** | HADG6DS46BWIFI | | |
| **Wine Cellar** | HWS247FDU1 | | |
| Please add your appliances data to our [hon-test-data collection](https://github.com/Andre0512/hon-test-data). <br/>This helps us to develop new features and not to break compatibility in newer versions. |
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
## Supported Languages
Translation of internal names like programs are available for all languages which are official supported by the hOn app:
@ -81,11 +84,9 @@ Translation of internal names like programs are available for all languages whic
Any kind of contribution is welcome!
### Read out device data
If you want to make a request for adding new appliances or additional attributes and don't want to use the command line, here is how you can read out your device data.
For every device exists a hidden button which can be used to log all infos of your appliance.
1. Enable the "Show Device Info" button
_This button can be found in the diagnostic section of your device or in the entity overview if "show disabled entities" is enabled._
2. Press the button to create a notification
3. Open home assistant notifications and copy the message (Crtl+A, Ctrl+C)
For every device exists a button under diagnostics which can be used to log all info of your appliance.
1. Press the button to create a notification
2. Open home assistant notifications and copy the message (Crtl+A, Ctrl+C)
### Add appliances or additional attributes
1. Install [pyhOn](https://github.com/Andre0512/pyhOn)
```commandline
@ -148,12 +149,12 @@ For every device exists a hidden button which can be used to log all infos of yo
| Eco Mode | | `switch` | `ecoMode` |
| Eco Pilot | `run` | `select` | `settings.humanSensingStatus` |
| Health Mode | `medication-outline` | `switch` | `healthMode` |
| Mute | `volume-off` | `switch` | `muteStatus` |
| Night Mode | `bed` | `switch` | `silentSleepStatus` |
| Rapid Mode | `run-fast` | `switch` | `rapidMode` |
| Screen Display | `monitor-small` | `switch` | `screenDisplayStatus` |
| Self Cleaning | `air-filter` | `switch` | `selfCleaningStatus` |
| Self Cleaning 56 | `air-filter` | `switch` | `selfCleaning56Status` |
| Silent Sleep | `bed` | `switch` | `silentSleepStatus` |
| Silent Mode | `volume-off` | `switch` | `muteStatus` |
| Target Temperature | `thermometer` | `number` | `settings.tempSel` |
#### Sensors
| Name | Icon | Entity | Key |

View File

@ -1,18 +1,17 @@
import logging
from pathlib import Path
import voluptuous as vol
from pyhon import Hon
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
from homeassistant.helpers import config_validation as cv, aiohttp_client
from homeassistant.helpers.typing import HomeAssistantType
from pyhon import Hon
from .const import DOMAIN, PLATFORMS
_LOGGER = logging.getLogger(__name__)
HON_SCHEMA = vol.Schema(
{
vol.Required(CONF_EMAIL): cv.string,
@ -29,7 +28,10 @@ CONFIG_SCHEMA = vol.Schema(
async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
session = aiohttp_client.async_get_clientsession(hass)
hon = await Hon(
entry.data["email"], entry.data["password"], session=session
entry.data["email"],
entry.data["password"],
session=session,
test_data_path=Path(hass.config.config_dir),
).create()
hass.data.setdefault(DOMAIN, {})
hass.data[DOMAIN][entry.unique_id] = hon

View File

@ -17,7 +17,7 @@ _LOGGER = logging.getLogger(__name__)
@dataclass
class HonBinarySensorEntityDescriptionMixin:
on_value: str = ""
on_value: str | float = ""
@dataclass
@ -41,14 +41,14 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="doorLockStatus",
name="Door Lock",
device_class=BinarySensorDeviceClass.LOCK,
on_value="0",
on_value=0,
translation_key="door_lock",
),
HonBinarySensorEntityDescription(
key="doorStatus",
name="Door",
device_class=BinarySensorDeviceClass.DOOR,
on_value="1",
on_value=1,
translation_key="door_open",
),
HonBinarySensorEntityDescription(
@ -82,7 +82,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="doorStatus",
name="Door",
device_class=BinarySensorDeviceClass.DOOR,
on_value="1",
on_value=1,
translation_key="door_open",
),
HonBinarySensorEntityDescription(
@ -102,7 +102,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="attributes.parameters.onOffStatus",
name="On",
device_class=BinarySensorDeviceClass.RUNNING,
on_value="1",
on_value=1,
icon="mdi:power-cycle",
translation_key="on",
),
@ -120,7 +120,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="attributes.parameters.onOffStatus",
name="On",
device_class=BinarySensorDeviceClass.RUNNING,
on_value="1",
on_value=1,
icon="mdi:power-cycle",
translation_key="on",
),
@ -128,13 +128,13 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="hotStatus",
name="Hot Status",
device_class=BinarySensorDeviceClass.HEAT,
on_value="1",
on_value=1,
translation_key="still_hot",
),
HonBinarySensorEntityDescription(
key="panStatus",
name="Pan Status",
on_value="1",
on_value=1,
icon="mdi:pot-mix",
translation_key="pan_status",
),
@ -142,7 +142,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="hobLockStatus",
name="Hob Lock",
device_class=BinarySensorDeviceClass.LOCK,
on_value="0",
on_value=0,
translation_key="child_lock",
),
),
@ -151,7 +151,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="saltStatus",
name="Salt",
device_class=BinarySensorDeviceClass.PROBLEM,
on_value="1",
on_value=1,
icon="mdi:shaker-outline",
translation_key="salt_level",
),
@ -159,7 +159,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="rinseAidStatus",
name="Rinse Aid",
device_class=BinarySensorDeviceClass.PROBLEM,
on_value="1",
on_value=1,
icon="mdi:spray-bottle",
translation_key="rinse_aid",
),
@ -174,7 +174,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="doorStatus",
name="Door",
device_class=BinarySensorDeviceClass.DOOR,
on_value="1",
on_value=1,
translation_key="door_open",
),
),
@ -183,13 +183,13 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
key="filterChangeStatusLocal",
name="Filter Replacement",
device_class=BinarySensorDeviceClass.PROBLEM,
on_value="1",
on_value=1,
translation_key="filter_replacement",
),
HonBinarySensorEntityDescription(
key="ch2oCleaningStatus",
name="Ch2O Cleaning",
on_value="1",
on_value=1,
),
),
"REF": (
@ -198,7 +198,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
name="Super Cool",
icon="mdi:snowflake",
device_class=BinarySensorDeviceClass.RUNNING,
on_value="1",
on_value=1,
translation_key="super_cool",
),
HonBinarySensorEntityDescription(
@ -206,7 +206,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
name="Super Freeze",
icon="mdi:snowflake-variant",
device_class=BinarySensorDeviceClass.RUNNING,
on_value="1",
on_value=1,
translation_key="super_freeze",
),
HonBinarySensorEntityDescription(
@ -214,7 +214,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
name="Door Status Freezer",
device_class=BinarySensorDeviceClass.DOOR,
icon="mdi:fridge-top",
on_value="1",
on_value=1,
translation_key="freezer_door",
),
HonBinarySensorEntityDescription(
@ -222,7 +222,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
name="Door Status Fridge",
icon="mdi:fridge-bottom",
device_class=BinarySensorDeviceClass.DOOR,
on_value="1",
on_value=1,
translation_key="fridge_door",
),
HonBinarySensorEntityDescription(
@ -230,7 +230,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
name="Auto-Set Mode",
icon="mdi:thermometer-auto",
device_class=BinarySensorDeviceClass.RUNNING,
on_value="1",
on_value=1,
translation_key="auto_set",
),
HonBinarySensorEntityDescription(
@ -238,7 +238,7 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
name="Holiday Mode",
icon="mdi:palm-tree",
device_class=BinarySensorDeviceClass.RUNNING,
on_value="1",
on_value=1,
translation_key="holiday_mode",
),
),
@ -254,7 +254,6 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
),
}
BINARY_SENSORS["WD"] = unique_entities(BINARY_SENSORS["WM"], BINARY_SENSORS["TD"])
@ -262,7 +261,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
entities = []
for device in hass.data[DOMAIN][entry.unique_id].appliances:
for description in BINARY_SENSORS.get(device.appliance_type, []):
if not device.get(description.key):
if device.get(description.key) is None:
continue
entity = HonBinarySensorEntity(hass, entry, device, description)
await entity.coordinator.async_config_entry_first_refresh()

View File

@ -1,4 +1,5 @@
import logging
from pathlib import Path
import pkg_resources
from homeassistant.components import persistent_notification
@ -61,7 +62,8 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
entity = HonButtonEntity(hass, entry, device, description)
await entity.coordinator.async_config_entry_first_refresh()
entities.append(entity)
entities.append(HonFeatureRequestButton(hass, entry, device))
entities.append(HonDeviceInfo(hass, entry, device))
entities.append(HonDataArchive(hass, entry, device))
await entities[-1].coordinator.async_config_entry_first_refresh()
async_add_entities(entities)
@ -77,26 +79,46 @@ class HonButtonEntity(HonEntity, ButtonEntity):
"""Return True if entity is available."""
return (
super().available
and self._device.get("remoteCtrValid", "1") == "1"
and int(self._device.get("remoteCtrValid", "1")) == 1
and self._device.get("attributes.lastConnEvent.category") != "DISCONNECTED"
)
class HonFeatureRequestButton(HonEntity, ButtonEntity):
class HonDeviceInfo(HonEntity, ButtonEntity):
def __init__(self, hass, entry, device: HonAppliance) -> None:
super().__init__(hass, entry, device)
self._attr_unique_id = f"{super().unique_id}_log_device_info"
self._attr_unique_id = f"{super().unique_id}_show_device_info"
self._attr_icon = "mdi:information"
self._attr_name = "Show Device Info"
self._attr_entity_category = EntityCategory.DIAGNOSTIC
self._attr_entity_registry_enabled_default = False
async def async_press(self) -> None:
pyhon_version = pkg_resources.get_distribution("pyhon").version
info = f"{self._device.diagnose()}pyhOnVersion: {pyhon_version}"
info = f"{self._device.diagnose}pyhOnVersion: {pyhon_version}"
title = f"{self._device.nick_name} Device Info"
persistent_notification.create(
self._hass, f"````\n```\n{info}\n```\n````", title
)
_LOGGER.info(info.replace(" ", "\u200B "))
class HonDataArchive(HonEntity, ButtonEntity):
def __init__(self, hass, entry, device: HonAppliance) -> None:
super().__init__(hass, entry, device)
self._attr_unique_id = f"{super().unique_id}_create_data_archive"
self._attr_icon = "mdi:archive-arrow-down"
self._attr_name = "Create Data Archive"
self._attr_entity_category = EntityCategory.DIAGNOSTIC
async def async_press(self) -> None:
path = Path(self._hass.config.config_dir) / "www"
data = await self._device.data_archive(path)
title = f"{self._device.nick_name} Data Archive"
text = (
f'<a href="/local/{data}" target="_blank">{data}</a> <br/><br/> '
f"Use this data for [GitHub Issues of Haier hOn](https://github.com/Andre0512/hon).<br/>"
f"Or add it to the [hon-test-data collection](https://github.com/Andre0512/hon-test-data)."
)
persistent_notification.create(self._hass, text, title)

View File

@ -119,13 +119,13 @@ class HonACClimateEntity(HonEntity, ClimateEntity):
self._attr_hvac_modes = [HVACMode.OFF]
for mode in device.settings["settings.machMode"].values:
self._attr_hvac_modes.append(HON_HVAC_MODE[mode])
self._attr_hvac_modes.append(HON_HVAC_MODE[int(mode)])
self._attr_preset_modes = []
for mode in device.settings["startProgram.program"].values:
self._attr_preset_modes.append(mode)
self._attr_fan_modes = [FAN_OFF]
for mode in device.settings["settings.windSpeed"].values:
self._attr_fan_modes.append(HON_FAN[mode])
self._attr_fan_modes.append(HON_FAN[int(mode)])
self._attr_swing_modes = [
SWING_OFF,
SWING_VERTICAL,
@ -151,12 +151,12 @@ class HonACClimateEntity(HonEntity, ClimateEntity):
@property
def target_temperature(self) -> int | None:
"""Return the temperature we try to reach."""
return int(float(self._device.get("tempSel")))
return self._device.get("tempSel")
@property
def current_temperature(self) -> float | None:
"""Return the current temperature."""
return float(self._device.get("tempIndoor"))
return self._device.get("tempIndoor")
async def async_set_temperature(self, **kwargs):
if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
@ -167,7 +167,7 @@ class HonACClimateEntity(HonEntity, ClimateEntity):
@property
def hvac_mode(self) -> HVACMode | str | None:
if self._device.get("onOffStatus") == "0":
if self._device.get("onOffStatus") == 0:
return HVACMode.OFF
else:
return HON_HVAC_MODE[self._device.get("machMode")]
@ -180,7 +180,7 @@ class HonACClimateEntity(HonEntity, ClimateEntity):
else:
self._device.settings["settings.onOffStatus"].value = "1"
setting = self._device.settings["settings.machMode"]
modes = {HON_HVAC_MODE[number]: number for number in setting.values}
modes = {HON_HVAC_MODE[int(number)]: number for number in setting.values}
setting.value = modes[hvac_mode]
await self._device.commands["settings"].send()
self.async_write_ha_state()
@ -220,11 +220,11 @@ class HonACClimateEntity(HonEntity, ClimateEntity):
"""Return the swing setting."""
horizontal = self._device.get("windDirectionHorizontal")
vertical = self._device.get("windDirectionVertical")
if horizontal == "7" and vertical == "8":
if horizontal == 7 and vertical == 8:
return SWING_BOTH
elif horizontal == "7":
elif horizontal == 7:
return SWING_HORIZONTAL
elif vertical == "8":
elif vertical == 8:
return SWING_VERTICAL
else:
return SWING_OFF
@ -290,13 +290,13 @@ class HonClimateEntity(HonEntity, ClimateEntity):
@property
def target_temperature(self) -> float | None:
"""Return the temperature we try to reach."""
return float(self._device.get(self.entity_description.key))
return self._device.get(self.entity_description.key)
@property
def current_temperature(self) -> float | None:
"""Return the current temperature."""
temp_key = self.entity_description.key.split(".")[-1].replace("Sel", "")
return float(self._device.get(temp_key))
return self._device.get(temp_key)
async def async_set_temperature(self, **kwargs):
if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
@ -307,7 +307,7 @@ class HonClimateEntity(HonEntity, ClimateEntity):
@property
def hvac_mode(self) -> HVACMode | str | None:
if self._device.get("onOffStatus") == "0":
if self._device.get("onOffStatus") == 0:
return HVACMode.OFF
else:
return self.entity_description.mode

View File

@ -21,13 +21,13 @@ PLATFORMS = [
]
HON_HVAC_MODE = {
"0": HVACMode.AUTO,
"1": HVACMode.COOL,
"2": HVACMode.DRY,
"3": HVACMode.DRY,
"4": HVACMode.HEAT,
"5": HVACMode.FAN_ONLY,
"6": HVACMode.FAN_ONLY,
0: HVACMode.AUTO,
1: HVACMode.COOL,
2: HVACMode.DRY,
3: HVACMode.DRY,
4: HVACMode.HEAT,
5: HVACMode.FAN_ONLY,
6: HVACMode.FAN_ONLY,
}
HON_HVAC_PROGRAM = {
@ -39,11 +39,11 @@ HON_HVAC_PROGRAM = {
}
HON_FAN = {
"1": FAN_HIGH,
"2": FAN_MEDIUM,
"3": FAN_LOW,
"4": FAN_AUTO,
"5": FAN_AUTO,
1: FAN_HIGH,
2: FAN_MEDIUM,
3: FAN_LOW,
4: FAN_AUTO,
5: FAN_AUTO,
}
# These languages are official supported by hOn
@ -70,136 +70,136 @@ LANGUAGES = [
]
WASHING_PR_PHASE = {
"0": "ready",
"1": "washing",
"2": "washing",
"3": "spin",
"4": "rinse",
"5": "rinse",
"6": "rinse",
"7": "drying",
"9": "steam",
"10": "ready",
"11": "spin",
"12": "weighting",
"13": "weighting",
"14": "washing",
"15": "washing",
"16": "washing",
"17": "rinse",
"18": "rinse",
"19": "scheduled",
"20": "tumbling",
"24": "refresh",
"25": "washing",
"26": "heating",
"27": "washing",
0: "ready",
1: "washing",
2: "washing",
3: "spin",
4: "rinse",
5: "rinse",
6: "rinse",
7: "drying",
9: "steam",
10: "ready",
11: "spin",
12: "weighting",
13: "weighting",
14: "washing",
15: "washing",
16: "washing",
17: "rinse",
18: "rinse",
19: "scheduled",
20: "tumbling",
24: "refresh",
25: "washing",
26: "heating",
27: "washing",
}
MACH_MODE = {
"0": "ready", # NO_STATE
"1": "ready", # SELECTION_MODE
"2": "running", # EXECUTION_MODE
"3": "pause", # PAUSE_MODE
"4": "scheduled", # DELAY_START_SELECTION_MODE
"5": "scheduled", # DELAY_START_EXECUTION_MODE
"6": "error", # ERROR_MODE
"7": "ready", # END_MODE
"8": "test", # TEST_MODE
"9": "ending", # STOP_MODE
0: "ready", # NO_STATE
1: "ready", # SELECTION_MODE
2: "running", # EXECUTION_MODE
3: "pause", # PAUSE_MODE
4: "scheduled", # DELAY_START_SELECTION_MODE
5: "scheduled", # DELAY_START_EXECUTION_MODE
6: "error", # ERROR_MODE
7: "ready", # END_MODE
8: "test", # TEST_MODE
9: "ending", # STOP_MODE
}
TUMBLE_DRYER_PR_PHASE = {
"0": "ready",
"1": "heat_stroke",
"2": "drying",
"3": "cooldown",
"8": "unknown",
"11": "ready",
"12": "unknown",
"13": "cooldown",
"14": "heat_stroke",
"15": "heat_stroke",
"16": "cooldown",
"17": "unknown",
"18": "tumbling",
"19": "drying",
"20": "drying",
0: "ready",
1: "heat_stroke",
2: "drying",
3: "cooldown",
8: "unknown",
11: "ready",
12: "unknown",
13: "cooldown",
14: "heat_stroke",
15: "heat_stroke",
16: "cooldown",
17: "unknown",
18: "tumbling",
19: "drying",
20: "drying",
}
DIRTY_LEVEL = {
"0": "unknown",
"1": "little",
"2": "normal",
"3": "very",
0: "unknown",
1: "little",
2: "normal",
3: "very",
}
STEAM_LEVEL = {
"0": "no_steam",
"1": "cotton",
"2": "delicate",
"3": "synthetic",
0: "no_steam",
1: "cotton",
2: "delicate",
3: "synthetic",
}
DISHWASHER_PR_PHASE = {
"0": "ready",
"1": "prewash",
"2": "washing",
"3": "rinse",
"4": "drying",
"5": "ready",
"6": "hot_rinse",
0: "ready",
1: "prewash",
2: "washing",
3: "rinse",
4: "drying",
5: "ready",
6: "hot_rinse",
}
TUMBLE_DRYER_DRY_LEVEL = {
"0": "no_dry",
"1": "iron_dry",
"2": "no_dry_iron",
"3": "cupboard_dry",
"4": "extra_dry",
"11": "no_dry",
"12": "iron_dry",
"13": "cupboard_dry",
"14": "ready_to_wear",
"15": "extra_dry",
0: "no_dry",
1: "iron_dry",
2: "no_dry_iron",
3: "cupboard_dry",
4: "extra_dry",
11: "no_dry",
12: "iron_dry",
13: "cupboard_dry",
14: "ready_to_wear",
15: "extra_dry",
}
AC_MACH_MODE = {
"0": "auto",
"1": "cool",
"2": "cool",
"3": "dry",
"4": "heat",
"5": "fan",
"6": "fan",
0: "auto",
1: "cool",
2: "cool",
3: "dry",
4: "heat",
5: "fan",
6: "fan",
}
AC_FAN_MODE = {
"1": "high",
"2": "mid",
"3": "low",
"4": "auto",
"5": "auto",
1: "high",
2: "mid",
3: "low",
4: "auto",
5: "auto",
}
AC_HUMAN_SENSE = {
"0": "touch_off",
"1": "avoid_touch",
"2": "follow_touch",
"3": "unknown",
0: "touch_off",
1: "avoid_touch",
2: "follow_touch",
3: "unknown",
}
AP_MACH_MODE = {
"0": "standby",
"1": "sleep",
"2": "auto",
"3": "allergens",
"4": "max",
0: "standby",
1: "sleep",
2: "auto",
3: "allergens",
4: "max",
}
AP_DIFFUSER_LEVEL = {
"1": "soft",
"2": "mid",
"3": "h_biotics",
"4": "custom",
1: "soft",
2: "mid",
3: "h_biotics",
4: "custom",
}

View File

@ -44,8 +44,8 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
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]
if description.key not in device.available_settings or device.get(
description.key.split(".")[-1] is None
):
continue
entity = HonFanEntity(hass, entry, device, description)
@ -74,7 +74,7 @@ class HonFanEntity(HonEntity, FanEntity):
@property
def percentage(self) -> int | None:
"""Return the current speed."""
value = int(self._device.get(self._parameter, "0"))
value = self._device.get(self._parameter, 0)
return ranged_value_to_percentage(self._speed_range, value)
@property

View File

@ -1,4 +1,5 @@
import logging
from contextlib import suppress
from datetime import timedelta
from homeassistant.core import callback
@ -81,3 +82,10 @@ def get_coordinator(hass, appliance):
coordinator = HonCoordinator(hass, appliance)
hass.data[DOMAIN]["coordinators"][appliance.unique_id] = coordinator
return coordinator
def get_readable(description, value):
if description.option_list is not None:
with suppress(ValueError):
return description.option_list.get(int(value), value)
return value

View File

@ -9,7 +9,7 @@
"iot_class": "cloud_polling",
"issue_tracker": "https://github.com/Andre0512/hon/issues",
"requirements": [
"pyhOn==0.13.1"
"pyhOn==0.14.4"
],
"version": "0.9.0-beta.4"
"version": "0.9.0-beta.6"
}

View File

@ -256,7 +256,7 @@ class HonNumberEntity(HonEntity, NumberEntity):
"""Return True if entity is available."""
return (
super().available
and self._device.get("remoteCtrValid", "1") == "1"
and int(self._device.get("remoteCtrValid", 1)) == 1
and self._device.get("attributes.lastConnEvent.category") != "DISCONNECTED"
)

View File

@ -12,20 +12,20 @@ from homeassistant.helpers.entity import EntityCategory
from . import const
from .const import DOMAIN
from .hon import HonEntity, unique_entities
from .hon import HonEntity, unique_entities, get_readable
_LOGGER = logging.getLogger(__name__)
@dataclass
class HonSelectEntityDescription(SelectEntityDescription):
option_list: Dict[str, str] = None
option_list: Dict[int, str] = None
@dataclass
class HonConfigSelectEntityDescription(SelectEntityDescription):
entity_category: EntityCategory = EntityCategory.CONFIG
option_list: Dict[str, str] = None
option_list: Dict[int, str] = None
SELECTS = {
@ -175,9 +175,7 @@ class HonConfigSelectEntity(HonEntity, SelectEntity):
def current_option(self) -> str | None:
if not (setting := self._device.settings.get(self.entity_description.key)):
return None
value = setting.value
if self.entity_description.option_list:
value = self.entity_description.option_list.get(str(value), value)
value = get_readable(self.entity_description, setting.value)
if value not in self._attr_options:
return None
return value
@ -187,13 +185,12 @@ class HonConfigSelectEntity(HonEntity, SelectEntity):
setting = self._device.settings.get(self.entity_description.key)
if setting is None:
return []
options = self.entity_description.option_list or {}
return [options.get(str(key), key) for key in setting.values]
return [get_readable(self.entity_description, key) for key in setting.values]
def _option_to_number(self, option: str, values: List[str]):
if (options := self.entity_description.option_list) is not None:
return next(
(k for k, v in options.items() if k in values and v == option),
(k for k, v in options.items() if str(k) in values and v == option),
option,
)
return option
@ -213,6 +210,7 @@ class HonConfigSelectEntity(HonEntity, SelectEntity):
@property
def available(self) -> bool:
"""Return True if entity is available."""
return self._device.settings.get(self.entity_description.key) is not None
@ -233,6 +231,6 @@ class HonSelectEntity(HonConfigSelectEntity):
"""Return True if entity is available."""
return (
super().available
and self._device.get("remoteCtrValid", "1") == "1"
and int(self._device.get("remoteCtrValid", 1)) == 1
and self._device.get("attributes.lastConnEvent.category") != "DISCONNECTED"
)

View File

@ -29,7 +29,7 @@ from homeassistant.helpers.entity import EntityCategory
from . import const
from .const import DOMAIN
from .hon import HonEntity, unique_entities
from .hon import HonEntity, unique_entities, get_readable
_LOGGER = logging.getLogger(__name__)
@ -37,12 +37,12 @@ _LOGGER = logging.getLogger(__name__)
@dataclass
class HonConfigSensorEntityDescription(SensorEntityDescription):
entity_category: EntityCategory = EntityCategory.CONFIG
option_list: Dict[str, str] = None
option_list: Dict[int, str] = None
@dataclass
class HonSensorEntityDescription(SensorEntityDescription):
option_list: Dict[str, str] = None
option_list: Dict[int, str] = None
SENSORS: dict[str, tuple[SensorEntityDescription, ...]] = {
@ -769,7 +769,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
for device in hass.data[DOMAIN][entry.unique_id].appliances:
for description in SENSORS.get(device.appliance_type, []):
if isinstance(description, HonSensorEntityDescription):
if not device.get(description.key):
if device.get(description.key) is None:
continue
entity = HonSensorEntity(hass, entry, device, description)
elif isinstance(description, HonConfigSensorEntityDescription):
@ -796,7 +796,7 @@ class HonSensorEntity(HonEntity, SensorEntity):
).values + ["No Program"]
elif self.entity_description.option_list is not None:
self._attr_options = list(self.entity_description.option_list.values())
value = self.entity_description.option_list.get(value, value)
value = get_readable(self.entity_description, value)
if not value and self.entity_description.state_class is not None:
self._attr_native_value = 0
self._attr_native_value = value
@ -821,7 +821,7 @@ class HonConfigSensorEntity(HonEntity, SensorEntity):
value = value.value
if self.entity_description.option_list is not None and not value == 0:
self._attr_options = list(self.entity_description.option_list.values())
value = self.entity_description.option_list.get(value, value)
value = get_readable(self.entity_description, value)
self._attr_native_value = value
if update:
self.async_write_ha_state()

View File

@ -5,8 +5,8 @@ from typing import Any
from homeassistant.components.switch import SwitchEntityDescription, SwitchEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.helpers.entity import EntityCategory
from homeassistant.core import callback
from homeassistant.helpers.entity import EntityCategory
from pyhon.parameter.base import HonParameter
from pyhon.parameter.range import HonParameterRange
@ -262,9 +262,9 @@ SWITCHES: dict[str, tuple[HonSwitchEntityDescription, ...]] = {
),
HonSwitchEntityDescription(
key="muteStatus",
name="Mute",
name="Silent Mode",
icon="mdi:volume-off",
translation_key="mute_mode",
translation_key="silent_mode",
),
HonSwitchEntityDescription(
key="rapidMode",
@ -291,9 +291,9 @@ SWITCHES: dict[str, tuple[HonSwitchEntityDescription, ...]] = {
),
HonSwitchEntityDescription(
key="silentSleepStatus",
name="Silent Sleep",
name="Night Mode",
icon="mdi:bed",
translation_key="silent_mode",
translation_key="night_mode",
),
),
"REF": (
@ -368,7 +368,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
elif isinstance(description, HonSwitchEntityDescription):
if (
f"settings.{description.key}" not in device.available_settings
or not device.get(description.key)
or device.get(description.key) is None
):
continue
entity = HonSwitchEntity(hass, entry, device, description)
@ -386,7 +386,7 @@ class HonSwitchEntity(HonEntity, SwitchEntity):
@property
def is_on(self) -> bool | None:
"""Return True if entity is on."""
return self._device.get(self.entity_description.key, "0") == "1"
return self._device.get(self.entity_description.key, 0) == 1
async def async_turn_on(self, **kwargs: Any) -> None:
setting = self._device.settings[f"settings.{self.entity_description.key}"]
@ -411,14 +411,14 @@ class HonSwitchEntity(HonEntity, SwitchEntity):
"""Return True if entity is available."""
return (
super().available
and self._device.get("remoteCtrValid", "1") == "1"
and int(self._device.get("remoteCtrValid", 1)) == 1
and self._device.get("attributes.lastConnEvent.category") != "DISCONNECTED"
)
@callback
def _handle_coordinator_update(self, update=True) -> None:
value = self._device.get(self.entity_description.key, "0")
self._attr_state = value == "1"
value = self._device.get(self.entity_description.key, 0)
self._attr_state = value == 1
if update:
self.async_write_ha_state()
@ -446,7 +446,7 @@ class HonControlSwitchEntity(HonEntity, SwitchEntity):
"""Return True if entity is available."""
return (
super().available
and self._device.get("remoteCtrValid", "1") == "1"
and int(self._device.get("remoteCtrValid", 1)) == 1
and self._device.get("attributes.lastConnEvent.category") != "DISCONNECTED"
)
@ -454,8 +454,8 @@ class HonControlSwitchEntity(HonEntity, SwitchEntity):
def extra_state_attributes(self) -> dict[str, Any]:
"""Return the optional state attributes."""
result = {}
if remaining_time := int(self._device.get("remainingTimeMM", 0)):
delay_time = int(self._device.get("delayTime", 0))
if remaining_time := self._device.get("remainingTimeMM", 0):
delay_time = self._device.get("delayTime", 0)
result["start_time"] = datetime.now() + timedelta(minutes=delay_time)
result["end_time"] = datetime.now() + timedelta(
minutes=delay_time + remaining_time

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Chladnička"
},
"night_mode": {
"name": "Noční režim"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Kühlschrank"
},
"night_mode": {
"name": "Nachtmodus"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Ψυγείο"
},
"night_mode": {
"name": "Νυχτερινή λειτουργία"
}
},
"binary_sensor": {

View File

@ -1735,6 +1735,9 @@
},
"refrigerator": {
"name": "Refrigerator"
},
"night_mode": {
"name": "Night mode"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Frigorífico"
},
"night_mode": {
"name": "Modo nocturno"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Réfrigérateur"
},
"night_mode": {
"name": "Mode nuit"
}
},
"binary_sensor": {

View File

@ -831,6 +831,9 @@
},
"refrigerator": {
"name": "Refrigerator"
},
"night_mode": {
"name": "Night mode"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Hladnjak"
},
"night_mode": {
"name": "Noćni način rada"
}
},
"binary_sensor": {

View File

@ -1711,6 +1711,9 @@
},
"refrigerator": {
"name": "Frigo"
},
"night_mode": {
"name": "Modalità notte"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Koelkast"
},
"night_mode": {
"name": "Nachtmodus"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Lodówka"
},
"night_mode": {
"name": "Tryb nocny"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Frigorífico"
},
"night_mode": {
"name": "Modo noturno"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Frigider"
},
"night_mode": {
"name": "Modul noapte"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Холодильник"
},
"night_mode": {
"name": "Ночной режим"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Chladnička"
},
"night_mode": {
"name": "Nočný režim"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Hladilnik"
},
"night_mode": {
"name": "Nočni način"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Frižider"
},
"night_mode": {
"name": "Noćni režim"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "Buzdolabı"
},
"night_mode": {
"name": "Gece modu"
}
},
"binary_sensor": {

View File

@ -1706,6 +1706,9 @@
},
"refrigerator": {
"name": "冰箱"
},
"night_mode": {
"name": "夜间模式"
}
},
"binary_sensor": {

29
info.md
View File

@ -27,18 +27,21 @@ _If the integration is not in the list, you need to clear the browser cache._
## 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** | **Hoover** | **Candy** |
|---------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
| **Washing Machine** | HW90-B14TEAM5 <br/> HW100-B14959U1 | H-WASH 500 <br/> H7W4 48MBC-S | CO4 107T1/2-07 <br/> CBWO49TWME-S <br/> RO44 1286DWMC4-07 <br/> HW 68AMC/1-80 <br/> HWPD 69AMBC/1-S |
| **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 |
| **Washer Dryer** | HWD100-B14979 | HWPS4954DAMR-11 | RPW41066BWMR/1-S |
| **Oven** | HWO60SM2F3XH | HSOT3161WG | |
| **Dish Washer** | XIB 3B2SFS-80 <br/> XIB 6B2D3FB | HFB 6B2S3FX | |
| **Air Conditioner** | AD105S2SM3FA <br/> AS20HPL1HRA <br/> AS25PBAHRA <br/> AS25S2SF1FA-WH <br/> AS25TADHRA-2 <br/> AS35S2SF2FA-3 <br/> AS35TADHRA-2 <br/> AS35TAMHRA-C | | |
| **Fridge** | HFW7720ENMB | | CCE4T620EWU |
| **Hob** | HA2MTSJ68MC | | CIS633SCTTWIFI |
| **Hood** | HADG6DS46BWIFI | | |
| **Wine Cellar** | HWS247FDU1 | | |
| | **Haier** | **Hoover** | **Candy** |
|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
| **Washing Machine** | HW90-B14TEAM5 <br/> HW100-B14959U1 <br/> HW 410AMBCB/1-80 | H-WASH 500 <br/> H7W4 48MBC-S <br/> | CO4 107T1/2-07 <br/> CBWO49TWME-S <br/> RO44 1286DWMC4-07 <br/> HW 68AMC/1-80 <br/> HWPD 69AMBC/1-S |
| **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 |
| **Washer Dryer** | HWD100-B14979 | HWPS4954DAMR-11 | RPW41066BWMR/1-S |
| **Oven** | HWO60SM2F3XH | HSOT3161WG | |
| **Dish Washer** | XIB 3B2SFS-80 <br/> XIB 6B2D3FB | HFB 6B2S3FX | |
| **Air Conditioner** | AD105S2SM3FA <br/> AS20HPL1HRA <br/> AS25PBAHRA <br/> AS25S2SF1FA-WH <br/> AS25TADHRA-2 <br/> AS35S2SF2FA-3 <br/> AS35TADHRA-2 <br/> AS35TAMHRA-C | | |
| **Fridge** | HFW7720ENMB | | CCE4T620EWU |
| **Hob** | HA2MTSJ68MC | | CIS633SCTTWIFI |
| **Hood** | HADG6DS46BWIFI | | |
| **Wine Cellar** | HWS247FDU1 | | |
| Please add your appliances data to our [hon-test-data collection](https://github.com/Andre0512/hon-test-data). <br/>This helps us to develop new features and not to break compatibility in newer versions. |
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
## Supported Languages
Translation of internal names like programs are available for all languages which are official supported by the hOn app:
@ -67,6 +70,8 @@ Translation of internal names like programs are available for all languages whic
![washing_machine.png](assets/washing_machine.png)
## Contribute
Want to help us to support more appliances? Or add more sensors? Or help with translating? Or beautify some icons or captions?
Check out the [project on GitHub](https://github.com/Andre0512/hon), every contribution is welcome!

View File

@ -198,7 +198,7 @@ NAMES = {
"self_clean": "PROGRAMS.AC.IOT_SELF_CLEAN",
"self_clean_56": "PROGRAMS.AC.IOT_SELF_CLEAN_56",
"silent_mode": "AC.PROGRAM_DETAIL.SILENT_MODE",
"mute_mode": "AC.PROGRAM_DETAIL.MUTE_MODE",
"night_mode": "AC.PROGRAM_CARD.NIGHT",
"extra_rinse_1": "WASHING_CMD&CTRL.PROGRAM_CYCLE_DETAIL_OTHER_OPTIONS.EXTRARINSE1",
"extra_rinse_2": "WASHING_CMD&CTRL.PROGRAM_CYCLE_DETAIL_OTHER_OPTIONS.EXTRARINSE2",
"extra_rinse_3": "WASHING_CMD&CTRL.PROGRAM_CYCLE_DETAIL_OTHER_OPTIONS.EXTRARINSE3",