jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 14:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update entity state when ZHA device becomes available (#20993)

Browse Source 
* correctly update device entity state

* update state when device becomes available

* constants

* review comments
This commit is contained in:
David F. Mulcahey 2019-02-12 20:37:39 -05:00 committed by GitHub
parent 888345e4ff
commit 561ff33641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/zha/core/device.py
View File

@ -173,7 +173,7 @@ class ZHADevice:
await self._execute_listener_tasks('async_configure') await self._execute_listener_tasks('async_configure')
_LOGGER.debug('%s: completed configuration', self.name) _LOGGER.debug('%s: completed configuration', self.name)
async def async_initialize(self, from_cache): async def async_initialize(self, from_cache=False):
"""Initialize listeners.""" """Initialize listeners."""
_LOGGER.debug('%s: started initialization', self.name) _LOGGER.debug('%s: started initialization', self.name)
await self._execute_listener_tasks('async_initialize', from_cache) await self._execute_listener_tasks('async_initialize', from_cache)

2
homeassistant/components/zha/core/gateway.py
View File

@ -138,7 +138,7 @@ class ZHAGateway:
)) ))
await asyncio.gather(*endpoint_tasks) await asyncio.gather(*endpoint_tasks)
await zha_device.async_initialize(not is_new_join) await zha_device.async_initialize(from_cache=(not is_new_join))
discovery_tasks = [] discovery_tasks = []
for discovery_info in discovery_infos: for discovery_info in discovery_infos:

15
homeassistant/components/zha/device_entity.py
View File

@ -8,6 +8,7 @@ https://home-assistant.io/components/zha/
import logging import logging
import time import time
from homeassistant.core import callback
from homeassistant.util import slugify from homeassistant.util import slugify
from .entity import ZhaEntity from .entity import ZhaEntity
from .const import LISTENER_BATTERY, SIGNAL_STATE_ATTR from .const import LISTENER_BATTERY, SIGNAL_STATE_ATTR
@ -30,6 +31,9 @@ BATTERY_SIZES = {
255: 'Unknown' 255: 'Unknown'
} }
STATE_ONLINE = 'online'
STATE_OFFLINE = 'offline'
class ZhaDeviceEntity(ZhaEntity): class ZhaDeviceEntity(ZhaEntity):
"""A base class for ZHA devices.""" """A base class for ZHA devices."""
@ -108,13 +112,20 @@ class ZhaDeviceEntity(ZhaEntity):
difference = time.time() - self._zha_device.last_seen difference = time.time() - self._zha_device.last_seen
if difference > self._keepalive_interval: if difference > self._keepalive_interval:
self._zha_device.update_available(False) self._zha_device.update_available(False)
self._state = None
else: else:
self._zha_device.update_available(True) self._zha_device.update_available(True)
self._state = 'online'
if self._battery_listener: if self._battery_listener:
await self.async_get_latest_battery_reading() await self.async_get_latest_battery_reading()
@callback
def async_set_available(self, available):
"""Set entity availability."""
if available:
self._state = STATE_ONLINE
else:
self._state = STATE_OFFLINE
super().async_set_available(available)
async def _async_init_battery_values(self): async def _async_init_battery_values(self):
"""Get initial battery level and battery info from listener cache.""" """Get initial battery level and battery info from listener cache."""
battery_size = await self._battery_listener.get_attribute_value( battery_size = await self._battery_listener.get_attribute_value(