deadcade/hOn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix many bugs

Browse source
This commit is contained in:
Andre Basche 2023-03-08 23:00:55 +01:00
parent 88c76b8056
commit 075d34b5e2
8 changed files with 68 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
custom_components/hon/binary_sensor.py
View file

@ -26,14 +26,14 @@ class HonBinarySensorEntityDescription(HonBinarySensorEntityDescriptionMixin, Bi
BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = { BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
"WM": ( "WM": (
HonBinarySensorEntityDescription( HonBinarySensorEntityDescription(
key="lastConnEvent.category", key="attributes.lastConnEvent.category",
name="Connection", name="Connection",
device_class=BinarySensorDeviceClass.CONNECTIVITY, device_class=BinarySensorDeviceClass.CONNECTIVITY,
on_value="CONNECTED", on_value="CONNECTED",
), ),
HonBinarySensorEntityDescription( HonBinarySensorEntityDescription(
key="doorLockStatus", key="doorLockStatus",
name="Door Locked", name="Door",
device_class=BinarySensorDeviceClass.DOOR, device_class=BinarySensorDeviceClass.DOOR,
on_value="0", on_value="0",
), ),
@ -53,9 +53,9 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
if descriptions := BINARY_SENSORS.get(device.appliance_type_name): if descriptions := BINARY_SENSORS.get(device.appliance_type):
for description in descriptions: for description in descriptions:
if not device.data.get(description.key): if not device.get(description.key):
_LOGGER.info("Can't setup %s", description.key) _LOGGER.info("Can't setup %s", description.key)
continue continue
appliances.extend([ appliances.extend([
@ -78,9 +78,9 @@ class HonBinarySensorEntity(HonEntity, BinarySensorEntity):
@property @property
def is_on(self) -> bool: def is_on(self) -> bool:
return self._device.data.get(self.entity_description.key, "") == self.entity_description.on_value return self._device.get(self.entity_description.key, "") == self.entity_description.on_value
@callback @callback
def _handle_coordinator_update(self): def _handle_coordinator_update(self):
self._attr_native_value = self._device.data.get(self.entity_description.key, "") self._attr_native_value = self._device.get(self.entity_description.key, "") == self.entity_description.on_value
self.async_write_ha_state() self.async_write_ha_state()

22
custom_components/hon/button.py
View file

@ -9,16 +9,16 @@ from .hon import HonCoordinator, HonEntity
BUTTONS: dict[str, tuple[ButtonEntityDescription, ...]] = { BUTTONS: dict[str, tuple[ButtonEntityDescription, ...]] = {
"WM": ( "WM": (
ButtonEntityDescription( # ButtonEntityDescription(
key="pauseProgram", # key="pauseProgram",
name="Pause Program", # name="Pause Program",
icon="mdi:pause", # icon="mdi:pause",
), # ),
ButtonEntityDescription( # ButtonEntityDescription(
key="resumeProgram", # key="resumeProgram",
name="Resume Program", # name="Resume Program",
icon="mdi:play-pause", # icon="mdi:play-pause",
), # ),
), ),
} }
@ -35,7 +35,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
if descriptions := BUTTONS.get(device.appliance_type_name): if descriptions := BUTTONS.get(device.appliance_type):
for description in descriptions: for description in descriptions:
if not device.commands.get(description.key): if not device.commands.get(description.key):
continue continue

4
custom_components/hon/hon.py
View file

@ -28,10 +28,10 @@ class HonEntity(CoordinatorEntity):
def device_info(self): def device_info(self):
return DeviceInfo( return DeviceInfo(
identifiers={(DOMAIN, self._device.mac_address)}, identifiers={(DOMAIN, self._device.mac_address)},
manufacturer=self._device.brand, manufacturer=self._device.get("brand", ""),
name=self._device.nick_name if self._device.nick_name else self._device.model_name, name=self._device.nick_name if self._device.nick_name else self._device.model_name,
model=self._device.model_name, model=self._device.model_name,
sw_version=self._device.fw_version, sw_version=self._device.get("fwVersion", ""),
) )

4
custom_components/hon/manifest.json
View file

@ -6,7 +6,7 @@
"documentation": "https://github.com/Andre0512/hon/", "documentation": "https://github.com/Andre0512/hon/",
"iot_class": "cloud_polling", "iot_class": "cloud_polling",
"issue_tracker": "https://github.com/Andre0512/hon/issues", "issue_tracker": "https://github.com/Andre0512/hon/issues",
"requirements": ["pyhOn==0.2.4"], "requirements": ["pyhOn==0.3.3"],
"version": "0.1.1" "version": "0.2.0"
} }

24
custom_components/hon/number.py
View file

@ -20,19 +20,20 @@ NUMBERS: dict[str, tuple[NumberEntityDescription, ...]] = {
NumberEntityDescription( NumberEntityDescription(
key="startProgram.delayTime", key="startProgram.delayTime",
name="Delay Time", name="Delay Time",
icon="mdi:timer", icon="mdi:timer-plus",
entity_category=EntityCategory.CONFIG, entity_category=EntityCategory.CONFIG,
native_unit_of_measurement=UnitOfTime.MINUTES native_unit_of_measurement=UnitOfTime.MINUTES
), ),
NumberEntityDescription( NumberEntityDescription(
key="startProgram.rinseIterations", key="startProgram.rinseIterations",
name="Rinse Iterations", name="Rinse Iterations",
icon="mdi:rotate-right",
entity_category=EntityCategory.CONFIG entity_category=EntityCategory.CONFIG
), ),
NumberEntityDescription( NumberEntityDescription(
key="startProgram.mainWashTime", key="startProgram.mainWashTime",
name="Main Wash Time", name="Main Wash Time",
icon="mdi:timer", icon="mdi:clock-start",
entity_category=EntityCategory.CONFIG, entity_category=EntityCategory.CONFIG,
native_unit_of_measurement=UnitOfTime.MINUTES native_unit_of_measurement=UnitOfTime.MINUTES
), ),
@ -52,7 +53,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
if descriptions := NUMBERS.get(device.appliance_type_name): if descriptions := NUMBERS.get(device.appliance_type):
for description in descriptions: for description in descriptions:
appliances.extend([ appliances.extend([
HonNumberEntity(hass, coordinator, entry, device, description)] HonNumberEntity(hass, coordinator, entry, device, description)]
@ -66,6 +67,7 @@ class HonNumberEntity(HonEntity, NumberEntity):
super().__init__(hass, entry, coordinator, device) super().__init__(hass, entry, coordinator, device)
self._coordinator = coordinator self._coordinator = coordinator
self._device = device
self._data = device.settings[description.key] self._data = device.settings[description.key]
self.entity_description = description self.entity_description = description
self._attr_unique_id = f"{super().unique_id}{description.key}" self._attr_unique_id = f"{super().unique_id}{description.key}"
@ -77,18 +79,18 @@ class HonNumberEntity(HonEntity, NumberEntity):
@property @property
def native_value(self) -> float | None: def native_value(self) -> float | None:
return self._data.value return self._device.get(self.entity_description.key)
async def async_set_native_value(self, value: float) -> None: async def async_set_native_value(self, value: float) -> None:
self._data.value = value self._device.settings[self.entity_description.key].value = value
await self.coordinator.async_request_refresh() await self.coordinator.async_request_refresh()
@callback @callback
def _handle_coordinator_update(self): def _handle_coordinator_update(self):
self._data = self._device.settings[self.entity_description.key] setting = self._device.settings[self.entity_description.key]
if isinstance(self._data, HonParameterRange): if isinstance(setting, HonParameterRange):
self._attr_native_max_value = self._data.max self._attr_native_max_value = setting.max
self._attr_native_min_value = self._data.min self._attr_native_min_value = setting.min
self._attr_native_step = self._data.step self._attr_native_step = setting.step
self._attr_native_value = self._data.value self._attr_native_value = setting.value
self.async_write_ha_state() self.async_write_ha_state()

25
custom_components/hon/select.py
View file

@ -50,9 +50,9 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
if descriptions := SELECTS.get(device.appliance_type_name): if descriptions := SELECTS.get(device.appliance_type):
for description in descriptions: for description in descriptions:
if not device.data.get(description.key): if not device.get(description.key):
continue continue
appliances.extend([ appliances.extend([
HonSelectEntity(hass, coordinator, entry, device, description)] HonSelectEntity(hass, coordinator, entry, device, description)]
@ -66,32 +66,31 @@ class HonSelectEntity(HonEntity, SelectEntity):
self._coordinator = coordinator self._coordinator = coordinator
self._device = device self._device = device
self._data = device.settings[description.key]
self.entity_description = description self.entity_description = description
self._attr_unique_id = f"{super().unique_id}{description.key}" self._attr_unique_id = f"{super().unique_id}{description.key}"
if not isinstance(self._data, HonParameterFixed): if not isinstance(self._device.settings[description.key], HonParameterFixed):
self._attr_options: list[str] = self._data.values self._attr_options: list[str] = device.settings[description.key].values
else: else:
self._attr_options = [self._data.value] self._attr_options: list[str] = [device.settings[description.key].value]
@property @property
def current_option(self) -> str | None: def current_option(self) -> str | None:
value = self._data.value value = self._device.settings[self.entity_description.key].value
if value is None or value not in self._attr_options: if value is None or value not in self._attr_options:
return None return None
return value return value
async def async_select_option(self, option: str) -> None: async def async_select_option(self, option: str) -> None:
self._data.value = option self._device.settings[self.entity_description.key].value = option
await self.coordinator.async_request_refresh() await self.coordinator.async_request_refresh()
@callback @callback
def _handle_coordinator_update(self): def _handle_coordinator_update(self):
self._data = self._device.settings[self.entity_description.key] setting = self._device.settings[self.entity_description.key]
if not isinstance(self._data, HonParameterFixed): if not isinstance(self._device.settings[self.entity_description.key], HonParameterFixed):
self._attr_options: list[str] = self._data.values self._attr_options: list[str] = setting.values
else: else:
self._attr_options = [self._data.value] self._attr_options = [setting.value]
self._attr_native_value = self._data.value self._attr_native_value = setting.value
self.async_write_ha_state() self.async_write_ha_state()

12
custom_components/hon/sensor.py
View file

@ -65,13 +65,13 @@ SENSORS: dict[str, tuple[SensorEntityDescription, ...]] = {
), ),
SensorEntityDescription( SensorEntityDescription(
key="machMode", key="machMode",
name="Machine Last Status", name="Machine Status",
icon="mdi:information", icon="mdi:information",
translation_key="mode" translation_key="mode"
), ),
SensorEntityDescription( SensorEntityDescription(
key="errors", key="errors",
name="Last Error", name="Error",
icon="mdi:math-log", icon="mdi:math-log",
translation_key="errors" translation_key="errors"
), ),
@ -105,9 +105,9 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
if descriptions := SENSORS.get(device.appliance_type_name): if descriptions := SENSORS.get(device.appliance_type):
for description in descriptions: for description in descriptions:
if not device.data.get(description.key): if not device.get(description.key):
continue continue
appliances.extend([ appliances.extend([
HonSensorEntity(hass, coordinator, entry, device, description)] HonSensorEntity(hass, coordinator, entry, device, description)]
@ -127,9 +127,9 @@ class HonSensorEntity(HonEntity, SensorEntity):
@property @property
def native_value(self) -> StateType: def native_value(self) -> StateType:
return self._device.data.get(self.entity_description.key, "") return self._device.get(self.entity_description.key, "")
@callback @callback
def _handle_coordinator_update(self): def _handle_coordinator_update(self):
self._attr_native_value = self._device.data.get(self.entity_description.key, "") self._attr_native_value = self._device.get(self.entity_description.key, "")
self.async_write_ha_state() self.async_write_ha_state()

23
custom_components/hon/switch.py
View file

@ -27,20 +27,29 @@ class HonSwitchEntityDescription(HonSwitchEntityDescriptionMixin,
SWITCHES: dict[str, tuple[HonSwitchEntityDescription, ...]] = { SWITCHES: dict[str, tuple[HonSwitchEntityDescription, ...]] = {
"WM": ( "WM": (
HonSwitchEntityDescription( HonSwitchEntityDescription(
key="startProgram", key="active",
name="Start Program", name="Washing Machine",
icon="mdi:play", icon="mdi:washing-machine",
turn_on_key="startProgram", turn_on_key="startProgram",
turn_off_key="stopProgram", turn_off_key="stopProgram",
), ),
HonSwitchEntityDescription(
key="pause",
name="Pause Washing Machine",
icon="mdi:pause",
turn_on_key="pauseProgram",
turn_off_key="resumeProgram",
),
HonSwitchEntityDescription( HonSwitchEntityDescription(
key="startProgram.delayStatus", key="startProgram.delayStatus",
name="Delay Status", name="Delay Status",
icon="mdi:timer-check",
entity_category=EntityCategory.CONFIG entity_category=EntityCategory.CONFIG
), ),
HonSwitchEntityDescription( HonSwitchEntityDescription(
key="startProgram.haier_SoakPrewashSelection", key="startProgram.haier_SoakPrewashSelection",
name="Soak Prewash Selection", name="Soak Prewash Selection",
icon="mdi:tshirt-crew",
entity_category=EntityCategory.CONFIG entity_category=EntityCategory.CONFIG
), ),
), ),
@ -59,9 +68,9 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities) -> Non
hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator hass.data[DOMAIN]["coordinators"][device.mac_address] = coordinator
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
if descriptions := SWITCHES.get(device.appliance_type_name): if descriptions := SWITCHES.get(device.appliance_type):
for description in descriptions: for description in descriptions:
if device.data.get(description.key) is not None or device.commands.get(description.key) is not None: if device.get(description.key) is not None or device.commands.get(description.key) is not None:
appliances.extend([ appliances.extend([
HonSwitchEntity(hass, coordinator, entry, device, description)] HonSwitchEntity(hass, coordinator, entry, device, description)]
) )
@ -81,7 +90,7 @@ class HonSwitchEntity(HonEntity, SwitchEntity):
def available(self) -> bool: def available(self) -> bool:
if self.entity_category == EntityCategory.CONFIG: if self.entity_category == EntityCategory.CONFIG:
return self._device.settings[self.entity_description.key].typology == "fixed" return self._device.settings[self.entity_description.key].typology != "fixed"
return True return True
@property @property
@ -90,7 +99,7 @@ class HonSwitchEntity(HonEntity, SwitchEntity):
if self.entity_category == EntityCategory.CONFIG: if self.entity_category == EntityCategory.CONFIG:
setting = self._device.settings[self.entity_description.key] setting = self._device.settings[self.entity_description.key]
return setting.value == "1" or hasattr(setting, "min") and setting.value != setting.min return setting.value == "1" or hasattr(setting, "min") and setting.value != setting.min
return self._device.data.get(self.entity_description.key, "") return self._device.get(self.entity_description.key, False)
async def async_turn_on(self, **kwargs: Any) -> None: async def async_turn_on(self, **kwargs: Any) -> None:
if self.entity_category == EntityCategory.CONFIG: if self.entity_category == EntityCategory.CONFIG: