Skip to content

Fix harmony #8302

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
Jul 2, 2017
Merged

Fix harmony #8302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e84fd
Fix harmony
balloob Jul 2, 2017
06a28f1
Fix 1 reference
balloob Jul 2, 2017
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
18 changes: 9 additions & 9 deletions homeassistant/components/remote/harmony.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

DEFAULT_PORT = 5222
DEVICES = []
CONF_DEVICE_CACHE = 'device_cache'
CONF_DEVICE_CACHE = 'harmony_device_cache'

SERVICE_SYNC = 'harmony_sync'

Expand Down Expand Up @@ -69,7 +69,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
port)

# Ignore hub name when checking if this hub is known - ip and port only
if host and host[1:] in set([h[1:] for h in DEVICES]):
if host and host[1:] in (h.host for h in DEVICES):
_LOGGER.debug("Discovered host already known: %s", host)
return
elif CONF_HOST in config:
Expand Down Expand Up @@ -147,7 +147,7 @@ def __init__(self, name, host, port, activity, out_path, token):

_LOGGER.debug("HarmonyRemote device init started for: %s", name)
self._name = name
self._ip = host
self.host = host
self._port = port
self._state = None
self._current_activity = None
Expand Down Expand Up @@ -182,7 +182,7 @@ def update(self):
name = self._name
_LOGGER.debug("Polling %s for current activity", name)
state = pyharmony.ha_get_current_activity(
self._token, self._config, self._ip, self._port)
self._token, self._config, self.host, self._port)
_LOGGER.debug("%s current activity reported as: %s", name, state)
self._current_activity = state
self._state = bool(state != 'PowerOff')
Expand All @@ -197,30 +197,30 @@ def turn_on(self, **kwargs):

if activity:
pyharmony.ha_start_activity(
self._token, self._ip, self._port, self._config, activity)
self._token, self.host, self._port, self._config, activity)
self._state = True
else:
_LOGGER.error("No activity specified with turn_on service")

def turn_off(self):
"""Start the PowerOff activity."""
import pyharmony
pyharmony.ha_power_off(self._token, self._ip, self._port)
pyharmony.ha_power_off(self._token, self.host, self._port)

def send_command(self, **kwargs):
"""Send a set of commands to one device."""
import pyharmony
pyharmony.ha_send_commands(
self._token, self._ip, self._port, kwargs[ATTR_DEVICE],
self._token, self.host, self._port, kwargs[ATTR_DEVICE],
kwargs[ATTR_COMMAND], int(kwargs[ATTR_NUM_REPEATS]),
float(kwargs[ATTR_DELAY_SECS]))

def sync(self):
"""Sync the Harmony device with the web service."""
import pyharmony
_LOGGER.debug("Syncing hub with Harmony servers")
pyharmony.ha_sync(self._token, self._ip, self._port)
pyharmony.ha_sync(self._token, self.host, self._port)
self._config = pyharmony.ha_get_config(
self._token, self._ip, self._port)
self._token, self.host, self._port)
_LOGGER.debug("Writing hub config to file: %s", self._config_path)
pyharmony.ha_write_config_file(self._config, self._config_path)