Skip to content

ISY994 migration to PyISY v2 (Structure Changes to enable upgrade, Part 1) #35212

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
bdraco merged 3 commits into from
May 5, 2020
Merged

ISY994 migration to PyISY v2 (Structure Changes to enable upgrade, Part 1) #35212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7be65b
ISY994 Structure updates in prep for PyISYv2 (Part 1)
shbatm May 3, 2020
8bffd69
Update categorize_programs per review
shbatm May 4, 2020
8b2265f
add @shbatm as codeowner for ISY994 integration
shbatm May 4, 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
243 changes: 69 additions & 174 deletions homeassistant/components/isy994/__init__.py
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 8 additions & 13 deletions homeassistant/components/isy994/binary_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
"""Support for ISY994 binary sensors."""
from datetime import timedelta
import logging
from typing import Callable

from homeassistant.components.binary_sensor import DOMAIN, BinarySensorEntity
from homeassistant.components.binary_sensor import (
DOMAIN as BINARY_SENSOR,
BinarySensorEntity,
)
from homeassistant.const import STATE_OFF, STATE_ON
from homeassistant.core import callback
from homeassistant.helpers.event import async_track_point_in_utc_time
from homeassistant.helpers.typing import ConfigType
from homeassistant.util import dt as dt_util

from . import ISY994_NODES, ISY994_PROGRAMS, ISYDevice

_LOGGER = logging.getLogger(__name__)

ISY_DEVICE_TYPES = {
"moisture": ["16.8", "16.13", "16.14"],
"opening": ["16.9", "16.6", "16.7", "16.2", "16.17", "16.20", "16.21"],
"motion": ["16.1", "16.4", "16.5", "16.3"],
}
from .const import _LOGGER, ISY_BIN_SENS_DEVICE_TYPES


def setup_platform(
Expand All @@ -29,7 +24,7 @@ def setup_platform(
devices_by_nid = {}
child_nodes = []

for node in hass.data[ISY994_NODES][DOMAIN]:
for node in hass.data[ISY994_NODES][BINARY_SENSOR]:
if node.parent_node is None:
device = ISYBinarySensorEntity(node)
devices.append(device)
Expand Down Expand Up @@ -69,7 +64,7 @@ def setup_platform(
device = ISYBinarySensorEntity(node)
devices.append(device)

for name, status, _ in hass.data[ISY994_PROGRAMS][DOMAIN]:
for name, status, _ in hass.data[ISY994_PROGRAMS][BINARY_SENSOR]:
devices.append(ISYBinarySensorProgram(name, status))

add_entities(devices)
Expand All @@ -83,7 +78,7 @@ def _detect_device_type(node) -> str:
return None

split_type = device_type.split(".")
for device_class, ids in ISY_DEVICE_TYPES.items():
for device_class, ids in ISY_BIN_SENS_DEVICE_TYPES.items():
if f"{split_type[0]}.{split_type[1]}" in ids:
return device_class

Expand Down
Loading