Refactor homekit_controller entity update to work more like update coordinator (#32670)

* Clean up use of get_characteristic_types

* Get rid of get_hk_char_value helper

* Get rid of _update_fn callbacks

* Call async_write_has_state directly as async_state_changed doesnt do anything any more
This commit is contained in:
Jc2k authored and GitHub committed 2020-03-11 07:40:47 -04:00
1 parent 4248893007
commit 647d137daa
12 files changed
+159 -358

No files matched your search

@@ -25,11 +25,6 @@ UNIT_LUX = "lux"
class HomeKitHumiditySensor(HomeKitEntity):
"""Representation of a Homekit humidity sensor."""
def __init__(self, *args):
"""Initialise the entity."""
super().__init__(*args)
self._state = None
def get_characteristic_types(self):
"""Define the homekit characteristics the entity is tracking."""
return [CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT]
@@ -54,23 +49,15 @@ class HomeKitHumiditySensor(HomeKitEntity):
"""Return units for the sensor."""
return UNIT_PERCENTAGE
def _update_relative_humidity_current(self, value):
self._state = value
@property
def state(self):
"""Return the current humidity."""
return self._state
return self.service.value(CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT)
class HomeKitTemperatureSensor(HomeKitEntity):
"""Representation of a Homekit temperature sensor."""
def __init__(self, *args):
"""Initialise the entity."""
super().__init__(*args)
self._state = None
def get_characteristic_types(self):
"""Define the homekit characteristics the entity is tracking."""
return [CharacteristicsTypes.TEMPERATURE_CURRENT]
@@ -95,23 +82,15 @@ class HomeKitTemperatureSensor(HomeKitEntity):
"""Return units for the sensor."""
return TEMP_CELSIUS
def _update_temperature_current(self, value):
self._state = value
@property
def state(self):
"""Return the current temperature in Celsius."""
return self._state
return self.service.value(CharacteristicsTypes.TEMPERATURE_CURRENT)
class HomeKitLightSensor(HomeKitEntity):
"""Representation of a Homekit light level sensor."""
def __init__(self, *args):
"""Initialise the entity."""
super().__init__(*args)
self._state = None
def get_characteristic_types(self):
"""Define the homekit characteristics the entity is tracking."""
return [CharacteristicsTypes.LIGHT_LEVEL_CURRENT]
@@ -136,23 +115,15 @@ class HomeKitLightSensor(HomeKitEntity):
"""Return units for the sensor."""
return UNIT_LUX
def _update_light_level_current(self, value):
self._state = value
@property
def state(self):
"""Return the current light level in lux."""
return self._state
return self.service.value(CharacteristicsTypes.LIGHT_LEVEL_CURRENT)
class HomeKitCarbonDioxideSensor(HomeKitEntity):
"""Representation of a Homekit Carbon Dioxide sensor."""
def __init__(self, *args):
"""Initialise the entity."""
super().__init__(*args)
self._state = None
def get_characteristic_types(self):
"""Define the homekit characteristics the entity is tracking."""
return [CharacteristicsTypes.CARBON_DIOXIDE_LEVEL]
@@ -172,25 +143,15 @@ class HomeKitCarbonDioxideSensor(HomeKitEntity):
"""Return units for the sensor."""
return CONCENTRATION_PARTS_PER_MILLION
def _update_carbon_dioxide_level(self, value):
self._state = value
@property
def state(self):
"""Return the current CO2 level in ppm."""
return self._state
return self.service.value(CharacteristicsTypes.CARBON_DIOXIDE_LEVEL)
class HomeKitBatterySensor(HomeKitEntity):
"""Representation of a Homekit battery sensor."""
def __init__(self, *args):
"""Initialise the entity."""
super().__init__(*args)
self._state = None
self._low_battery = False
self._charging = False
def get_characteristic_types(self):
"""Define the homekit characteristics the entity is tracking."""
return [
@@ -218,12 +179,12 @@ class HomeKitBatterySensor(HomeKitEntity):
# This is similar to the logic in helpers.icon, but we have delegated the
# decision about what mdi:battery-alert is to the device.
icon = "mdi:battery"
if self._charging and self.state > 10:
if self.is_charging and self.state > 10:
percentage = int(round(self.state / 20 - 0.01)) * 20
icon += f"-charging-{percentage}"
elif self._charging:
elif self.is_charging:
icon += "-outline"
elif self._low_battery:
elif self.is_low_battery:
icon += "-alert"
elif self.state < 95:
percentage = max(int(round(self.state / 10 - 0.01)) * 10, 10)
@@ -236,22 +197,23 @@ class HomeKitBatterySensor(HomeKitEntity):
"""Return units for the sensor."""
return UNIT_PERCENTAGE
def _update_battery_level(self, value):
self._state = value
@property
def is_low_battery(self):
"""Return true if battery level is low."""
return self.service.value(CharacteristicsTypes.STATUS_LO_BATT) == 1
def _update_status_lo_batt(self, value):
self._low_battery = value == 1
def _update_charging_state(self, value):
@property
def is_charging(self):
"""Return true if currently charing."""
# 0 = not charging
# 1 = charging
# 2 = not chargeable
self._charging = value == 1
return self.service.value(CharacteristicsTypes.CHARGING_STATE) == 1
@property
def state(self):
"""Return the current battery level percentage."""
return self._state
return self.service.value(CharacteristicsTypes.BATTERY_LEVEL)
ENTITY_TYPES = {