jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make eufylife_ble sensors inherit RestoreSensor (#98528)

Browse Source
This commit is contained in:
Erik Montnemery 2023-08-16 20:15:47 +02:00 committed by GitHub
parent 31f5932fe4
commit 4eb0f1cf37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
homeassistant/components/eufylife_ble/sensor.py
View File

@ -7,19 +7,16 @@ from eufylife_ble_client import MODEL_TO_NAME
from homeassistant import config_entries from homeassistant import config_entries
from homeassistant.components.bluetooth import async_address_present from homeassistant.components.bluetooth import async_address_present
from homeassistant.components.sensor import SensorDeviceClass, SensorEntity from homeassistant.components.sensor import (
from homeassistant.const import ( RestoreSensor,
ATTR_UNIT_OF_MEASUREMENT, SensorDeviceClass,
STATE_UNAVAILABLE, SensorEntity,
STATE_UNKNOWN,
UnitOfMass,
) )
from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN, UnitOfMass
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import device_registry as dr from homeassistant.helpers import device_registry as dr
from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.util.unit_conversion import MassConverter
from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
from .const import DOMAIN from .const import DOMAIN
@ -111,16 +108,13 @@ class EufyLifeRealTimeWeightSensorEntity(EufyLifeSensorEntity):
return UnitOfMass.KILOGRAMS return UnitOfMass.KILOGRAMS
# pylint: disable-next=hass-invalid-inheritance # needs fixing class EufyLifeWeightSensorEntity(RestoreSensor, EufyLifeSensorEntity):
class EufyLifeWeightSensorEntity(RestoreEntity, EufyLifeSensorEntity):
"""Representation of an EufyLife weight sensor.""" """Representation of an EufyLife weight sensor."""
_attr_translation_key = "weight" _attr_translation_key = "weight"
_attr_native_unit_of_measurement = UnitOfMass.KILOGRAMS _attr_native_unit_of_measurement = UnitOfMass.KILOGRAMS
_attr_device_class = SensorDeviceClass.WEIGHT _attr_device_class = SensorDeviceClass.WEIGHT
_weight_kg: float | None = None
def __init__(self, data: EufyLifeData) -> None: def __init__(self, data: EufyLifeData) -> None:
"""Initialize the weight sensor entity.""" """Initialize the weight sensor entity."""
super().__init__(data) super().__init__(data)
@ -131,11 +125,6 @@ class EufyLifeWeightSensorEntity(RestoreEntity, EufyLifeSensorEntity):
"""Determine if the entity is available.""" """Determine if the entity is available."""
return True return True
@property
def native_value(self) -> float | None:
"""Return the native value."""
return self._weight_kg
@property @property
def suggested_unit_of_measurement(self) -> str | None: def suggested_unit_of_measurement(self) -> str | None:
"""Set the suggested unit based on the unit system.""" """Set the suggested unit based on the unit system."""
@ -149,7 +138,7 @@ class EufyLifeWeightSensorEntity(RestoreEntity, EufyLifeSensorEntity):
"""Handle state update.""" """Handle state update."""
state = self._data.client.state state = self._data.client.state
if state is not None and state.final_weight_kg is not None: if state is not None and state.final_weight_kg is not None:
self._weight_kg = state.final_weight_kg self._attr_native_value = state.final_weight_kg
super()._handle_state_update(args) super()._handle_state_update(args)
@ -158,30 +147,21 @@ class EufyLifeWeightSensorEntity(RestoreEntity, EufyLifeSensorEntity):
await super().async_added_to_hass() await super().async_added_to_hass()
last_state = await self.async_get_last_state() last_state = await self.async_get_last_state()
if not last_state or last_state.state in IGNORED_STATES: last_sensor_data = await self.async_get_last_sensor_data()
if not last_state or not last_sensor_data or last_state.state in IGNORED_STATES:
return return
last_weight = float(last_state.state) self._attr_native_value = last_sensor_data.native_value
last_weight_unit = last_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
# Since the RestoreEntity stores the state using the displayed unit,
# not the native unit, we need to convert the state back to the native
# unit.
self._weight_kg = MassConverter.convert(
last_weight, last_weight_unit, self.native_unit_of_measurement
)
# pylint: disable-next=hass-invalid-inheritance # needs fixing class EufyLifeHeartRateSensorEntity(RestoreSensor, EufyLifeSensorEntity):
class EufyLifeHeartRateSensorEntity(RestoreEntity, EufyLifeSensorEntity):
"""Representation of an EufyLife heart rate sensor.""" """Representation of an EufyLife heart rate sensor."""
_attr_translation_key = "heart_rate" _attr_translation_key = "heart_rate"
_attr_icon = "mdi:heart-pulse" _attr_icon = "mdi:heart-pulse"
_attr_native_unit_of_measurement = "bpm" _attr_native_unit_of_measurement = "bpm"
_heart_rate: int | None = None
def __init__(self, data: EufyLifeData) -> None: def __init__(self, data: EufyLifeData) -> None:
"""Initialize the heart rate sensor entity.""" """Initialize the heart rate sensor entity."""
super().__init__(data) super().__init__(data)
@ -192,17 +172,12 @@ class EufyLifeHeartRateSensorEntity(RestoreEntity, EufyLifeSensorEntity):
"""Determine if the entity is available.""" """Determine if the entity is available."""
return True return True
@property
def native_value(self) -> float | None:
"""Return the native value."""
return self._heart_rate
@callback @callback
def _handle_state_update(self, *args: Any) -> None: def _handle_state_update(self, *args: Any) -> None:
"""Handle state update.""" """Handle state update."""
state = self._data.client.state state = self._data.client.state
if state is not None and state.heart_rate is not None: if state is not None and state.heart_rate is not None:
self._heart_rate = state.heart_rate self._attr_native_value = state.heart_rate
super()._handle_state_update(args) super()._handle_state_update(args)
@ -211,7 +186,9 @@ class EufyLifeHeartRateSensorEntity(RestoreEntity, EufyLifeSensorEntity):
await super().async_added_to_hass() await super().async_added_to_hass()
last_state = await self.async_get_last_state() last_state = await self.async_get_last_state()
if not last_state or last_state.state in IGNORED_STATES: last_sensor_data = await self.async_get_last_sensor_data()
if not last_state or not last_sensor_data or last_state.state in IGNORED_STATES:
return return
self._heart_rate = int(last_state.state) self._attr_native_value = last_sensor_data.native_value