Skip to content

Revert DSMR not calling entity methods #36179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 2 commits into from
May 27, 2020
Merged

Revert DSMR not calling entity methods #36179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd07cc6
Revert DSMR not calling entity methods
balloob May 26, 2020
37de156
Fix test
balloob May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions homeassistant/components/dsmr/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
)
from homeassistant.core import CoreState, callback
from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.dispatcher import (
async_dispatcher_connect,
async_dispatcher_send,
)
from homeassistant.helpers.entity import Entity

_LOGGER = logging.getLogger(__name__)
Expand Down Expand Up @@ -113,7 +109,11 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=

async_add_entities(devices)

update_entities_telegram = partial(async_dispatcher_send, hass, DOMAIN)
def update_entities_telegram(telegram):
"""Update entities with latest telegram and trigger state update."""
# Make all device entities aware of new telegram
for device in devices:
device.update_data(telegram)

# Creates an asyncio.Protocol factory for reading DSMR telegrams from
# serial and calls update_entities_telegram to update entities on arrival
Expand Down Expand Up @@ -187,17 +187,12 @@ def __init__(self, name, obis, config):
self._config = config
self.telegram = {}

async def async_added_to_hass(self):
"""When entity is added to hass."""
self.async_on_remove(
async_dispatcher_connect(self.hass, DOMAIN, self.update_data)
)

@callback
def update_data(self, telegram):
"""Update data."""
self.telegram = telegram
self.async_write_ha_state()
if self.hass:
self.async_write_ha_state()

def get_dsmr_object_attr(self, attribute):
"""Read attribute from last received telegram for this DSMR object."""
Expand Down