Skip to content

Support zone expanders in alarmdecoder #27167

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 1 commit into from
Oct 4, 2019
Merged

Support zone expanders in alarmdecoder #27167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions homeassistant/components/alarmdecoder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def zone_restore_callback(sender, zone):
hass.helpers.dispatcher.dispatcher_send(SIGNAL_ZONE_RESTORE, zone)

def handle_rel_message(sender, message):
"""Handle relay message from AlarmDecoder."""
"""Handle relay or zone expander message from AlarmDecoder."""
hass.helpers.dispatcher.dispatcher_send(SIGNAL_REL_MESSAGE, message)

controller = False
Expand All @@ -195,7 +195,7 @@ def handle_rel_message(sender, message):
controller.on_zone_fault += zone_fault_callback
controller.on_zone_restore += zone_restore_callback
controller.on_close += handle_closed_connection
controller.on_relay_changed += handle_rel_message
controller.on_expander_message += handle_rel_message

hass.data[DATA_AD] = controller

Expand Down
9 changes: 7 additions & 2 deletions homeassistant/components/alarmdecoder/binary_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,15 @@ def _rfx_message_callback(self, message):
self.schedule_update_ha_state()

def _rel_message_callback(self, message):
"""Update relay state."""
"""Update relay / expander state."""

if self._relay_addr == message.address and self._relay_chan == message.channel:
_LOGGER.debug(
"Relay %d:%d value:%d", message.address, message.channel, message.value
"%s %d:%d value:%d",
"Relay" if message.type == message.RELAY else "ZoneExpander",
message.address,
message.channel,
message.value,
)
self._state = message.value
self.schedule_update_ha_state()