evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Limit zwave_js meter sensor last reset (#53921)

Browse source
This commit is contained in:
Martin Hjelmare 2021-08-03 22:50:14 +02:00 • committed by GitHub
parent f02259eb2d
commit c959a0a484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/components/zwave_js/sensor.py
View file

@ -248,20 +248,20 @@ class ZWaveMeterSensor(ZWaveNumericSensor, RestoreEntity):
# Entity class attributes
self._attr_state_class = STATE_CLASS_MEASUREMENT
self._attr_last_reset = dt.utc_from_timestamp(0)
if self.device_class == DEVICE_CLASS_ENERGY:
self._attr_last_reset = dt.utc_from_timestamp(0)
@callback
def async_update_last_reset(
self, node: ZwaveNode, endpoint: int, meter_type: int | None
) -> None:
"""Update last reset."""
# If the signal is not for this node or is for a different endpoint, ignore it
if self.info.node != node or self.info.primary_value.endpoint != endpoint:
return
# If a meter type was specified and doesn't match this entity's meter type,
# ignore it
# If the signal is not for this node or is for a different endpoint,
# or a meter type was specified and doesn't match this entity's meter type:
if (
meter_type is not None
self.info.node != node
or self.info.primary_value.endpoint != endpoint
or meter_type is not None
and self.info.primary_value.metadata.cc_specific.get("meterType")
!= meter_type
):
@ -274,6 +274,10 @@ class ZWaveMeterSensor(ZWaveNumericSensor, RestoreEntity):
"""Call when entity is added."""
await super().async_added_to_hass()
# If the meter is not an accumulating meter type, do not reset.
if self.device_class != DEVICE_CLASS_ENERGY:
return
# Restore the last reset time from stored state
restored_state = await self.async_get_last_state()
if restored_state and ATTR_LAST_RESET in restored_state.attributes:
@ -310,7 +314,7 @@ class ZWaveMeterSensor(ZWaveNumericSensor, RestoreEntity):
primary_value.endpoint,
options,
)
self._attr_last_reset = dt.utcnow()
# Notify meters that may have been reset
async_dispatcher_send(
self.hass,