From 892573e53ed2db6d619730fd5f25c74bd817fd4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Jun 2015 12:34:55 +0200 Subject: [PATCH 01/42] remove unused stuff and update the names (same as in owm sensor) --- homeassistant/components/sensor/forecast.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/sensor/forecast.py b/homeassistant/components/sensor/forecast.py index 98e088d5139..bcc5cd3b050 100644 --- a/homeassistant/components/sensor/forecast.py +++ b/homeassistant/components/sensor/forecast.py @@ -1,7 +1,6 @@ """ homeassistant.components.sensor.forecast ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Forecast.io service. Configuration: @@ -113,10 +112,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None): # pylint: disable=too-few-public-methods class ForeCastSensor(Entity): - """ Implements an OpenWeatherMap sensor. """ + """ Implements an Forecast.io sensor. """ def __init__(self, weather_data, sensor_type, unit): - self.client_name = 'Forecast' + self.client_name = 'Weather' self._name = SENSOR_TYPES[sensor_type][0] self.forecast_client = weather_data self._unit = unit @@ -127,7 +126,7 @@ class ForeCastSensor(Entity): @property def name(self): - return '{} - {}'.format(self.client_name, self._name) + return '{} {}'.format(self.client_name, self._name) @property def state(self): @@ -149,10 +148,6 @@ class ForeCastSensor(Entity): try: if self.type == 'summary': self._state = data.summary - # elif self.type == 'sunrise_time': - # self._state = data.sunriseTime - # elif self.type == 'sunset_time': - # self._state = data.sunsetTime elif self.type == 'precip_intensity': if data.precipIntensity == 0: self._state = 'None' From db5060b32374c24cbe6e41b7405a16166fde0ecf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Jun 2015 12:34:55 +0200 Subject: [PATCH 02/42] remove unused stuff and update the names (same as in owm sensor) --- homeassistant/components/sensor/forecast.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/sensor/forecast.py b/homeassistant/components/sensor/forecast.py index 98e088d5139..bcc5cd3b050 100644 --- a/homeassistant/components/sensor/forecast.py +++ b/homeassistant/components/sensor/forecast.py @@ -1,7 +1,6 @@ """ homeassistant.components.sensor.forecast ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Forecast.io service. Configuration: @@ -113,10 +112,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None): # pylint: disable=too-few-public-methods class ForeCastSensor(Entity): - """ Implements an OpenWeatherMap sensor. """ + """ Implements an Forecast.io sensor. """ def __init__(self, weather_data, sensor_type, unit): - self.client_name = 'Forecast' + self.client_name = 'Weather' self._name = SENSOR_TYPES[sensor_type][0] self.forecast_client = weather_data self._unit = unit @@ -127,7 +126,7 @@ class ForeCastSensor(Entity): @property def name(self): - return '{} - {}'.format(self.client_name, self._name) + return '{} {}'.format(self.client_name, self._name) @property def state(self): @@ -149,10 +148,6 @@ class ForeCastSensor(Entity): try: if self.type == 'summary': self._state = data.summary - # elif self.type == 'sunrise_time': - # self._state = data.sunriseTime - # elif self.type == 'sunset_time': - # self._state = data.sunsetTime elif self.type == 'precip_intensity': if data.precipIntensity == 0: self._state = 'None' From a34742040c5622216c01797307cd8db2a710b0fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Jun 2015 12:34:55 +0200 Subject: [PATCH 03/42] remove unused stuff and update the names (same as in owm sensor) --- homeassistant/components/sensor/forecast.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/sensor/forecast.py b/homeassistant/components/sensor/forecast.py index 98e088d5139..bcc5cd3b050 100644 --- a/homeassistant/components/sensor/forecast.py +++ b/homeassistant/components/sensor/forecast.py @@ -1,7 +1,6 @@ """ homeassistant.components.sensor.forecast ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Forecast.io service. Configuration: @@ -113,10 +112,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None): # pylint: disable=too-few-public-methods class ForeCastSensor(Entity): - """ Implements an OpenWeatherMap sensor. """ + """ Implements an Forecast.io sensor. """ def __init__(self, weather_data, sensor_type, unit): - self.client_name = 'Forecast' + self.client_name = 'Weather' self._name = SENSOR_TYPES[sensor_type][0] self.forecast_client = weather_data self._unit = unit @@ -127,7 +126,7 @@ class ForeCastSensor(Entity): @property def name(self): - return '{} - {}'.format(self.client_name, self._name) + return '{} {}'.format(self.client_name, self._name) @property def state(self): @@ -149,10 +148,6 @@ class ForeCastSensor(Entity): try: if self.type == 'summary': self._state = data.summary - # elif self.type == 'sunrise_time': - # self._state = data.sunriseTime - # elif self.type == 'sunset_time': - # self._state = data.sunsetTime elif self.type == 'precip_intensity': if data.precipIntensity == 0: self._state = 'None' From d1e4387997593b4071b79263bb59329e5d50bd75 Mon Sep 17 00:00:00 2001 From: Ryan Kraus Date: Tue, 7 Jul 2015 23:19:34 -0400 Subject: [PATCH 04/42] Light update to PyISY version 1.0.5 This is a lighter update to version 1.0.5 to fix Issue #201 more immediately. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bebc21b3464..0de3e2b9bed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,7 +39,7 @@ python-nest>=2.3.1 pydispatcher>=2.0.5 # ISY994 bindings (*.isy994) -PyISY>=1.0.2 +PyISY>=1.0.5 # PSutil (sensor.systemmonitor) psutil>=2.2.1 From 4d12c69d68b3d07423cefdd2f928698d2d53830a Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 15 Jul 2015 18:37:24 -0700 Subject: [PATCH 05/42] Increase robustness dependency installation --- homeassistant/__main__.py | 11 ++++++++--- homeassistant/util/environment.py | 3 ++- homeassistant/util/package.py | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py index 0a575afede0..6f937d6916e 100644 --- a/homeassistant/__main__.py +++ b/homeassistant/__main__.py @@ -7,6 +7,8 @@ import argparse import subprocess DEPENDENCIES = ['requests>=2.0', 'pyyaml>=3.11', 'pytz>=2015.2'] +IS_VIRTUAL = (getattr(sys, 'base_prefix', sys.prefix) != sys.prefix or + hasattr(sys, 'real_prefix')) def validate_python(): @@ -22,10 +24,13 @@ def validate_python(): def install_package(package): """Install a package on PyPi. Accepts pip compatible package strings. Return boolean if install successfull.""" - args = ['python3', '-m', 'pip', 'install', '--quiet', package] - if sys.base_prefix == sys.prefix: + args = [sys.executable, '-m', 'pip', 'install', '--quiet', package] + if not IS_VIRTUAL: args.append('--user') - return not subprocess.call(args) + try: + return 0 == subprocess.call(args) + except subprocess.SubprocessError: + return False def validate_dependencies(): diff --git a/homeassistant/util/environment.py b/homeassistant/util/environment.py index 4227c485290..53364899030 100644 --- a/homeassistant/util/environment.py +++ b/homeassistant/util/environment.py @@ -5,4 +5,5 @@ import sys def is_virtual(): """ Return if we run in a virtual environtment. """ # Check supports venv && virtualenv - return sys.base_prefix != sys.prefix or hasattr(sys, 'real_prefix') + return (getattr(sys, 'base_prefix', sys.prefix) != sys.prefix or + hasattr(sys, 'real_prefix')) diff --git a/homeassistant/util/package.py b/homeassistant/util/package.py index ec49893177f..d220a5a7e61 100644 --- a/homeassistant/util/package.py +++ b/homeassistant/util/package.py @@ -1,5 +1,6 @@ """Helpers to install PyPi packages.""" import subprocess +import sys from . import environment as env @@ -11,9 +12,12 @@ def install_package(package, upgrade=False, user=INSTALL_USER): """Install a package on PyPi. Accepts pip compatible package strings. Return boolean if install successfull.""" # Not using 'import pip; pip.main([])' because it breaks the logger - args = ['python3', '-m', 'pip', 'install', '--quiet', package] + args = [sys.executable, '-m', 'pip', 'install', '--quiet', package] if upgrade: args.append('--upgrade') if user: args.append('--user') - return not subprocess.call(args) + try: + return 0 == subprocess.call(args) + except subprocess.SubprocessError: + return False From 4edf53899d7fce057e8c85f2105cacfc34844098 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 19 Jul 2015 23:21:01 -0700 Subject: [PATCH 06/42] Port PyMySensors from external to requirements.txt --- .gitmodules | 3 --- homeassistant/components/sensor/mysensors.py | 28 +++++++++++--------- homeassistant/external/pymysensors | 1 - requirements.txt | 4 +-- 4 files changed, 17 insertions(+), 19 deletions(-) delete mode 160000 homeassistant/external/pymysensors diff --git a/.gitmodules b/.gitmodules index 174bba680f0..4ecccece153 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ [submodule "homeassistant/external/nzbclients"] path = homeassistant/external/nzbclients url = https://github.com/jamespcole/home-assistant-nzb-clients.git -[submodule "homeassistant/external/pymysensors"] - path = homeassistant/external/pymysensors - url = https://github.com/theolind/pymysensors [submodule "homeassistant/components/frontend/www_static/home-assistant-polymer"] path = homeassistant/components/frontend/www_static/home-assistant-polymer url = https://github.com/balloob/home-assistant-polymer.git diff --git a/homeassistant/components/sensor/mysensors.py b/homeassistant/components/sensor/mysensors.py index 4f3c2610c5a..ad9649f9966 100644 --- a/homeassistant/components/sensor/mysensors.py +++ b/homeassistant/components/sensor/mysensors.py @@ -21,9 +21,6 @@ Port of your connection to your MySensors device. """ import logging -# pylint: disable=no-name-in-module, import-error -import homeassistant.external.pymysensors.mysensors.mysensors as mysensors -import homeassistant.external.pymysensors.mysensors.const as const from homeassistant.helpers.entity import Entity from homeassistant.const import ( @@ -39,12 +36,16 @@ ATTR_NODE_ID = "node_id" ATTR_CHILD_ID = "child_id" _LOGGER = logging.getLogger(__name__) -REQUIREMENTS = ['pyserial>=2.7'] +REQUIREMENTS = ['https://github.com/theolind/pymysensors/archive/master.zip' + '#egg=pymysensors-0.1'] def setup_platform(hass, config, add_devices, discovery_info=None): """ Setup the mysensors platform. """ + import mysensors.mysensors as mysensors + import mysensors.const as const + devices = {} # keep track of devices added to HA # Just assume celcius means that the user wants metric for now. # It may make more sense to make this a global config option in the future. @@ -69,7 +70,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): name = '{} {}.{}'.format(sensor.sketch_name, nid, child.id) node[child_id][value_type] = \ MySensorsNodeValue( - nid, child_id, name, value_type, is_metric) + nid, child_id, name, value_type, is_metric, const) new_devices.append(node[child_id][value_type]) else: node[child_id][value_type].update_sensor( @@ -102,8 +103,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None): class MySensorsNodeValue(Entity): """ Represents the value of a MySensors child node. """ - # pylint: disable=too-many-arguments - def __init__(self, node_id, child_id, name, value_type, metric): + # pylint: disable=too-many-arguments, too-many-instance-attributes + def __init__(self, node_id, child_id, name, value_type, metric, const): self._name = name self.node_id = node_id self.child_id = child_id @@ -111,6 +112,7 @@ class MySensorsNodeValue(Entity): self.value_type = value_type self.metric = metric self._value = '' + self.const = const @property def should_poll(self): @@ -130,11 +132,11 @@ class MySensorsNodeValue(Entity): @property def unit_of_measurement(self): """ Unit of measurement of this entity. """ - if self.value_type == const.SetReq.V_TEMP: + if self.value_type == self.const.SetReq.V_TEMP: return TEMP_CELCIUS if self.metric else TEMP_FAHRENHEIT - elif self.value_type == const.SetReq.V_HUM or \ - self.value_type == const.SetReq.V_DIMMER or \ - self.value_type == const.SetReq.V_LIGHT_LEVEL: + elif self.value_type == self.const.SetReq.V_HUM or \ + self.value_type == self.const.SetReq.V_DIMMER or \ + self.value_type == self.const.SetReq.V_LIGHT_LEVEL: return '%' return None @@ -150,8 +152,8 @@ class MySensorsNodeValue(Entity): def update_sensor(self, value, battery_level): """ Update a sensor with the latest value from the controller. """ _LOGGER.info("%s value = %s", self._name, value) - if self.value_type == const.SetReq.V_TRIPPED or \ - self.value_type == const.SetReq.V_ARMED: + if self.value_type == self.const.SetReq.V_TRIPPED or \ + self.value_type == self.const.SetReq.V_ARMED: self._value = STATE_ON if int(value) == 1 else STATE_OFF else: self._value = value diff --git a/homeassistant/external/pymysensors b/homeassistant/external/pymysensors deleted file mode 160000 index cd5ef892eee..00000000000 --- a/homeassistant/external/pymysensors +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd5ef892eeec0ad027727f7e8f757e7f2927da97 diff --git a/requirements.txt b/requirements.txt index c7a569fad33..f9d11975e97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -77,5 +77,5 @@ python-forecastio>=1.3.3 # Firmata Bindings (*.arduino) PyMata==2.07a -# Mysensors serial gateway -pyserial>=2.7 +# Mysensors +https://github.com/theolind/pymysensors/archive/master.zip#egg=pymysensors-0.1 From 43cc3624eeab5a53c48decb127cbe829e75e6722 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 19 Jul 2015 23:44:32 -0700 Subject: [PATCH 07/42] Port PyNetgear from external to requirements.txt --- .gitmodules | 3 --- .../components/device_tracker/netgear.py | 17 +++-------------- homeassistant/external/pynetgear | 1 - requirements.txt | 3 +++ 4 files changed, 6 insertions(+), 18 deletions(-) delete mode 160000 homeassistant/external/pynetgear diff --git a/.gitmodules b/.gitmodules index 4ecccece153..b4ab8e17c0a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "homeassistant/external/pynetgear"] - path = homeassistant/external/pynetgear - url = https://github.com/balloob/pynetgear.git [submodule "homeassistant/external/pywemo"] path = homeassistant/external/pywemo url = https://github.com/balloob/pywemo.git diff --git a/homeassistant/components/device_tracker/netgear.py b/homeassistant/components/device_tracker/netgear.py index 102bc78ff47..3fe11f99fe6 100644 --- a/homeassistant/components/device_tracker/netgear.py +++ b/homeassistant/components/device_tracker/netgear.py @@ -43,6 +43,7 @@ from homeassistant.components.device_tracker import DOMAIN MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5) _LOGGER = logging.getLogger(__name__) +REQUIREMENTS = ['pynetgear>=0.1'] def get_scanner(hass, config): @@ -64,22 +65,10 @@ class NetgearDeviceScanner(object): """ This class queries a Netgear wireless router using the SOAP-API. """ def __init__(self, host, username, password): + import pynetgear + self.last_results = [] - try: - # Pylint does not play nice if not every folders has an __init__.py - # pylint: disable=no-name-in-module, import-error - import homeassistant.external.pynetgear.pynetgear as pynetgear - except ImportError: - _LOGGER.exception( - ("Failed to import pynetgear. " - "Did you maybe not run `git submodule init` " - "and `git submodule update`?")) - - self.success_init = False - - return - self._api = pynetgear.Netgear(host, username, password) self.lock = threading.Lock() diff --git a/homeassistant/external/pynetgear b/homeassistant/external/pynetgear deleted file mode 160000 index e946ecf7926..00000000000 --- a/homeassistant/external/pynetgear +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e946ecf7926b9b2adaa1e3127a9738201a1b1fc7 diff --git a/requirements.txt b/requirements.txt index f9d11975e97..f70d755d5d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -79,3 +79,6 @@ PyMata==2.07a # Mysensors https://github.com/theolind/pymysensors/archive/master.zip#egg=pymysensors-0.1 + +# Netgear (device_tracker.netgear) +pynetgear>=0.1 From 3efb1e4ac9a647922e6eacea9eac32823480aadc Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 20 Jul 2015 00:07:01 -0700 Subject: [PATCH 08/42] Port netdisco from external to requirements.txt --- .gitmodules | 3 --- homeassistant/components/discovery.py | 26 ++++++++----------- homeassistant/components/light/__init__.py | 2 +- .../components/media_player/__init__.py | 2 +- homeassistant/components/switch/__init__.py | 2 +- homeassistant/external/netdisco | 1 - requirements.txt | 6 ++--- 7 files changed, 17 insertions(+), 25 deletions(-) delete mode 160000 homeassistant/external/netdisco diff --git a/.gitmodules b/.gitmodules index b4ab8e17c0a..f33d9430f54 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "homeassistant/external/pywemo"] path = homeassistant/external/pywemo url = https://github.com/balloob/pywemo.git -[submodule "homeassistant/external/netdisco"] - path = homeassistant/external/netdisco - url = https://github.com/balloob/netdisco.git [submodule "homeassistant/external/noop"] path = homeassistant/external/noop url = https://github.com/balloob/noop.git diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py index 63c9a0af74f..0aa7312bfd7 100644 --- a/homeassistant/components/discovery.py +++ b/homeassistant/components/discovery.py @@ -12,9 +12,6 @@ loaded before the EVENT_PLATFORM_DISCOVERED is fired. import logging import threading -# pylint: disable=no-name-in-module, import-error -import homeassistant.external.netdisco.netdisco.const as services - from homeassistant import bootstrap from homeassistant.const import ( EVENT_HOMEASSISTANT_START, EVENT_PLATFORM_DISCOVERED, @@ -22,14 +19,20 @@ from homeassistant.const import ( DOMAIN = "discovery" DEPENDENCIES = [] -REQUIREMENTS = ['zeroconf>=0.16.0'] +REQUIREMENTS = ['netdisco>=0.1'] SCAN_INTERVAL = 300 # seconds +# Next 3 lines for now a mirror from netdisco.const +# Should setup a mapping netdisco.const -> own constants +SERVICE_WEMO = 'belkin_wemo' +SERVICE_HUE = 'philips_hue' +SERVICE_CAST = 'google_cast' + SERVICE_HANDLERS = { - services.BELKIN_WEMO: "switch", - services.GOOGLE_CAST: "media_player", - services.PHILIPS_HUE: "light", + SERVICE_WEMO: "switch", + SERVICE_CAST: "media_player", + SERVICE_HUE: "light", } @@ -56,14 +59,7 @@ def setup(hass, config): """ Starts a discovery service. """ logger = logging.getLogger(__name__) - try: - from homeassistant.external.netdisco.netdisco.service import \ - DiscoveryService - except ImportError: - logger.exception( - "Unable to import netdisco. " - "Did you install all the zeroconf dependency?") - return False + from netdisco.service import DiscoveryService # Disable zeroconf logging, it spams logging.getLogger('zeroconf').setLevel(logging.CRITICAL) diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py index 58c3c3cd8f2..35e80cc143d 100644 --- a/homeassistant/components/light/__init__.py +++ b/homeassistant/components/light/__init__.py @@ -99,7 +99,7 @@ LIGHT_PROFILES_FILE = "light_profiles.csv" DISCOVERY_PLATFORMS = { wink.DISCOVER_LIGHTS: 'wink', isy994.DISCOVER_LIGHTS: 'isy994', - discovery.services.PHILIPS_HUE: 'hue', + discovery.SERVICE_HUE: 'hue', } PROP_TO_ATTR = { diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py index 0cb4608ba1b..8cd3353bea8 100644 --- a/homeassistant/components/media_player/__init__.py +++ b/homeassistant/components/media_player/__init__.py @@ -24,7 +24,7 @@ SCAN_INTERVAL = 30 ENTITY_ID_FORMAT = DOMAIN + '.{}' DISCOVERY_PLATFORMS = { - discovery.services.GOOGLE_CAST: 'cast', + discovery.SERVICE_CAST: 'cast', } SERVICE_YOUTUBE_VIDEO = 'play_youtube_video' diff --git a/homeassistant/components/switch/__init__.py b/homeassistant/components/switch/__init__.py index 95457b66f5f..b141c36f7b5 100644 --- a/homeassistant/components/switch/__init__.py +++ b/homeassistant/components/switch/__init__.py @@ -29,7 +29,7 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10) # Maps discovered services to their platforms DISCOVERY_PLATFORMS = { - discovery.services.BELKIN_WEMO: 'wemo', + discovery.SERVICE_WEMO: 'wemo', wink.DISCOVER_SWITCHES: 'wink', isy994.DISCOVER_SWITCHES: 'isy994', } diff --git a/homeassistant/external/netdisco b/homeassistant/external/netdisco deleted file mode 160000 index b2cad7c2b95..00000000000 --- a/homeassistant/external/netdisco +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b2cad7c2b959efa8eee9b5ac62d87232bf0b5176 diff --git a/requirements.txt b/requirements.txt index f70d755d5d3..e601614bb96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,9 +5,6 @@ pytz>=2015.2 # Optional, needed for specific components -# Discovery platform (discovery) -zeroconf>=0.16.0 - # Sun (sun) astral>=0.8.1 @@ -82,3 +79,6 @@ https://github.com/theolind/pymysensors/archive/master.zip#egg=pymysensors-0.1 # Netgear (device_tracker.netgear) pynetgear>=0.1 + +# Netdisco (discovery) +netdisco>=0.1 From 2f622053a67cb868b1ea5217c86c469bd73b3d74 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 20 Jul 2015 00:08:00 -0700 Subject: [PATCH 09/42] Port PyWemo from external to requirements.txt --- .gitmodules | 3 --- homeassistant/components/switch/wemo.py | 13 ++----------- homeassistant/external/pywemo | 1 - requirements.txt | 3 +++ 4 files changed, 5 insertions(+), 15 deletions(-) delete mode 160000 homeassistant/external/pywemo diff --git a/.gitmodules b/.gitmodules index f33d9430f54..a627e522d8f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "homeassistant/external/pywemo"] - path = homeassistant/external/pywemo - url = https://github.com/balloob/pywemo.git [submodule "homeassistant/external/noop"] path = homeassistant/external/noop url = https://github.com/balloob/noop.git diff --git a/homeassistant/components/switch/wemo.py b/homeassistant/components/switch/wemo.py index eb55e0662b7..33f5f03799b 100644 --- a/homeassistant/components/switch/wemo.py +++ b/homeassistant/components/switch/wemo.py @@ -12,17 +12,8 @@ from homeassistant.components.switch import SwitchDevice # pylint: disable=unused-argument def setup_platform(hass, config, add_devices_callback, discovery_info=None): """ Find and return WeMo switches. """ - try: - # pylint: disable=no-name-in-module, import-error - import homeassistant.external.pywemo.pywemo as pywemo - import homeassistant.external.pywemo.pywemo.discovery as discovery - except ImportError: - logging.getLogger(__name__).exception(( - "Failed to import pywemo. " - "Did you maybe not run `git submodule init` " - "and `git submodule update`?")) - - return + import pywemo + import pywemo.discovery as discovery if discovery_info is not None: device = discovery.device_from_description(discovery_info) diff --git a/homeassistant/external/pywemo b/homeassistant/external/pywemo deleted file mode 160000 index ca94e41faa4..00000000000 --- a/homeassistant/external/pywemo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca94e41faa48c783f600a2efd550c6b7dae01b0d diff --git a/requirements.txt b/requirements.txt index e601614bb96..e910ffba95f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -82,3 +82,6 @@ pynetgear>=0.1 # Netdisco (discovery) netdisco>=0.1 + +# Wemo (switch.wemo) +pywemo>=0.1 From 40b2acb472e2ef623e66c16c7e8c0b38050f23a1 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 20 Jul 2015 00:41:57 -0700 Subject: [PATCH 10/42] Port wink from external to requirements.txt --- homeassistant/components/light/wink.py | 7 +- homeassistant/components/sensor/wink.py | 5 +- homeassistant/components/switch/wink.py | 5 +- homeassistant/components/wink.py | 6 +- homeassistant/external/wink/pywink.py | 408 ------------------------ requirements.txt | 3 + 6 files changed, 13 insertions(+), 421 deletions(-) delete mode 100644 homeassistant/external/wink/pywink.py diff --git a/homeassistant/components/light/wink.py b/homeassistant/components/light/wink.py index dc7b7041611..c4a47ca7da1 100644 --- a/homeassistant/components/light/wink.py +++ b/homeassistant/components/light/wink.py @@ -1,9 +1,6 @@ -""" Support for Hue lights. """ +""" Support for Wink lights. """ import logging -# pylint: disable=no-name-in-module, import-error -import homeassistant.external.wink.pywink as pywink - from homeassistant.components.light import ATTR_BRIGHTNESS from homeassistant.components.wink import WinkToggleDevice from homeassistant.const import CONF_ACCESS_TOKEN @@ -11,6 +8,8 @@ from homeassistant.const import CONF_ACCESS_TOKEN def setup_platform(hass, config, add_devices_callback, discovery_info=None): """ Find and return Wink lights. """ + import pywink + token = config.get(CONF_ACCESS_TOKEN) if not pywink.is_token_set() and token is None: diff --git a/homeassistant/components/sensor/wink.py b/homeassistant/components/sensor/wink.py index ff61f02d041..1d52550aa37 100644 --- a/homeassistant/components/sensor/wink.py +++ b/homeassistant/components/sensor/wink.py @@ -1,15 +1,14 @@ """ Support for Wink sensors. """ import logging -# pylint: disable=no-name-in-module, import-error -import homeassistant.external.wink.pywink as pywink - from homeassistant.helpers.entity import Entity from homeassistant.const import CONF_ACCESS_TOKEN, STATE_OPEN, STATE_CLOSED def setup_platform(hass, config, add_devices, discovery_info=None): """ Sets up the Wink platform. """ + import pywink + if discovery_info is None: token = config.get(CONF_ACCESS_TOKEN) diff --git a/homeassistant/components/switch/wink.py b/homeassistant/components/switch/wink.py index add56d222b1..792de50a855 100644 --- a/homeassistant/components/switch/wink.py +++ b/homeassistant/components/switch/wink.py @@ -6,15 +6,14 @@ Support for Wink switches. """ import logging -# pylint: disable=no-name-in-module, import-error -import homeassistant.external.wink.pywink as pywink - from homeassistant.components.wink import WinkToggleDevice from homeassistant.const import CONF_ACCESS_TOKEN def setup_platform(hass, config, add_devices, discovery_info=None): """ Sets up the Wink platform. """ + import pywink + if discovery_info is None: token = config.get(CONF_ACCESS_TOKEN) diff --git a/homeassistant/components/wink.py b/homeassistant/components/wink.py index dd210bc2b7f..d56a244b84c 100644 --- a/homeassistant/components/wink.py +++ b/homeassistant/components/wink.py @@ -6,9 +6,6 @@ Connects to a Wink hub and loads relevant components to control its devices. """ import logging -# pylint: disable=no-name-in-module, import-error -import homeassistant.external.wink.pywink as pywink - from homeassistant import bootstrap from homeassistant.loader import get_component from homeassistant.helpers import validate_config @@ -19,6 +16,8 @@ from homeassistant.const import ( DOMAIN = "wink" DEPENDENCIES = [] +REQUIREMENTS = ['https://github.com/balloob/python-wink/archive/master.zip' + '#pywink>=0.1'] DISCOVER_LIGHTS = "wink.lights" DISCOVER_SWITCHES = "wink.switches" @@ -32,6 +31,7 @@ def setup(hass, config): if not validate_config(config, {DOMAIN: [CONF_ACCESS_TOKEN]}, logger): return False + import pywink pywink.set_bearer_token(config[DOMAIN][CONF_ACCESS_TOKEN]) # Load components for the devices in the Wink that we support diff --git a/homeassistant/external/wink/pywink.py b/homeassistant/external/wink/pywink.py deleted file mode 100644 index cbe50701707..00000000000 --- a/homeassistant/external/wink/pywink.py +++ /dev/null @@ -1,408 +0,0 @@ -__author__ = 'JOHNMCL' - -import json -import time - -import requests - -baseUrl = "https://winkapi.quirky.com" - -headers = {} - - -class wink_sensor_pod(object): - """ represents a wink.py sensor - json_obj holds the json stat at init (and if there is a refresh it's updated - it's the native format for this objects methods - and looks like so: -{ - "data": { - "last_event": { - "brightness_occurred_at": None, - "loudness_occurred_at": None, - "vibration_occurred_at": None - }, - "model_name": "Tripper", - "capabilities": { - "sensor_types": [ - { - "field": "opened", - "type": "boolean" - }, - { - "field": "battery", - "type": "percentage" - } - ] - }, - "manufacturer_device_model": "quirky_ge_tripper", - "location": "", - "radio_type": "zigbee", - "manufacturer_device_id": None, - "gang_id": None, - "sensor_pod_id": "37614", - "subscription": { - }, - "units": { - }, - "upc_id": "184", - "hidden_at": None, - "last_reading": { - "battery_voltage_threshold_2": 0, - "opened": False, - "battery_alarm_mask": 0, - "opened_updated_at": 1421697092.7347496, - "battery_voltage_min_threshold_updated_at": 1421697092.7347229, - "battery_voltage_min_threshold": 0, - "connection": None, - "battery_voltage": 25, - "battery_voltage_threshold_1": 25, - "connection_updated_at": None, - "battery_voltage_threshold_3": 0, - "battery_voltage_updated_at": 1421697092.7347066, - "battery_voltage_threshold_1_updated_at": 1421697092.7347302, - "battery_voltage_threshold_3_updated_at": 1421697092.7347434, - "battery_voltage_threshold_2_updated_at": 1421697092.7347374, - "battery": 1.0, - "battery_updated_at": 1421697092.7347553, - "battery_alarm_mask_updated_at": 1421697092.734716 - }, - "triggers": [ - ], - "name": "MasterBathroom", - "lat_lng": [ - 37.550773, - -122.279182 - ], - "uuid": "a2cb868a-dda3-4211-ab73-fc08087aeed7", - "locale": "en_us", - "device_manufacturer": "quirky_ge", - "created_at": 1421523277, - "local_id": "2", - "hub_id": "88264" - }, -} - - """ - def __init__(self, aJSonObj, objectprefix="sensor_pods"): - self.jsonState = aJSonObj - self.objectprefix = objectprefix - - def __str__(self): - return "%s %s %s" % (self.name(), self.deviceId(), self.state()) - - def __repr__(self): - return "" % (self.name(), self.deviceId(), self.state()) - - @property - def _last_reading(self): - return self.jsonState.get('last_reading') or {} - - def name(self): - return self.jsonState.get('name', "Unknown Name") - - def state(self): - return self._last_reading.get('opened', False) - - def deviceId(self): - return self.jsonState.get('sensor_pod_id', self.name()) - - def refresh_state_at_hub(self): - """ - Tell hub to query latest status from device and upload to Wink. - PS: Not sure if this even works.. - """ - urlString = baseUrl + "/%s/%s/refresh" % (self.objectprefix, self.deviceId()) - requests.get(urlString, headers=headers) - - def updateState(self): - """ Update state with latest info from Wink API. """ - urlString = baseUrl + "/%s/%s" % (self.objectprefix, self.deviceId()) - arequest = requests.get(urlString, headers=headers) - self._updateStateFromResponse(arequest.json()) - - def _updateStateFromResponse(self, response_json): - """ - :param response_json: the json obj returned from query - :return: - """ - self.jsonState = response_json.get('data') - -class wink_binary_switch(object): - """ represents a wink.py switch - json_obj holds the json stat at init (and if there is a refresh it's updated - it's the native format for this objects methods - and looks like so: - -{ - "data": { - "binary_switch_id": "4153", - "name": "Garage door indicator", - "locale": "en_us", - "units": {}, - "created_at": 1411614982, - "hidden_at": null, - "capabilities": {}, - "subscription": {}, - "triggers": [], - "desired_state": { - "powered": false - }, - "manufacturer_device_model": "leviton_dzs15", - "manufacturer_device_id": null, - "device_manufacturer": "leviton", - "model_name": "Switch", - "upc_id": "94", - "gang_id": null, - "hub_id": "11780", - "local_id": "9", - "radio_type": "zwave", - "last_reading": { - "powered": false, - "powered_updated_at": 1411614983.6153464, - "powering_mode": null, - "powering_mode_updated_at": null, - "consumption": null, - "consumption_updated_at": null, - "cost": null, - "cost_updated_at": null, - "budget_percentage": null, - "budget_percentage_updated_at": null, - "budget_velocity": null, - "budget_velocity_updated_at": null, - "summation_delivered": null, - "summation_delivered_updated_at": null, - "sum_delivered_multiplier": null, - "sum_delivered_multiplier_updated_at": null, - "sum_delivered_divisor": null, - "sum_delivered_divisor_updated_at": null, - "sum_delivered_formatting": null, - "sum_delivered_formatting_updated_at": null, - "sum_unit_of_measure": null, - "sum_unit_of_measure_updated_at": null, - "desired_powered": false, - "desired_powered_updated_at": 1417893563.7567682, - "desired_powering_mode": null, - "desired_powering_mode_updated_at": null - }, - "current_budget": null, - "lat_lng": [ - 38.429996, - -122.653721 - ], - "location": "", - "order": 0 - }, - "errors": [], - "pagination": {} -} - - """ - def __init__(self, aJSonObj, objectprefix="binary_switches"): - self.jsonState = aJSonObj - self.objectprefix = objectprefix - # Tuple (desired state, time) - self._last_call = (0, None) - - def __str__(self): - return "%s %s %s" % (self.name(), self.deviceId(), self.state()) - - def __repr__(self): - return "" % (self.name(), self.deviceId(), self.state()) - - @property - def _last_reading(self): - return self.jsonState.get('last_reading') or {} - - def name(self): - return self.jsonState.get('name', "Unknown Name") - - def state(self): - # Optimistic approach to setState: - # Within 15 seconds of a call to setState we assume it worked. - if self._recent_state_set(): - return self._last_call[1] - - return self._last_reading.get('powered', False) - - def deviceId(self): - return self.jsonState.get('binary_switch_id', self.name()) - - def setState(self, state): - """ - :param state: a boolean of true (on) or false ('off') - :return: nothing - """ - urlString = baseUrl + "/%s/%s" % (self.objectprefix, self.deviceId()) - values = {"desired_state": {"powered": state}} - arequest = requests.put(urlString, data=json.dumps(values), headers=headers) - self._updateStateFromResponse(arequest.json()) - - self._last_call = (time.time(), state) - - def refresh_state_at_hub(self): - """ - Tell hub to query latest status from device and upload to Wink. - PS: Not sure if this even works.. - """ - urlString = baseUrl + "/%s/%s/refresh" % (self.objectprefix, self.deviceId()) - requests.get(urlString, headers=headers) - - def updateState(self): - """ Update state with latest info from Wink API. """ - urlString = baseUrl + "/%s/%s" % (self.objectprefix, self.deviceId()) - arequest = requests.get(urlString, headers=headers) - self._updateStateFromResponse(arequest.json()) - - def wait_till_desired_reached(self): - """ Wait till desired state reached. Max 10s. """ - if self._recent_state_set(): - return - - # self.refresh_state_at_hub() - tries = 1 - - while True: - self.updateState() - last_read = self._last_reading - - if last_read.get('desired_powered') == last_read.get('powered') \ - or tries == 5: - break - - time.sleep(2) - - tries += 1 - self.updateState() - last_read = self._last_reading - - def _updateStateFromResponse(self, response_json): - """ - :param response_json: the json obj returned from query - :return: - """ - self.jsonState = response_json.get('data') - - def _recent_state_set(self): - return time.time() - self._last_call[0] < 15 - - -class wink_bulb(wink_binary_switch): - """ represents a wink.py bulb - json_obj holds the json stat at init (and if there is a refresh it's updated - it's the native format for this objects methods - and looks like so: - - "light_bulb_id": "33990", - "name": "downstaurs lamp", - "locale": "en_us", - "units":{}, - "created_at": 1410925804, - "hidden_at": null, - "capabilities":{}, - "subscription":{}, - "triggers":[], - "desired_state":{"powered": true, "brightness": 1}, - "manufacturer_device_model": "lutron_p_pkg1_w_wh_d", - "manufacturer_device_id": null, - "device_manufacturer": "lutron", - "model_name": "Caseta Wireless Dimmer & Pico", - "upc_id": "3", - "hub_id": "11780", - "local_id": "8", - "radio_type": "lutron", - "linked_service_id": null, - "last_reading":{ - "brightness": 1, - "brightness_updated_at": 1417823487.490747, - "connection": true, - "connection_updated_at": 1417823487.4907365, - "powered": true, - "powered_updated_at": 1417823487.4907532, - "desired_powered": true, - "desired_powered_updated_at": 1417823485.054675, - "desired_brightness": 1, - "desired_brightness_updated_at": 1417409293.2591703 - }, - "lat_lng":[38.429962, -122.653715], - "location": "", - "order": 0 - - """ - jsonState = {} - - def __init__(self, ajsonobj): - super().__init__(ajsonobj, "light_bulbs") - - def deviceId(self): - return self.jsonState.get('light_bulb_id', self.name()) - - def brightness(self): - return self._last_reading.get('brightness') - - def setState(self, state, brightness=None): - """ - :param state: a boolean of true (on) or false ('off') - :return: nothing - """ - urlString = baseUrl + "/light_bulbs/%s" % self.deviceId() - values = { - "desired_state": { - "powered": state - } - } - - if brightness is not None: - values["desired_state"]["brightness"] = brightness - - urlString = baseUrl + "/light_bulbs/%s" % self.deviceId() - arequest = requests.put(urlString, data=json.dumps(values), headers=headers) - self._updateStateFromResponse(arequest.json()) - - self._last_call = (time.time(), state) - - def __repr__(self): - return "" % ( - self.name(), self.deviceId(), self.state()) - - -def get_devices(filter, constructor): - arequestUrl = baseUrl + "/users/me/wink_devices" - j = requests.get(arequestUrl, headers=headers).json() - - items = j.get('data') - - devices = [] - for item in items: - id = item.get(filter) - if (id is not None and item.get("hidden_at") is None): - devices.append(constructor(item)) - - return devices - -def get_bulbs(): - return get_devices('light_bulb_id', wink_bulb) - -def get_switches(): - return get_devices('binary_switch_id', wink_binary_switch) - -def get_sensors(): - return get_devices('sensor_pod_id', wink_sensor_pod) - -def is_token_set(): - """ Returns if an auth token has been set. """ - return bool(headers) - - -def set_bearer_token(token): - global headers - - headers = { - "Content-Type": "application/json", - "Authorization": "Bearer {}".format(token) - } - -if __name__ == "__main__": - sw = get_bulbs() - lamp = sw[3] - lamp.setState(False) diff --git a/requirements.txt b/requirements.txt index e910ffba95f..e9365a63811 100644 --- a/requirements.txt +++ b/requirements.txt @@ -85,3 +85,6 @@ netdisco>=0.1 # Wemo (switch.wemo) pywemo>=0.1 + +# Wink (*.wink) +https://github.com/balloob/python-wink/archive/master.zip#pywink>=0.1 From 6631ebfdfa5a735f14058be8e76f57af807a555a Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Mon, 20 Jul 2015 20:16:54 -0700 Subject: [PATCH 11/42] - Added git submodule @ https://github.com/rkabadi/pyedimax - Added edimax.py module to interface with Edimax SP-1101W and SP-2101W --- .gitmodules | 3 ++ homeassistant/components/switch/edimax.py | 52 +++++++++++++++++++++++ homeassistant/external/pyedimax | 1 + 3 files changed, 56 insertions(+) create mode 100644 homeassistant/components/switch/edimax.py create mode 160000 homeassistant/external/pyedimax diff --git a/.gitmodules b/.gitmodules index ca0b1f024b8..5d994cf6ceb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "homeassistant/external/pymysensors"] path = homeassistant/external/pymysensors url = https://github.com/theolind/pymysensors +[submodule "homeassistant/external/pyedimax"] + path = homeassistant/external/pyedimax + url = https://github.com/rkabadi/pyedimax diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py new file mode 100644 index 00000000000..615b52ea80c --- /dev/null +++ b/homeassistant/components/switch/edimax.py @@ -0,0 +1,52 @@ +""" +homeassistant.components.switch.edimax +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Support for Edimax switches. +""" +import logging + +from homeassistant.components.switch import SwitchDevice + + +# pylint: disable=unused-argument +def setup_platform(hass, config, add_devices_callback, discovery_info=None): + """ Find and return Edimax Smart Plugs. """ + try: + # pylint: disable=no-name-in-module, import-error + from homeassistant.external.pyedimax.smartplug import SmartPlug + except ImportError: + logging.getLogger(__name__).exception(( + "Failed to import pyedimax. " + "Did you maybe not run `git submodule init` " + "and `git submodule update`?")) + + return + + + add_devices_callback([ + SmartPlugSwitch(SmartPlug( + host = config.get('host'), + auth=( + config.get('user', 'admin'), + config.get('password', '1234')))) + ]) + + +class SmartPlugSwitch(SwitchDevice): + """ Represents a Edimax Smart Plug switch within Home Assistant. """ + def __init__(self, smartplug): + self.smartplug = smartplug + + @property + def is_on(self): + """ True if switch is on. """ + return self.smartplug.get_state() + + def turn_on(self, **kwargs): + """ Turns the switch on. """ + self.smartplug.state = 'ON' + + def turn_off(self): + """ Turns the switch off. """ + self.smartplug.state = 'OFF' \ No newline at end of file diff --git a/homeassistant/external/pyedimax b/homeassistant/external/pyedimax new file mode 160000 index 00000000000..3815f3bd99f --- /dev/null +++ b/homeassistant/external/pyedimax @@ -0,0 +1 @@ +Subproject commit 3815f3bd99fb9dcd4d9e5e6fc58626f5873e43db From fac194f66cf35c256c234c9e26a8bdeee69919c0 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Mon, 20 Jul 2015 23:27:25 -0700 Subject: [PATCH 12/42] - Added for smartplug - Added error check for host param in config.yaml - Fixed SmartPlugSwitch is_on method - Edimax smartplug works now! --- homeassistant/components/switch/edimax.py | 26 +++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py index 615b52ea80c..3754b452a2d 100644 --- a/homeassistant/components/switch/edimax.py +++ b/homeassistant/components/switch/edimax.py @@ -7,7 +7,7 @@ Support for Edimax switches. import logging from homeassistant.components.switch import SwitchDevice - +from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD # pylint: disable=unused-argument def setup_platform(hass, config, add_devices_callback, discovery_info=None): @@ -23,14 +23,16 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): return + host = config.get(CONF_HOST) + auth=(config.get(CONF_USERNAME, 'admin'), + config.get(CONF_PASSWORD, '1234')) - add_devices_callback([ - SmartPlugSwitch(SmartPlug( - host = config.get('host'), - auth=( - config.get('user', 'admin'), - config.get('password', '1234')))) - ]) + if not host: + logging.getLogger(__name__).error('Missing config variable %s', CONF_HOST) + return False + + + add_devices_callback([SmartPlugSwitch(SmartPlug(host, auth))]) class SmartPlugSwitch(SwitchDevice): @@ -38,10 +40,16 @@ class SmartPlugSwitch(SwitchDevice): def __init__(self, smartplug): self.smartplug = smartplug + @property + def name(self): + """ Returns the name of the Smart Plug, if any. """ + #TODO: dynamically get name from device using requests + return 'Edimax Smart Plug' + @property def is_on(self): """ True if switch is on. """ - return self.smartplug.get_state() + return self.smartplug.state == 'ON' def turn_on(self, **kwargs): """ Turns the switch on. """ From cbb390a918f62f2bdef6a8cceda327f0024bb45e Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Thu, 23 Jul 2015 18:13:46 +0200 Subject: [PATCH 13/42] Custom min/max temperature for thermostat --- .../components/thermostat/__init__.py | 20 ++++++++++++++++++- .../components/thermostat/heat_control.py | 20 ++++++++++--------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/homeassistant/components/thermostat/__init__.py b/homeassistant/components/thermostat/__init__.py index 08940b977c9..dffa7dfcc26 100644 --- a/homeassistant/components/thermostat/__init__.py +++ b/homeassistant/components/thermostat/__init__.py @@ -11,7 +11,7 @@ from homeassistant.helpers.entity_component import EntityComponent import homeassistant.util as util from homeassistant.helpers.entity import Entity from homeassistant.const import ( - ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_ON, STATE_OFF) + ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_ON, STATE_OFF, TEMP_CELCIUS) DOMAIN = "thermostat" DEPENDENCIES = [] @@ -24,6 +24,8 @@ SERVICE_SET_TEMPERATURE = "set_temperature" ATTR_CURRENT_TEMPERATURE = "current_temperature" ATTR_AWAY_MODE = "away_mode" +ATTR_MAX_TEMP = "max_temp" +ATTR_MIN_TEMP = "min_temp" _LOGGER = logging.getLogger(__name__) @@ -131,6 +133,22 @@ class ThermostatDevice(Entity): if device_attr is not None: data.update(device_attr) + if hasattr(self, ATTR_MIN_TEMP): + min_temp = self.hass.config.temperature( + getattr(self, ATTR_MIN_TEMP), self.unit_of_measurement)[0] + else: + min_temp = self.hass.config.temperature( + 7, TEMP_CELCIUS)[0] + data[ATTR_MIN_TEMP] = min_temp + + if hasattr(self, ATTR_MAX_TEMP): + max_temp = self.hass.config.temperature( + getattr(self, ATTR_MAX_TEMP), self.unit_of_measurement)[0] + else: + max_temp = self.hass.config.temperature( + 35, TEMP_CELCIUS)[0] + data[ATTR_MAX_TEMP] = max_temp + return data @property diff --git a/homeassistant/components/thermostat/heat_control.py b/homeassistant/components/thermostat/heat_control.py index d21245dae3a..273f1173da8 100644 --- a/homeassistant/components/thermostat/heat_control.py +++ b/homeassistant/components/thermostat/heat_control.py @@ -90,16 +90,18 @@ class HeatControl(ThermostatDevice): self.target_sensor_entity_id = config.get("target_sensor") self.time_temp = [] - for time_temp in list(config.get("time_temp").split(",")): - time, temp = time_temp.split(':') - time_start, time_end = time.split('-') - start_time = datetime.datetime.time(datetime.datetime. - strptime(time_start, '%H%M')) - end_time = datetime.datetime.time(datetime.datetime. - strptime(time_end, '%H%M')) - self.time_temp.append((start_time, end_time, float(temp))) + if config.get("time_temp"): + for time_temp in list(config.get("time_temp").split(",")): + time, temp = time_temp.split(':') + time_start, time_end = time.split('-') + start_time = datetime.datetime.time( + datetime.datetime.strptime(time_start, '%H%M')) + end_time = datetime.datetime.time( + datetime.datetime.strptime(time_end, '%H%M')) + self.time_temp.append((start_time, end_time, float(temp))) self.min_temp = float(config.get("min_temp")) + self.max_temp = float(config.get("max_temp")) self._manual_sat_temp = None self._away = False @@ -178,7 +180,7 @@ class HeatControl(ThermostatDevice): if not self._heater_manual_changed: pass else: - self.set_temperature(100) + self.set_temperature(self.max_temp) self._heater_manual_changed = True From 44ce756cbae80b5f672a3ded64aae7e9eb4c91c8 Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Thu, 23 Jul 2015 19:36:05 +0200 Subject: [PATCH 14/42] Support for rfxtrx sensors --- homeassistant/components/sensor/rfxtrx.py | 119 ++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 homeassistant/components/sensor/rfxtrx.py diff --git a/homeassistant/components/sensor/rfxtrx.py b/homeassistant/components/sensor/rfxtrx.py new file mode 100644 index 00000000000..879e3326eb8 --- /dev/null +++ b/homeassistant/components/sensor/rfxtrx.py @@ -0,0 +1,119 @@ +""" +homeassistant.components.sensor.rfxtrx +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Shows sensor values from rfxtrx sensors. + +Possible config keys: + +path to rfxtrx device +device=/dev/serial/by-id/usb-rfxtrx_RFXtrx433_A1Y0NJGR-if00-port0 + +id of the sensor: Name the sensor with ID +135=Outside + +only_named: Only show the named sensors +only_named=1 + +datatype_mask: mask to determine which sensor values to show based on + +datatype_mask=1 # only show temperature +datatype_mask=127 # show all sensor values +""" +import logging +from collections import OrderedDict + +from homeassistant.const import ( + ATTR_BATTERY_LEVEL, TEMP_CELCIUS) +from homeassistant.helpers.entity import Entity + +REQUIREMENTS = ['https://github.com/Danielhiversen/pyRFXtrx/archive/master.zip' + '#RFXtrx>=0.15'] + +DATA_TYPES = OrderedDict([ + ('Temperature', TEMP_CELCIUS), + ('Humidity', '%'), + ('Forecast', ''), + ('Barometer', ''), + ('Wind direction', ''), + ('Humidity status', ''), + ('Humidity status numeric', ''), + ('Forecast numeric', ''), + ('Rain rate', ''), + ('Rain total', ''), + ('Wind average speed', ''), + ('Wind gust', ''), + ('Chill', ''), + ('Battery numeric', ATTR_BATTERY_LEVEL), + ('Rssi numeric', '')]) + + +def setup_platform(hass, config, add_devices, discovery_info=None): + """ Setup the rfxtrx platform. """ + logger = logging.getLogger(__name__) + + devices = {} # keep track of devices added to HA + + def sensor_update(event): + """ Callback for sensor updates from the MySensors gateway. """ + if event.device.id_string in devices: + devices[event.device.id_string].event = event + else: + logger.info("adding new devices: %s", event.device.type_string) + new_device = RfxtrxSensor(event) + devices[event.device.id_string] = new_device + add_devices([new_device]) + try: + import RFXtrx as rfxtrx + except ImportError: + logger.exception( + "Failed to import rfxtrx") + return False + + device = config.get("device", True) + rfxtrx.Core(device, sensor_update) + + +class RfxtrxSensor(Entity): + """ Represents a Vera Sensor. """ + + def __init__(self, event): + self.event = event + + self._unit_of_measurement = None + self._data_type = None + for data_type in DATA_TYPES: + if data_type in self.event.values: + self._unit_of_measurement = DATA_TYPES[data_type] + self._data_type = data_type + break + + id_string = int(event.device.id_string.replace(":", ""), 16) + self._name = "{} {} ({})".format(self._data_type, + self.event.device.type_string, + id_string) + + def __str__(self): + return self._name + + @property + def state(self): + if self._data_type: + return self.event.values[self._data_type] + return None + + @property + def name(self): + """ Get the mame of the sensor. """ + return self._name + + @property + def state_attributes(self): + attr = super().state_attributes + for data_type in DATA_TYPES: + if data_type in self.event.values: + attr[data_type] = self.event.values[data_type] + return attr + + @property + def unit_of_measurement(self): + return self._unit_of_measurement From f44acc9b0e695e96507c21aefa84325c7d792a67 Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Thu, 23 Jul 2015 19:42:20 +0200 Subject: [PATCH 15/42] requirements file --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index c7a569fad33..06aea3fa518 100644 --- a/requirements.txt +++ b/requirements.txt @@ -79,3 +79,6 @@ PyMata==2.07a # Mysensors serial gateway pyserial>=2.7 + +#Rfxtrx sensor +https://github.com/Danielhiversen/pyRFXtrx/archive/master.zip From 8f99ebf27e676390c2ee919c8b8c5b8d20462934 Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Thu, 23 Jul 2015 19:47:45 +0200 Subject: [PATCH 16/42] Documentation of rfxtrx sensor --- homeassistant/components/sensor/rfxtrx.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/sensor/rfxtrx.py b/homeassistant/components/sensor/rfxtrx.py index 879e3326eb8..c2950c0d9c2 100644 --- a/homeassistant/components/sensor/rfxtrx.py +++ b/homeassistant/components/sensor/rfxtrx.py @@ -4,20 +4,14 @@ homeassistant.components.sensor.rfxtrx Shows sensor values from rfxtrx sensors. Possible config keys: +device="path to rfxtrx device" -path to rfxtrx device -device=/dev/serial/by-id/usb-rfxtrx_RFXtrx433_A1Y0NJGR-if00-port0 +Example: -id of the sensor: Name the sensor with ID -135=Outside +sensor 2: + platform: rfxtrx + device : /dev/serial/by-id/usb-RFXCOM_RFXtrx433_A1Y0NJGR-if00-port0 -only_named: Only show the named sensors -only_named=1 - -datatype_mask: mask to determine which sensor values to show based on - -datatype_mask=1 # only show temperature -datatype_mask=127 # show all sensor values """ import logging from collections import OrderedDict From b54c58235f49f93fc3245a351a29ba636b79ea91 Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Thu, 23 Jul 2015 19:50:26 +0200 Subject: [PATCH 17/42] Documentation of rfxtrx sensor --- homeassistant/components/sensor/rfxtrx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensor/rfxtrx.py b/homeassistant/components/sensor/rfxtrx.py index c2950c0d9c2..12e6afde3d1 100644 --- a/homeassistant/components/sensor/rfxtrx.py +++ b/homeassistant/components/sensor/rfxtrx.py @@ -8,7 +8,7 @@ device="path to rfxtrx device" Example: -sensor 2: +sensor 2: platform: rfxtrx device : /dev/serial/by-id/usb-RFXCOM_RFXtrx433_A1Y0NJGR-if00-port0 From be937a795aaf2ea144c4cf8d8fb7004834f31333 Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Thu, 23 Jul 2015 22:15:17 +0200 Subject: [PATCH 18/42] Min max temp for thermostat --- .../components/thermostat/__init__.py | 27 +++++++++---------- .../components/thermostat/heat_control.py | 15 +++++++++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/homeassistant/components/thermostat/__init__.py b/homeassistant/components/thermostat/__init__.py index dffa7dfcc26..40e392709f2 100644 --- a/homeassistant/components/thermostat/__init__.py +++ b/homeassistant/components/thermostat/__init__.py @@ -133,21 +133,8 @@ class ThermostatDevice(Entity): if device_attr is not None: data.update(device_attr) - if hasattr(self, ATTR_MIN_TEMP): - min_temp = self.hass.config.temperature( - getattr(self, ATTR_MIN_TEMP), self.unit_of_measurement)[0] - else: - min_temp = self.hass.config.temperature( - 7, TEMP_CELCIUS)[0] - data[ATTR_MIN_TEMP] = min_temp - - if hasattr(self, ATTR_MAX_TEMP): - max_temp = self.hass.config.temperature( - getattr(self, ATTR_MAX_TEMP), self.unit_of_measurement)[0] - else: - max_temp = self.hass.config.temperature( - 35, TEMP_CELCIUS)[0] - data[ATTR_MAX_TEMP] = max_temp + data[ATTR_MIN_TEMP] = self.min_temp + data[ATTR_MAX_TEMP] = self.max_temp return data @@ -180,3 +167,13 @@ class ThermostatDevice(Entity): def turn_away_mode_off(self): """ Turns away mode off. """ pass + + @property + def min_temp(self): + """ Return minimum temperature. """ + return self.hass.config.temperature(7, TEMP_CELCIUS)[0] + + @property + def max_temp(self): + """ Return maxmum temperature. """ + return self.hass.config.temperature(35, TEMP_CELCIUS)[0] diff --git a/homeassistant/components/thermostat/heat_control.py b/homeassistant/components/thermostat/heat_control.py index 273f1173da8..54e7cc3e3a5 100644 --- a/homeassistant/components/thermostat/heat_control.py +++ b/homeassistant/components/thermostat/heat_control.py @@ -62,6 +62,7 @@ import logging import datetime import homeassistant.components as core +import homeassistant.util as util from homeassistant.components.thermostat import ThermostatDevice from homeassistant.const import TEMP_CELCIUS, STATE_ON, STATE_OFF @@ -100,8 +101,8 @@ class HeatControl(ThermostatDevice): datetime.datetime.strptime(time_end, '%H%M')) self.time_temp.append((start_time, end_time, float(temp))) - self.min_temp = float(config.get("min_temp")) - self.max_temp = float(config.get("max_temp")) + self._min_temp = util.convert(config.get("min_temp"), float, 0) + self._max_temp = util.convert(config.get("max_temp"), float, 100) self._manual_sat_temp = None self._away = False @@ -196,3 +197,13 @@ class HeatControl(ThermostatDevice): def turn_away_mode_off(self): """ Turns away mode off. """ self._away = False + + @property + def min_temp(self): + """ Return minimum temperature. """ + return self._min_temp + + @property + def max_temp(self): + """ Return maxmum temperature. """ + return self._max_temp From 22c72060cf99654d77eb358979d399ddd8355171 Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Thu, 23 Jul 2015 22:24:48 +0200 Subject: [PATCH 19/42] Make only_named: 0 work --- homeassistant/components/sensor/tellstick.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensor/tellstick.py b/homeassistant/components/sensor/tellstick.py index 5720b65a669..f80a3c19f12 100644 --- a/homeassistant/components/sensor/tellstick.py +++ b/homeassistant/components/sensor/tellstick.py @@ -77,7 +77,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): try: sensor_name = config[ts_sensor.id] except KeyError: - if 'only_named' in config: + if util.convert(config.get('only_named'), bool, False): continue sensor_name = str(ts_sensor.id) From 445aaeb700ae091dcb6792fd813f84d1f4f305c4 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 24 Jul 2015 03:28:21 -0700 Subject: [PATCH 20/42] New compiled version of frontend --- homeassistant/components/frontend/version.py | 2 +- .../frontend/www_static/frontend.html | 96 ++++++++++++++----- .../www_static/home-assistant-polymer | 2 +- 3 files changed, 73 insertions(+), 27 deletions(-) diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py index 4a67ed0fc0e..6f30746f137 100644 --- a/homeassistant/components/frontend/version.py +++ b/homeassistant/components/frontend/version.py @@ -1,2 +1,2 @@ """ DO NOT MODIFY. Auto-generated by build_frontend script """ -VERSION = "4f94fd4404583fbf27cc899c024d26ff" +VERSION = "ccfe7497d635ab4df3e6943b05adbd9b" diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html index 023347483cb..c8cabd1b0a3 100644 --- a/homeassistant/components/frontend/www_static/frontend.html +++ b/homeassistant/components/frontend/www_static/frontend.html @@ -1,6 +1,6 @@ \ No newline at end of file + } \ No newline at end of file diff --git a/homeassistant/components/frontend/www_static/home-assistant-polymer b/homeassistant/components/frontend/www_static/home-assistant-polymer index 576c04efb49..5a3fcc970b3 160000 --- a/homeassistant/components/frontend/www_static/home-assistant-polymer +++ b/homeassistant/components/frontend/www_static/home-assistant-polymer @@ -1 +1 @@ -Subproject commit 576c04efb49a8a5f7f35734458ffc93f874dd68d +Subproject commit 5a3fcc970b30d640e6a370b6f20904a745f69659 From 1489af0ecaa5b16ca5951482a50d5136ebad5faf Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Fri, 24 Jul 2015 12:35:03 +0200 Subject: [PATCH 21/42] updated rfxcom sensor --- homeassistant/components/sensor/rfxtrx.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/sensor/rfxtrx.py b/homeassistant/components/sensor/rfxtrx.py index 12e6afde3d1..1b2a4643449 100644 --- a/homeassistant/components/sensor/rfxtrx.py +++ b/homeassistant/components/sensor/rfxtrx.py @@ -16,8 +16,7 @@ sensor 2: import logging from collections import OrderedDict -from homeassistant.const import ( - ATTR_BATTERY_LEVEL, TEMP_CELCIUS) +from homeassistant.const import (TEMP_CELCIUS) from homeassistant.helpers.entity import Entity REQUIREMENTS = ['https://github.com/Danielhiversen/pyRFXtrx/archive/master.zip' @@ -37,7 +36,7 @@ DATA_TYPES = OrderedDict([ ('Wind average speed', ''), ('Wind gust', ''), ('Chill', ''), - ('Battery numeric', ATTR_BATTERY_LEVEL), + ('Battery numeric', '%'), ('Rssi numeric', '')]) @@ -102,11 +101,7 @@ class RfxtrxSensor(Entity): @property def state_attributes(self): - attr = super().state_attributes - for data_type in DATA_TYPES: - if data_type in self.event.values: - attr[data_type] = self.event.values[data_type] - return attr + return self.event.values @property def unit_of_measurement(self): From 3658c579129151980765886464054cf23aa7d214 Mon Sep 17 00:00:00 2001 From: Daniel Hoyer Iversen Date: Fri, 24 Jul 2015 13:06:15 +0200 Subject: [PATCH 22/42] updated rfxcom sensor --- homeassistant/components/sensor/rfxtrx.py | 32 ++++++++--------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/homeassistant/components/sensor/rfxtrx.py b/homeassistant/components/sensor/rfxtrx.py index 1b2a4643449..b9762995ea5 100644 --- a/homeassistant/components/sensor/rfxtrx.py +++ b/homeassistant/components/sensor/rfxtrx.py @@ -25,36 +25,26 @@ REQUIREMENTS = ['https://github.com/Danielhiversen/pyRFXtrx/archive/master.zip' DATA_TYPES = OrderedDict([ ('Temperature', TEMP_CELCIUS), ('Humidity', '%'), - ('Forecast', ''), ('Barometer', ''), ('Wind direction', ''), - ('Humidity status', ''), - ('Humidity status numeric', ''), - ('Forecast numeric', ''), - ('Rain rate', ''), - ('Rain total', ''), - ('Wind average speed', ''), - ('Wind gust', ''), - ('Chill', ''), - ('Battery numeric', '%'), - ('Rssi numeric', '')]) + ('Rain rate', '')]) def setup_platform(hass, config, add_devices, discovery_info=None): """ Setup the rfxtrx platform. """ logger = logging.getLogger(__name__) - devices = {} # keep track of devices added to HA + sensors = {} # keep track of sensors added to HA def sensor_update(event): - """ Callback for sensor updates from the MySensors gateway. """ - if event.device.id_string in devices: - devices[event.device.id_string].event = event + """ Callback for sensor updates from the RFXtrx gateway. """ + if event.device.id_string in sensors: + sensors[event.device.id_string].event = event else: - logger.info("adding new devices: %s", event.device.type_string) - new_device = RfxtrxSensor(event) - devices[event.device.id_string] = new_device - add_devices([new_device]) + logger.info("adding new sensor: %s", event.device.type_string) + new_sensor = RfxtrxSensor(event) + sensors[event.device.id_string] = new_sensor + add_devices([new_sensor]) try: import RFXtrx as rfxtrx except ImportError: @@ -62,12 +52,12 @@ def setup_platform(hass, config, add_devices, discovery_info=None): "Failed to import rfxtrx") return False - device = config.get("device", True) + device = config.get("device", "") rfxtrx.Core(device, sensor_update) class RfxtrxSensor(Entity): - """ Represents a Vera Sensor. """ + """ Represents a Rfxtrx Sensor. """ def __init__(self, event): self.event = event From 6a7e28cc8565eec9a540cb0d8ea61f75e4372131 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sat, 25 Jul 2015 18:46:47 -0700 Subject: [PATCH 23/42] - Added support for getting power on SP2101W devices (returns None on SP1101W) --- .coveragerc | 1 + .../www_static/polymer/home-assistant-js | 2 +- homeassistant/components/switch/edimax.py | 27 +++++++++++++++---- homeassistant/external/netdisco | 2 +- homeassistant/external/pyedimax | 2 +- homeassistant/external/pymysensors | 2 +- homeassistant/external/pynetgear | 2 +- homeassistant/external/pywemo | 2 +- 8 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.coveragerc b/.coveragerc index 39a3dee22bf..a2ad399f1a3 100644 --- a/.coveragerc +++ b/.coveragerc @@ -53,6 +53,7 @@ omit = homeassistant/components/sensor/systemmonitor.py homeassistant/components/sensor/time_date.py homeassistant/components/sensor/transmission.py + homeassistant/components/sensor/edimax.py homeassistant/components/switch/hikvisioncam.py homeassistant/components/switch/wemo.py homeassistant/components/thermostat/nest.py diff --git a/homeassistant/components/frontend/www_static/polymer/home-assistant-js b/homeassistant/components/frontend/www_static/polymer/home-assistant-js index 94d8682c1e7..232302b2f58 160000 --- a/homeassistant/components/frontend/www_static/polymer/home-assistant-js +++ b/homeassistant/components/frontend/www_static/polymer/home-assistant-js @@ -1 +1 @@ -Subproject commit 94d8682c1e7679ae744e8419896d5d7b0bdd16cc +Subproject commit 232302b2f589fa216b6531e65dae5dafd851f6f0 diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py index 3754b452a2d..1b8ec4e0a4a 100644 --- a/homeassistant/components/switch/edimax.py +++ b/homeassistant/components/switch/edimax.py @@ -9,6 +9,7 @@ import logging from homeassistant.components.switch import SwitchDevice from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD + # pylint: disable=unused-argument def setup_platform(hass, config, add_devices_callback, discovery_info=None): """ Find and return Edimax Smart Plugs. """ @@ -24,14 +25,14 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): return host = config.get(CONF_HOST) - auth=(config.get(CONF_USERNAME, 'admin'), - config.get(CONF_PASSWORD, '1234')) + auth = (config.get(CONF_USERNAME, 'admin'), + config.get(CONF_PASSWORD, '1234')) if not host: - logging.getLogger(__name__).error('Missing config variable %s', CONF_HOST) + logging.getLogger(__name__).error( + 'Missing config variable %s', CONF_HOST) return False - add_devices_callback([SmartPlugSwitch(SmartPlug(host, auth))]) @@ -46,6 +47,22 @@ class SmartPlugSwitch(SwitchDevice): #TODO: dynamically get name from device using requests return 'Edimax Smart Plug' + @property + def current_power_mwh(self): + """ Current power usage in mwh. """ + try: + return float(self.smartplug.now_power) / 1000000.0 + except ValueError: + return None + + @property + def today_power_mw(self): + """ Today total power usage in mw. """ + try: + return float(self.smartplug.now_energy_day) / 1000.0 + except ValueError: + return None + @property def is_on(self): """ True if switch is on. """ @@ -57,4 +74,4 @@ class SmartPlugSwitch(SwitchDevice): def turn_off(self): """ Turns the switch off. """ - self.smartplug.state = 'OFF' \ No newline at end of file + self.smartplug.state = 'OFF' diff --git a/homeassistant/external/netdisco b/homeassistant/external/netdisco index b2cad7c2b95..0e2a4d4e3ec 160000 --- a/homeassistant/external/netdisco +++ b/homeassistant/external/netdisco @@ -1 +1 @@ -Subproject commit b2cad7c2b959efa8eee9b5ac62d87232bf0b5176 +Subproject commit 0e2a4d4e3eccc0895872d1046ef748b05d26ba90 diff --git a/homeassistant/external/pyedimax b/homeassistant/external/pyedimax index 3815f3bd99f..674ada04c42 160000 --- a/homeassistant/external/pyedimax +++ b/homeassistant/external/pyedimax @@ -1 +1 @@ -Subproject commit 3815f3bd99fb9dcd4d9e5e6fc58626f5873e43db +Subproject commit 674ada04c42da5c1103205293a078be73f661fd6 diff --git a/homeassistant/external/pymysensors b/homeassistant/external/pymysensors index cd5ef892eee..7fb5c0ef877 160000 --- a/homeassistant/external/pymysensors +++ b/homeassistant/external/pymysensors @@ -1 +1 @@ -Subproject commit cd5ef892eeec0ad027727f7e8f757e7f2927da97 +Subproject commit 7fb5c0ef877c285d5d98ca0c0c6cbee552164d34 diff --git a/homeassistant/external/pynetgear b/homeassistant/external/pynetgear index e946ecf7926..8863fdd3565 160000 --- a/homeassistant/external/pynetgear +++ b/homeassistant/external/pynetgear @@ -1 +1 @@ -Subproject commit e946ecf7926b9b2adaa1e3127a9738201a1b1fc7 +Subproject commit 8863fdd356556bc82e6d236ad2bc662e7d091ff0 diff --git a/homeassistant/external/pywemo b/homeassistant/external/pywemo index ca94e41faa4..eef7dae12a0 160000 --- a/homeassistant/external/pywemo +++ b/homeassistant/external/pywemo @@ -1 +1 @@ -Subproject commit ca94e41faa48c783f600a2efd550c6b7dae01b0d +Subproject commit eef7dae12a073db7b8ac58340bf1cd6a1fea78c6 From bb0ace3a615b799c27b442619dba4a3c62dcadda Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sat, 25 Jul 2015 23:59:48 -0700 Subject: [PATCH 24/42] - Reverted submodule updates --- homeassistant/components/switch/edimax.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py index 1b8ec4e0a4a..426c016b59e 100644 --- a/homeassistant/components/switch/edimax.py +++ b/homeassistant/components/switch/edimax.py @@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): class SmartPlugSwitch(SwitchDevice): - """ Represents a Edimax Smart Plug switch within Home Assistant. """ + """ Represents an Edimax Smart Plug switch within Home Assistant. """ def __init__(self, smartplug): self.smartplug = smartplug From 613c0122c0768f8133b8f6a9c979359d6f88d185 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sun, 26 Jul 2015 00:08:57 -0700 Subject: [PATCH 25/42] - Reverted submodule updates. This is the 2nd attempt since the first one did not work --- .../components/frontend/www_static/polymer/home-assistant-js | 2 +- homeassistant/external/netdisco | 2 +- homeassistant/external/pymysensors | 2 +- homeassistant/external/pynetgear | 2 +- homeassistant/external/pywemo | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/frontend/www_static/polymer/home-assistant-js b/homeassistant/components/frontend/www_static/polymer/home-assistant-js index 232302b2f58..94d8682c1e7 160000 --- a/homeassistant/components/frontend/www_static/polymer/home-assistant-js +++ b/homeassistant/components/frontend/www_static/polymer/home-assistant-js @@ -1 +1 @@ -Subproject commit 232302b2f589fa216b6531e65dae5dafd851f6f0 +Subproject commit 94d8682c1e7679ae744e8419896d5d7b0bdd16cc diff --git a/homeassistant/external/netdisco b/homeassistant/external/netdisco index 0e2a4d4e3ec..b2cad7c2b95 160000 --- a/homeassistant/external/netdisco +++ b/homeassistant/external/netdisco @@ -1 +1 @@ -Subproject commit 0e2a4d4e3eccc0895872d1046ef748b05d26ba90 +Subproject commit b2cad7c2b959efa8eee9b5ac62d87232bf0b5176 diff --git a/homeassistant/external/pymysensors b/homeassistant/external/pymysensors index 7fb5c0ef877..cd5ef892eee 160000 --- a/homeassistant/external/pymysensors +++ b/homeassistant/external/pymysensors @@ -1 +1 @@ -Subproject commit 7fb5c0ef877c285d5d98ca0c0c6cbee552164d34 +Subproject commit cd5ef892eeec0ad027727f7e8f757e7f2927da97 diff --git a/homeassistant/external/pynetgear b/homeassistant/external/pynetgear index 8863fdd3565..e946ecf7926 160000 --- a/homeassistant/external/pynetgear +++ b/homeassistant/external/pynetgear @@ -1 +1 @@ -Subproject commit 8863fdd356556bc82e6d236ad2bc662e7d091ff0 +Subproject commit e946ecf7926b9b2adaa1e3127a9738201a1b1fc7 diff --git a/homeassistant/external/pywemo b/homeassistant/external/pywemo index eef7dae12a0..ca94e41faa4 160000 --- a/homeassistant/external/pywemo +++ b/homeassistant/external/pywemo @@ -1 +1 @@ -Subproject commit eef7dae12a073db7b8ac58340bf1cd6a1fea78c6 +Subproject commit ca94e41faa48c783f600a2efd550c6b7dae01b0d From 4845c1290c4306afdfd95108639a26ba1d09ac5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Jun 2015 12:34:55 +0200 Subject: [PATCH 26/42] remove unused stuff and update the names (same as in owm sensor) --- homeassistant/components/sensor/forecast.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/sensor/forecast.py b/homeassistant/components/sensor/forecast.py index abd3cdadb73..613dd35d640 100644 --- a/homeassistant/components/sensor/forecast.py +++ b/homeassistant/components/sensor/forecast.py @@ -1,7 +1,6 @@ """ homeassistant.components.sensor.forecast ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Forecast.io service. Configuration: @@ -121,10 +120,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None): # pylint: disable=too-few-public-methods class ForeCastSensor(Entity): - """ Implements an OpenWeatherMap sensor. """ + """ Implements an Forecast.io sensor. """ def __init__(self, weather_data, sensor_type, unit): - self.client_name = 'Forecast' + self.client_name = 'Weather' self._name = SENSOR_TYPES[sensor_type][0] self.forecast_client = weather_data self._unit = unit @@ -135,7 +134,7 @@ class ForeCastSensor(Entity): @property def name(self): - return '{} - {}'.format(self.client_name, self._name) + return '{} {}'.format(self.client_name, self._name) @property def state(self): @@ -157,10 +156,6 @@ class ForeCastSensor(Entity): try: if self.type == 'summary': self._state = data.summary - # elif self.type == 'sunrise_time': - # self._state = data.sunriseTime - # elif self.type == 'sunset_time': - # self._state = data.sunsetTime elif self.type == 'precip_intensity': if data.precipIntensity == 0: self._state = 'None' From c1b428489fb5cf959ddeb10374ff2866bf263832 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Jul 2015 18:58:32 +0200 Subject: [PATCH 27/42] fix requirement --- homeassistant/components/sensor/openweathermap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensor/openweathermap.py b/homeassistant/components/sensor/openweathermap.py index 22720748034..f4635cd13ca 100644 --- a/homeassistant/components/sensor/openweathermap.py +++ b/homeassistant/components/sensor/openweathermap.py @@ -48,7 +48,7 @@ from homeassistant.util import Throttle from homeassistant.const import (CONF_API_KEY, TEMP_CELCIUS, TEMP_FAHRENHEIT) from homeassistant.helpers.entity import Entity -REQUIREMENTS = ['pywm>=2.2.1'] +REQUIREMENTS = ['pyowm>=2.2.1'] _LOGGER = logging.getLogger(__name__) SENSOR_TYPES = { 'weather': ['Condition', ''], From f6811e858ac80f47a71394931ff9e95d4b092ee4 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Wed, 29 Jul 2015 00:24:42 -0700 Subject: [PATCH 28/42] - Removed https://github.com/rkabadi/pyedimax as submodule - Added https://github.com/rkabadi/pyedimax to requirements - Modified edimax.py to import pyedimax from python3 default packages --- .gitmodules | 3 --- homeassistant/components/switch/edimax.py | 6 ++---- homeassistant/external/pyedimax | 1 - requirements.txt | 3 +++ 4 files changed, 5 insertions(+), 8 deletions(-) delete mode 160000 homeassistant/external/pyedimax diff --git a/.gitmodules b/.gitmodules index 5d994cf6ceb..ca0b1f024b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,6 +22,3 @@ [submodule "homeassistant/external/pymysensors"] path = homeassistant/external/pymysensors url = https://github.com/theolind/pymysensors -[submodule "homeassistant/external/pyedimax"] - path = homeassistant/external/pyedimax - url = https://github.com/rkabadi/pyedimax diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py index 426c016b59e..e988ffec0f0 100644 --- a/homeassistant/components/switch/edimax.py +++ b/homeassistant/components/switch/edimax.py @@ -15,12 +15,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): """ Find and return Edimax Smart Plugs. """ try: # pylint: disable=no-name-in-module, import-error - from homeassistant.external.pyedimax.smartplug import SmartPlug + from pyedimax.smartplug import SmartPlug except ImportError: logging.getLogger(__name__).exception(( - "Failed to import pyedimax. " - "Did you maybe not run `git submodule init` " - "and `git submodule update`?")) + "Failed to import pyedimax. ")) return diff --git a/homeassistant/external/pyedimax b/homeassistant/external/pyedimax deleted file mode 160000 index 674ada04c42..00000000000 --- a/homeassistant/external/pyedimax +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 674ada04c42da5c1103205293a078be73f661fd6 diff --git a/requirements.txt b/requirements.txt index 83780721c2c..d77fe9b3b89 100644 --- a/requirements.txt +++ b/requirements.txt @@ -79,3 +79,6 @@ PyMata==2.07a # Mysensors serial gateway pyserial>=2.7 + +# PyEdimax +git+https://github.com/rkabadi/pyedimax.git \ No newline at end of file From f82b63483a1e460a9838bd43735de72184757217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Esp=C3=ADndola?= Date: Wed, 29 Jul 2015 14:04:32 -0300 Subject: [PATCH 29/42] Modbus coil support --- homeassistant/components/sensor/modbus.py | 64 ++++++++++------- homeassistant/components/switch/modbus.py | 83 +++++++++++++++-------- 2 files changed, 94 insertions(+), 53 deletions(-) diff --git a/homeassistant/components/sensor/modbus.py b/homeassistant/components/sensor/modbus.py index 90593875a54..b7b122d8d66 100644 --- a/homeassistant/components/sensor/modbus.py +++ b/homeassistant/components/sensor/modbus.py @@ -18,6 +18,9 @@ sensor: name: My boolean sensor 2: name: My other boolean sensor + coils: + 0: + name: My coil switch VARIABLES: @@ -25,6 +28,7 @@ VARIABLES: - "unit" = unit to attach to value (optional, ignored for boolean sensors) - "registers" contains a list of relevant registers to read from it can contain a "bits" section, listing relevant bits + - "coils" contains a list of relevant coils to read from - each named register will create an integer sensor - each named bit will create a boolean sensor @@ -49,21 +53,30 @@ def setup_platform(hass, config, add_devices, discovery_info=None): _LOGGER.error("No slave number provided for serial Modbus") return False registers = config.get("registers") - for regnum, register in registers.items(): - if register.get("name"): - sensors.append(ModbusSensor(register.get("name"), + if registers: + for regnum, register in registers.items(): + if register.get("name"): + sensors.append(ModbusSensor(register.get("name"), + slave, + regnum, + None, + register.get("unit"))) + if register.get("bits"): + bits = register.get("bits") + for bitnum, bit in bits.items(): + if bit.get("name"): + sensors.append(ModbusSensor(bit.get("name"), + slave, + regnum, + bitnum)) + coils = config.get("coils") + if coils: + for coilnum, coil in coils.items(): + sensors.append(ModbusSensor(coil.get("name"), slave, - regnum, - None, - register.get("unit"))) - if register.get("bits"): - bits = register.get("bits") - for bitnum, bit in bits.items(): - if bit.get("name"): - sensors.append(ModbusSensor(bit.get("name"), - slave, - regnum, - bitnum)) + coilnum, + coil=True)) + add_devices(sensors) @@ -71,13 +84,14 @@ class ModbusSensor(Entity): # pylint: disable=too-many-arguments """ Represents a Modbus Sensor """ - def __init__(self, name, slave, register, bit=None, unit=None): + def __init__(self, name, slave, register, bit=None, unit=None, coil=False): self._name = name self.slave = int(slave) if slave else 1 self.register = int(register) self.bit = int(bit) if bit else None self._value = None self._unit = unit + self._coil = coil def __str__(self): return "%s: %s" % (self.name, self.state) @@ -124,13 +138,17 @@ class ModbusSensor(Entity): return attr def update(self): - result = modbus.NETWORK.read_holding_registers(unit=self.slave, + if self._coil: + result = modbus.NETWORK.read_coils(self.register, 1) + self._value = result.bits[0] + else: + result = modbus.NETWORK.read_holding_registers(unit=self.slave, address=self.register, count=1) - val = 0 - for i, res in enumerate(result.registers): - val += res * (2**(i*16)) - if self.bit: - self._value = val & (0x0001 << self.bit) - else: - self._value = val + val = 0 + for i, res in enumerate(result.registers): + val += res * (2**(i*16)) + if self.bit: + self._value = val & (0x0001 << self.bit) + else: + self._value = val diff --git a/homeassistant/components/switch/modbus.py b/homeassistant/components/switch/modbus.py index 6513ba71f4a..41c45597de4 100644 --- a/homeassistant/components/switch/modbus.py +++ b/homeassistant/components/switch/modbus.py @@ -18,12 +18,16 @@ sensor: name: My switch 2: name: My other switch + coils: + 0: + name: My coil switch VARIABLES: - "slave" = slave number (ignored and can be omitted if not serial Modbus) - "registers" contains a list of relevant registers to read from - it must contain a "bits" section, listing relevant bits + - "coils" contains a list of relevant coils to read from/write to - each named bit will create a switch """ @@ -44,28 +48,38 @@ def setup_platform(hass, config, add_devices, discovery_info=None): _LOGGER.error("No slave number provided for serial Modbus") return False registers = config.get("registers") - for regnum, register in registers.items(): - bits = register.get("bits") - for bitnum, bit in bits.items(): - if bit.get("name"): - switches.append(ModbusSwitch(bit.get("name"), - slave, - regnum, - bitnum)) + if registers: + for regnum, register in registers.items(): + bits = register.get("bits") + for bitnum, bit in bits.items(): + if bit.get("name"): + switches.append(ModbusSwitch(bit.get("name"), + slave, + regnum, + bitnum)) + coils = config.get("coils") + if coils: + for coilnum, coil in coils.items(): + switches.append(ModbusSwitch(coil.get("name"), + slave, + coilnum, + 0, + coil=True)) add_devices(switches) class ModbusSwitch(ToggleEntity): """ Represents a Modbus switch. """ - def __init__(self, name, slave, register, bit): + def __init__(self, name, slave, register, bit, coil=False): self._name = name self.slave = int(slave) if slave else 1 self.register = int(register) self.bit = int(bit) + self._coil = coil self._is_on = None self.register_value = None - + def __str__(self): return "%s: %s" % (self.name, self.state) @@ -98,27 +112,36 @@ class ModbusSwitch(ToggleEntity): return attr def turn_on(self, **kwargs): - if self.register_value is None: - self.update() - val = self.register_value | (0x0001 << self.bit) - modbus.NETWORK.write_register(unit=self.slave, - address=self.register, - value=val) + if self._coil: + modbus.NETWORK.write_coil(self.register, True) + else: + if self.register_value is None: + self.update() + val = self.register_value | (0x0001 << self.bit) + modbus.NETWORK.write_register(unit=self.slave, + address=self.register, + value=val) def turn_off(self, **kwargs): - if self.register_value is None: - self.update() - val = self.register_value & ~(0x0001 << self.bit) - modbus.NETWORK.write_register(unit=self.slave, - address=self.register, - value=val) + if self._coil: + r = modbus.NETWORK.write_coil(self.register, False) + else: + if self.register_value is None: + self.update() + val = self.register_value & ~(0x0001 << self.bit) + modbus.NETWORK.write_register(unit=self.slave, + address=self.register, + value=val) def update(self): - result = modbus.NETWORK.read_holding_registers(unit=self.slave, - address=self.register, - count=1) - val = 0 - for i, res in enumerate(result.registers): - val += res * (2**(i*16)) - self.register_value = val - self._is_on = (val & (0x0001 << self.bit) > 0) + if self._coil: + result = modbus.NETWORK.read_coils(self.register, 1) + self.register_value = result.bits[0] + self._is_on = self.register_value + else: + result = modbus.NETWORK.read_holding_registers(unit=self.slave, address=self.register, count=1) + val = 0 + for i, res in enumerate(result.registers): + val += res * (2**(i*16)) + self.register_value = val + self._is_on = (val & (0x0001 << self.bit) > 0) From 6a239bf18a7e010b09e7606fd09afc03a06f1691 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Thu, 30 Jul 2015 00:10:16 -0700 Subject: [PATCH 30/42] Used validate_config to ensure 'host' parameter in edimax config. Added name option to edimax config --- homeassistant/components/switch/edimax.py | 45 ++++++++++++++--------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py index e988ffec0f0..58cc757a1f8 100644 --- a/homeassistant/components/switch/edimax.py +++ b/homeassistant/components/switch/edimax.py @@ -6,9 +6,17 @@ Support for Edimax switches. """ import logging -from homeassistant.components.switch import SwitchDevice -from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD +from homeassistant.helpers import validate_config +from homeassistant.components.switch import SwitchDevice, DOMAIN +from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_NAME +# constants +DEFAULT_USERNAME = 'admin' +DEFAULT_PASSWORD = '1234' +DEVICE_DEFAULT_NAME = 'Edimax Smart Plug' + +# setup logger +_LOGGER = logging.getLogger(__name__) # pylint: disable=unused-argument def setup_platform(hass, config, add_devices_callback, discovery_info=None): @@ -17,33 +25,34 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): # pylint: disable=no-name-in-module, import-error from pyedimax.smartplug import SmartPlug except ImportError: - logging.getLogger(__name__).exception(( - "Failed to import pyedimax. ")) - - return - - host = config.get(CONF_HOST) - auth = (config.get(CONF_USERNAME, 'admin'), - config.get(CONF_PASSWORD, '1234')) - - if not host: - logging.getLogger(__name__).error( - 'Missing config variable %s', CONF_HOST) + _LOGGER.error('Failed to import pyedimax') return False - add_devices_callback([SmartPlugSwitch(SmartPlug(host, auth))]) + # pylint: disable=global-statement + # check for required values in configuration file + if not validate_config({DOMAIN: config}, + {DOMAIN: [CONF_HOST]}, + _LOGGER): + return False + + host = config.get(CONF_HOST) + auth = (config.get(CONF_USERNAME, DEFAULT_USERNAME), + config.get(CONF_PASSWORD, DEFAULT_PASSWORD)) + name = config.get(CONF_NAME, DEVICE_DEFAULT_NAME) + + add_devices_callback([SmartPlugSwitch(SmartPlug(host, auth), name)]) class SmartPlugSwitch(SwitchDevice): """ Represents an Edimax Smart Plug switch within Home Assistant. """ - def __init__(self, smartplug): + def __init__(self, smartplug, name): self.smartplug = smartplug + self._name = name @property def name(self): """ Returns the name of the Smart Plug, if any. """ - #TODO: dynamically get name from device using requests - return 'Edimax Smart Plug' + return self._name @property def current_power_mwh(self): From f351ab9544d50dc39b806e3a31c05bc17f76b2a9 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Thu, 30 Jul 2015 00:37:11 -0700 Subject: [PATCH 31/42] Updated branch to avoid conflicts in requirements.txt --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index f0f49e5a248..b4adce86d22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -91,3 +91,6 @@ pywemo>=0.1 # Wink (*.wink) https://github.com/balloob/python-wink/archive/master.zip#pywink>=0.1 + +# PyEdimax +https://github.com/rkabadi/pyedimax/archive/master.zip \ No newline at end of file From ed0164843a2f0f71797d49431a4ee03c8a3c21d5 Mon Sep 17 00:00:00 2001 From: Per Sandstrom Date: Thu, 30 Jul 2015 11:30:31 +0200 Subject: [PATCH 32/42] Added support for ASUSWRT based routers --- .coveragerc | 1 + README.md | 2 +- .../components/device_tracker/asuswrt.py | 165 ++++++++++++++++++ 3 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 homeassistant/components/device_tracker/asuswrt.py diff --git a/.coveragerc b/.coveragerc index 39a3dee22bf..7c21d3a6ed5 100644 --- a/.coveragerc +++ b/.coveragerc @@ -26,6 +26,7 @@ omit = homeassistant/components/*/vera.py homeassistant/components/browser.py + homeassistant/components/device_tracker/asuswrt.py homeassistant/components/device_tracker/ddwrt.py homeassistant/components/device_tracker/luci.py homeassistant/components/device_tracker/netgear.py diff --git a/README.md b/README.md index 18a01345741..11d1e3ffd85 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Check out [the website](https://home-assistant.io) for installation instructions Examples of devices it can interface it: - * Monitoring connected devices to a wireless router: [OpenWrt](https://openwrt.org/), [Tomato](http://www.polarcloud.com/tomato), [Netgear](http://netgear.com), [DD-WRT](http://www.dd-wrt.com/site/index), [TPLink](http://www.tp-link.us/) + * Monitoring connected devices to a wireless router: [OpenWrt](https://openwrt.org/), [Tomato](http://www.polarcloud.com/tomato), [Netgear](http://netgear.com), [DD-WRT](http://www.dd-wrt.com/site/index), [TPLink](http://www.tp-link.us/), [ASUSWRT](http://event.asus.com/2013/nw/ASUSWRT/) * [Philips Hue](http://meethue.com) lights, [WeMo](http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/) switches, and [Tellstick](http://www.telldus.se/products/tellstick) devices and sensors * [Google Chromecasts](http://www.google.com/intl/en/chrome/devices/chromecast), [Music Player Daemon](http://www.musicpd.org/) and [Kodi (XBMC)](http://kodi.tv/) * Support for [ISY994](https://www.universal-devices.com/residential/isy994i-series/) (Insteon and X10 devices), [Z-Wave](http://www.z-wave.com/), [Nest Thermostats](https://nest.com/), and [Modbus](http://www.modbus.org/) diff --git a/homeassistant/components/device_tracker/asuswrt.py b/homeassistant/components/device_tracker/asuswrt.py new file mode 100644 index 00000000000..e38e410fe54 --- /dev/null +++ b/homeassistant/components/device_tracker/asuswrt.py @@ -0,0 +1,165 @@ +""" +homeassistant.components.device_tracker.asuswrt +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Device tracker platform that supports scanning a ASUSWRT router for device +presence. + +This device tracker needs telnet to be enabled on the router + +Configuration: + +To use the ASUSWRT tracker you will need to add something like the following +to your config/configuration.yaml + +device_tracker: + platform: asuswrt + host: YOUR_ROUTER_IP + username: YOUR_ADMIN_USERNAME + password: YOUR_ADMIN_PASSWORD + +Variables: + +host +*Required +The IP address of your router, e.g. 192.168.1.1. + +username +*Required +The username of an user with administrative privileges, usually 'admin'. + +password +*Required +The password for your given admin account. +""" +import logging +from datetime import timedelta +import re +import threading +import telnetlib + +from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD +from homeassistant.helpers import validate_config +from homeassistant.util import Throttle +from homeassistant.components.device_tracker import DOMAIN + +# Return cached results if last scan was less then this time ago +MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5) + +_LOGGER = logging.getLogger(__name__) + +_LEASES_REGEX = re.compile( + r'\w+\s' + + r'(?P(([0-9a-f]{2}[:-]){5}([0-9a-f]{2})))\s' + + r'(?P([0-9]{1,3}[\.]){3}[0-9]{1,3})\s' + + r'(?P([^\s]+))') + +_IP_NEIGH_REGEX = re.compile( + r'(?P([0-9]{1,3}[\.]){3}[0-9]{1,3})\s' + + r'\w+\s' + + r'\w+\s' + + r'(\w+\s(?P(([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))))?\s' + + r'(?P(\w+))') + + +def get_scanner(hass, config): + """ Validates config and returns a DD-WRT scanner. """ + if not validate_config(config, + {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]}, + _LOGGER): + return None + + scanner = AsusWrtDeviceScanner(config[DOMAIN]) + + return scanner if scanner.success_init else None + + +class AsusWrtDeviceScanner(object): + """ This class queries a router running ASUSWRT firmware + for connected devices. Adapted from DD-WRT scanner. + """ + + def __init__(self, config): + self.host = config[CONF_HOST] + self.username = config[CONF_USERNAME] + self.password = config[CONF_PASSWORD] + + self.lock = threading.Lock() + + self.last_results = {} + + # Test the router is accessible + data = self.get_asuswrt_data() + self.success_init = data is not None + + def scan_devices(self): + """ Scans for new devices and return a + list containing found device ids. """ + + self._update_info() + return [client['mac'] for client in self.last_results] + + def get_device_name(self, device): + """ Returns the name of the given device or None if we don't know. """ + if not self.last_results: + return None + for client in self.last_results: + if client['mac'] == device: + return client['host'] + return None + + @Throttle(MIN_TIME_BETWEEN_SCANS) + def _update_info(self): + """ Ensures the information from the ASUSWRT router is up to date. + Returns boolean if scanning successful. """ + if not self.success_init: + return False + + with self.lock: + _LOGGER.info("Checking ARP") + data = self.get_asuswrt_data() + if not data: + return False + + active_clients = [client for client in data.values() if + client['status'] == 'REACHABLE' or + client['status'] == 'DELAY' or + client['status'] == 'STALE'] + self.last_results = active_clients + return True + + def get_asuswrt_data(self): + """ Retrieve data from ASUSWRT and return parsed result. """ + try: + telnet = telnetlib.Telnet(self.host) + telnet.read_until(b'login: ') + telnet.write((self.username + '\n').encode('ascii')) + telnet.read_until(b'Password: ') + telnet.write((self.password + '\n').encode('ascii')) + prompt_string = telnet.read_until(b'#').split(b'\n')[-1] + telnet.write('ip neigh\n'.encode('ascii')) + neighbors = telnet.read_until(prompt_string).split(b'\n')[1:-1] + telnet.write('cat /var/lib/misc/dnsmasq.leases\n'.encode('ascii')) + leases_result = telnet.read_until(prompt_string).split(b'\n')[1:-1] + telnet.write('exit\n'.encode('ascii')) + except EOFError: + _LOGGER.exception("Unexpected response from router") + return + except ConnectionRefusedError: + _LOGGER.exception("Connection refused by router, is telnet enabled?") + return + + devices = {} + for lease in leases_result: + match = _LEASES_REGEX.search(lease.decode('utf-8')) + devices[match.group('ip')] = { + 'ip': match.group('ip'), + 'mac': match.group('mac').upper(), + 'host': match.group('host') + } + + for neighbor in neighbors: + match = _IP_NEIGH_REGEX.search(neighbor.decode('utf-8')) + if match.group('ip') in devices: + devices[match.group('ip')]['status'] = match.group('status') + return devices From ffde7e183e81031de7fd6fabbc5f65b137ac205b Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Thu, 30 Jul 2015 21:05:00 -0700 Subject: [PATCH 33/42] Fixed flake8 violations --- homeassistant/components/switch/edimax.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py index 58cc757a1f8..ab461f4de07 100644 --- a/homeassistant/components/switch/edimax.py +++ b/homeassistant/components/switch/edimax.py @@ -8,7 +8,8 @@ import logging from homeassistant.helpers import validate_config from homeassistant.components.switch import SwitchDevice, DOMAIN -from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_NAME +from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD,\ + CONF_NAME # constants DEFAULT_USERNAME = 'admin' @@ -18,6 +19,7 @@ DEVICE_DEFAULT_NAME = 'Edimax Smart Plug' # setup logger _LOGGER = logging.getLogger(__name__) + # pylint: disable=unused-argument def setup_platform(hass, config, add_devices_callback, discovery_info=None): """ Find and return Edimax Smart Plugs. """ From 6873504cc0524e1bf471b2eac552d73b786bf97b Mon Sep 17 00:00:00 2001 From: jamespcole Date: Sat, 1 Aug 2015 06:45:41 +1000 Subject: [PATCH 34/42] Fixed linting errors --- homeassistant/components/notify/slack.py | 94 ++++++++++++++++++++++++ requirements.txt | 3 + 2 files changed, 97 insertions(+) create mode 100644 homeassistant/components/notify/slack.py diff --git a/homeassistant/components/notify/slack.py b/homeassistant/components/notify/slack.py new file mode 100644 index 00000000000..adf22fa5bea --- /dev/null +++ b/homeassistant/components/notify/slack.py @@ -0,0 +1,94 @@ +""" +homeassistant.components.notify.slack +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Slack platform for notify component. + +Configuration: + +To use the Slack notifier you will need to add something like the following +to your config/configuration.yaml + +notify: + platform: slack + api_key: ABCDEFGHJKLMNOPQRSTUVXYZ + default_channel: '#general' + +Variables: + +api_key +*Required +The slack API token to use for sending slack messages. +You can get your slack API token here https://api.slack.com/web?sudo=1 + +default_channel +*Required +The default channel to post to if no channel is explicitly specified when +sending the notification message. + +""" +import logging + +from homeassistant.helpers import validate_config +from homeassistant.components.notify import ( + DOMAIN, BaseNotificationService) +from homeassistant.const import CONF_API_KEY + +REQUIREMENTS = ['slacker>=0.6.8'] +_LOGGER = logging.getLogger(__name__) + + +# pylint: disable=unused-variable +def get_service(hass, config): + """ Get the slack notification service. """ + + if not validate_config(config, + {DOMAIN: ['default_channel', CONF_API_KEY]}, + _LOGGER): + return None + + try: + # pylint: disable=no-name-in-module, unused-variable + from slacker import Error as SlackError + + except ImportError: + _LOGGER.exception( + "Unable to import slacker. " + "Did you maybe not install the 'slacker.py' package?") + + return None + + try: + api_token = config[DOMAIN].get(CONF_API_KEY) + + return SlackNotificationService( + config[DOMAIN]['default_channel'], + api_token) + + except SlackError as ex: + _LOGGER.error( + "Slack authentication failed") + _LOGGER.exception(ex) + + +# pylint: disable=too-few-public-methods +class SlackNotificationService(BaseNotificationService): + """ Implements notification service for Slack. """ + + def __init__(self, default_channel, api_token): + from slacker import Slacker + self._default_channel = default_channel + self._api_token = api_token + self.slack = Slacker(self._api_token) + self.slack.auth.test() + + def send_message(self, message="", **kwargs): + """ Send a message to a user. """ + + from slacker import Error as SlackError + channel = kwargs.get('channel', self._default_channel) + try: + self.slack.chat.post_message(channel, message) + except SlackError as ex: + _LOGGER.exception("Could not send slack notification") + _LOGGER.exception(ex) diff --git a/requirements.txt b/requirements.txt index f0f49e5a248..763db9c2539 100644 --- a/requirements.txt +++ b/requirements.txt @@ -91,3 +91,6 @@ pywemo>=0.1 # Wink (*.wink) https://github.com/balloob/python-wink/archive/master.zip#pywink>=0.1 + +# Slack notifier +slacker>=0.6.8 \ No newline at end of file From 1b3a45aba9aba980c7d31a9003e9885e271c7a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Esp=C3=ADndola?= Date: Wed, 29 Jul 2015 14:04:32 -0300 Subject: [PATCH 35/42] Modbus coil support --- homeassistant/components/sensor/modbus.py | 72 ++++++++++-------- homeassistant/components/switch/modbus.py | 91 ++++++++++++++--------- 2 files changed, 100 insertions(+), 63 deletions(-) diff --git a/homeassistant/components/sensor/modbus.py b/homeassistant/components/sensor/modbus.py index 90593875a54..7893ee5935e 100644 --- a/homeassistant/components/sensor/modbus.py +++ b/homeassistant/components/sensor/modbus.py @@ -18,6 +18,9 @@ sensor: name: My boolean sensor 2: name: My other boolean sensor + coils: + 0: + name: My coil switch VARIABLES: @@ -25,6 +28,7 @@ VARIABLES: - "unit" = unit to attach to value (optional, ignored for boolean sensors) - "registers" contains a list of relevant registers to read from it can contain a "bits" section, listing relevant bits + - "coils" contains a list of relevant coils to read from - each named register will create an integer sensor - each named bit will create a boolean sensor @@ -49,21 +53,30 @@ def setup_platform(hass, config, add_devices, discovery_info=None): _LOGGER.error("No slave number provided for serial Modbus") return False registers = config.get("registers") - for regnum, register in registers.items(): - if register.get("name"): - sensors.append(ModbusSensor(register.get("name"), + if registers: + for regnum, register in registers.items(): + if register.get("name"): + sensors.append(ModbusSensor(register.get("name"), + slave, + regnum, + None, + register.get("unit"))) + if register.get("bits"): + bits = register.get("bits") + for bitnum, bit in bits.items(): + if bit.get("name"): + sensors.append(ModbusSensor(bit.get("name"), + slave, + regnum, + bitnum)) + coils = config.get("coils") + if coils: + for coilnum, coil in coils.items(): + sensors.append(ModbusSensor(coil.get("name"), slave, - regnum, - None, - register.get("unit"))) - if register.get("bits"): - bits = register.get("bits") - for bitnum, bit in bits.items(): - if bit.get("name"): - sensors.append(ModbusSensor(bit.get("name"), - slave, - regnum, - bitnum)) + coilnum, + coil=True)) + add_devices(sensors) @@ -71,13 +84,14 @@ class ModbusSensor(Entity): # pylint: disable=too-many-arguments """ Represents a Modbus Sensor """ - def __init__(self, name, slave, register, bit=None, unit=None): + def __init__(self, name, slave, register, bit=None, unit=None, coil=False): self._name = name self.slave = int(slave) if slave else 1 self.register = int(register) self.bit = int(bit) if bit else None self._value = None self._unit = unit + self._coil = coil def __str__(self): return "%s: %s" % (self.name, self.state) @@ -118,19 +132,19 @@ class ModbusSensor(Entity): else: return self._unit - @property - def state_attributes(self): - attr = super().state_attributes - return attr - def update(self): - result = modbus.NETWORK.read_holding_registers(unit=self.slave, - address=self.register, - count=1) - val = 0 - for i, res in enumerate(result.registers): - val += res * (2**(i*16)) - if self.bit: - self._value = val & (0x0001 << self.bit) + """ Update the state of the sensor. """ + if self._coil: + result = modbus.NETWORK.read_coils(self.register, 1) + self._value = result.bits[0] else: - self._value = val + result = modbus.NETWORK.read_holding_registers( + unit=self.slave, address=self.register, + count=1) + val = 0 + for i, res in enumerate(result.registers): + val += res * (2**(i*16)) + if self.bit: + self._value = val & (0x0001 << self.bit) + else: + self._value = val diff --git a/homeassistant/components/switch/modbus.py b/homeassistant/components/switch/modbus.py index 6513ba71f4a..21a4e0087c2 100644 --- a/homeassistant/components/switch/modbus.py +++ b/homeassistant/components/switch/modbus.py @@ -18,12 +18,16 @@ sensor: name: My switch 2: name: My other switch + coils: + 0: + name: My coil switch VARIABLES: - "slave" = slave number (ignored and can be omitted if not serial Modbus) - "registers" contains a list of relevant registers to read from - it must contain a "bits" section, listing relevant bits + - "coils" contains a list of relevant coils to read from/write to - each named bit will create a switch """ @@ -44,25 +48,35 @@ def setup_platform(hass, config, add_devices, discovery_info=None): _LOGGER.error("No slave number provided for serial Modbus") return False registers = config.get("registers") - for regnum, register in registers.items(): - bits = register.get("bits") - for bitnum, bit in bits.items(): - if bit.get("name"): - switches.append(ModbusSwitch(bit.get("name"), - slave, - regnum, - bitnum)) + if registers: + for regnum, register in registers.items(): + bits = register.get("bits") + for bitnum, bit in bits.items(): + if bit.get("name"): + switches.append(ModbusSwitch(bit.get("name"), + slave, + regnum, + bitnum)) + coils = config.get("coils") + if coils: + for coilnum, coil in coils.items(): + switches.append(ModbusSwitch(coil.get("name"), + slave, + coilnum, + 0, + coil=True)) add_devices(switches) class ModbusSwitch(ToggleEntity): """ Represents a Modbus switch. """ - def __init__(self, name, slave, register, bit): + def __init__(self, name, slave, register, bit, coil=False): self._name = name self.slave = int(slave) if slave else 1 self.register = int(register) self.bit = int(bit) + self._coil = coil self._is_on = None self.register_value = None @@ -92,33 +106,42 @@ class ModbusSwitch(ToggleEntity): """ Get the name of the switch. """ return self._name - @property - def state_attributes(self): - attr = super().state_attributes - return attr - def turn_on(self, **kwargs): - if self.register_value is None: - self.update() - val = self.register_value | (0x0001 << self.bit) - modbus.NETWORK.write_register(unit=self.slave, - address=self.register, - value=val) + """ Set switch on. """ + if self._coil: + modbus.NETWORK.write_coil(self.register, True) + else: + if self.register_value is None: + self.update() + val = self.register_value | (0x0001 << self.bit) + modbus.NETWORK.write_register(unit=self.slave, + address=self.register, + value=val) def turn_off(self, **kwargs): - if self.register_value is None: - self.update() - val = self.register_value & ~(0x0001 << self.bit) - modbus.NETWORK.write_register(unit=self.slave, - address=self.register, - value=val) + """ Set switch off. """ + if self._coil: + modbus.NETWORK.write_coil(self.register, False) + else: + if self.register_value is None: + self.update() + val = self.register_value & ~(0x0001 << self.bit) + modbus.NETWORK.write_register(unit=self.slave, + address=self.register, + value=val) def update(self): - result = modbus.NETWORK.read_holding_registers(unit=self.slave, - address=self.register, - count=1) - val = 0 - for i, res in enumerate(result.registers): - val += res * (2**(i*16)) - self.register_value = val - self._is_on = (val & (0x0001 << self.bit) > 0) + """ Update the state of the switch. """ + if self._coil: + result = modbus.NETWORK.read_coils(self.register, 1) + self.register_value = result.bits[0] + self._is_on = self.register_value + else: + result = modbus.NETWORK.read_holding_registers( + unit=self.slave, address=self.register, + count=1) + val = 0 + for i, res in enumerate(result.registers): + val += res * (2**(i*16)) + self.register_value = val + self._is_on = (val & (0x0001 << self.bit) > 0) From 3c08a5ee6ebff7f8fee61cc559065864e301a1b0 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sat, 1 Aug 2015 12:20:29 -0700 Subject: [PATCH 36/42] Added support for temper temperature sensors --- homeassistant/components/sensor/temper.py | 50 +++++++++++++++++++++++ requirements.txt | 3 ++ 2 files changed, 53 insertions(+) create mode 100644 homeassistant/components/sensor/temper.py diff --git a/homeassistant/components/sensor/temper.py b/homeassistant/components/sensor/temper.py new file mode 100644 index 00000000000..1888ba05d3c --- /dev/null +++ b/homeassistant/components/sensor/temper.py @@ -0,0 +1,50 @@ +""" +homeassistant.components.sensor.temper +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Support for getting temperature from TEMPer devices +""" + +import logging +from homeassistant.helpers.entity import Entity + +_LOGGER = logging.getLogger(__name__) + + +# pylint: disable=unused-argument +def setup_platform(hass, config, add_devices_callback, discovery_info=None): + """ Find and return Temper sensors. """ + try: + # pylint: disable=no-name-in-module, import-error + from temperusb.temper import TemperHandler + except ImportError: + _LOGGER.error('Failed to import temperusb') + return False + + temp_unit = hass.config.temperature_unit + temper_devices = TemperHandler().get_devices() + add_devices_callback([TemperSensor(dev, temp_unit) for dev in temper_devices]) + + +class TemperSensor(Entity): + def __init__(self, temper_device, temp_unit): + self.temper_device = temper_device + self.temp_unit = temp_unit + self.current_value = None + + @property + def state(self): + """ Returns the state of the entity. """ + return self.current_value + + @property + def unit_of_measurement(self): + """ Unit of measurement of this entity, if any. """ + return self.temp_unit + + def update(self): + """ Retrieve latest state. """ + try: + self.current_value = self.temper_device.get_temperature() + except Exception: + _LOGGER.error('Failed to get temperature due to insufficient permissions') diff --git a/requirements.txt b/requirements.txt index c7a569fad33..a16eadeaeb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -79,3 +79,6 @@ PyMata==2.07a # Mysensors serial gateway pyserial>=2.7 + +# Temper sensors +https://github.com/rkabadi/temper-python/archive/master.zip From 0e153183d4b760d1124aaf2f4361130388d9ad15 Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sat, 1 Aug 2015 12:46:28 -0700 Subject: [PATCH 37/42] Added name for temper, added to coveragerc, --- .coveragerc | 1 + homeassistant/components/sensor/temper.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.coveragerc b/.coveragerc index 39a3dee22bf..ac312bad8c2 100644 --- a/.coveragerc +++ b/.coveragerc @@ -51,6 +51,7 @@ omit = homeassistant/components/sensor/sabnzbd.py homeassistant/components/sensor/swiss_public_transport.py homeassistant/components/sensor/systemmonitor.py + homeassistant/components/sensor/temper.py homeassistant/components/sensor/time_date.py homeassistant/components/sensor/transmission.py homeassistant/components/switch/hikvisioncam.py diff --git a/homeassistant/components/sensor/temper.py b/homeassistant/components/sensor/temper.py index 1888ba05d3c..b99ee407400 100644 --- a/homeassistant/components/sensor/temper.py +++ b/homeassistant/components/sensor/temper.py @@ -7,6 +7,7 @@ Support for getting temperature from TEMPer devices import logging from homeassistant.helpers.entity import Entity +from homeassistant.const import CONF_NAME, DEVICE_DEFAULT_NAME _LOGGER = logging.getLogger(__name__) @@ -22,15 +23,23 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): return False temp_unit = hass.config.temperature_unit + name = config.get(CONF_NAME, DEVICE_DEFAULT_NAME) temper_devices = TemperHandler().get_devices() - add_devices_callback([TemperSensor(dev, temp_unit) for dev in temper_devices]) + add_devices_callback([TemperSensor(dev, temp_unit, name + '_' + str(idx)) + for idx, dev in enumerate(temper_devices)]) class TemperSensor(Entity): - def __init__(self, temper_device, temp_unit): + def __init__(self, temper_device, temp_unit, name): self.temper_device = temper_device self.temp_unit = temp_unit self.current_value = None + self._name = name + + @property + def name(self): + """ Returns the name of the temperature sensor. """ + return self._name @property def state(self): @@ -47,4 +56,5 @@ class TemperSensor(Entity): try: self.current_value = self.temper_device.get_temperature() except Exception: - _LOGGER.error('Failed to get temperature due to insufficient permissions') + _LOGGER.error('Failed to get temperature due to insufficient ' + 'permissions. Try running with "sudo"') From c248d5455e7f21971527df8ab4637e3f8189882c Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sun, 2 Aug 2015 18:01:31 -0700 Subject: [PATCH 38/42] Added REQUIREMENTS lilst to edimax.py --- homeassistant/components/switch/edimax.py | 1 + 1 file changed, 1 insertion(+) diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py index ab461f4de07..171183900df 100644 --- a/homeassistant/components/switch/edimax.py +++ b/homeassistant/components/switch/edimax.py @@ -15,6 +15,7 @@ from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD,\ DEFAULT_USERNAME = 'admin' DEFAULT_PASSWORD = '1234' DEVICE_DEFAULT_NAME = 'Edimax Smart Plug' +REQUIREMENTS = ['https://github.com/rkabadi/pyedimax/archive/master.zip'] # setup logger _LOGGER = logging.getLogger(__name__) From e6aabb9706fde49dd5f6417c522c0bdf728e763c Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sun, 2 Aug 2015 18:51:13 -0700 Subject: [PATCH 39/42] Fixed flake8 violations --- homeassistant/components/sensor/temper.py | 3 ++- requirements.txt | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/sensor/temper.py b/homeassistant/components/sensor/temper.py index b99ee407400..ab95ab70793 100644 --- a/homeassistant/components/sensor/temper.py +++ b/homeassistant/components/sensor/temper.py @@ -30,6 +30,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): class TemperSensor(Entity): + """ Represents an Temper temperature sensor within Home Assistant. """ def __init__(self, temper_device, temp_unit, name): self.temper_device = temper_device self.temp_unit = temp_unit @@ -55,6 +56,6 @@ class TemperSensor(Entity): """ Retrieve latest state. """ try: self.current_value = self.temper_device.get_temperature() - except Exception: + except IOError: _LOGGER.error('Failed to get temperature due to insufficient ' 'permissions. Try running with "sudo"') diff --git a/requirements.txt b/requirements.txt index f0f49e5a248..7d8e7839d68 100644 --- a/requirements.txt +++ b/requirements.txt @@ -91,3 +91,6 @@ pywemo>=0.1 # Wink (*.wink) https://github.com/balloob/python-wink/archive/master.zip#pywink>=0.1 + +# Temper sensors +https://github.com/rkabadi/temper-python/archive/master.zip \ No newline at end of file From 6c6ae9cb1af9c49375ee8df751fa52f7a654d88e Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sun, 2 Aug 2015 18:55:30 -0700 Subject: [PATCH 40/42] Added REQUIREMENTS list to temper.py --- homeassistant/components/sensor/temper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/homeassistant/components/sensor/temper.py b/homeassistant/components/sensor/temper.py index ab95ab70793..c881ce801ce 100644 --- a/homeassistant/components/sensor/temper.py +++ b/homeassistant/components/sensor/temper.py @@ -11,6 +11,7 @@ from homeassistant.const import CONF_NAME, DEVICE_DEFAULT_NAME _LOGGER = logging.getLogger(__name__) +REQUIREMENTS = ['https://github.com/rkabadi/temper-python/archive/master.zip'] # pylint: disable=unused-argument def setup_platform(hass, config, add_devices_callback, discovery_info=None): From 65d32c742559cf9b52eed3989fa12af2d42a154f Mon Sep 17 00:00:00 2001 From: Rohit Kabadi Date: Sun, 2 Aug 2015 18:58:30 -0700 Subject: [PATCH 41/42] Added blank line to temper.py --- homeassistant/components/sensor/temper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/homeassistant/components/sensor/temper.py b/homeassistant/components/sensor/temper.py index c881ce801ce..d52164fd0e1 100644 --- a/homeassistant/components/sensor/temper.py +++ b/homeassistant/components/sensor/temper.py @@ -13,6 +13,7 @@ _LOGGER = logging.getLogger(__name__) REQUIREMENTS = ['https://github.com/rkabadi/temper-python/archive/master.zip'] + # pylint: disable=unused-argument def setup_platform(hass, config, add_devices_callback, discovery_info=None): """ Find and return Temper sensors. """ From 52ec4ac1d8509f6450b1d9c1bccd72e300510cd9 Mon Sep 17 00:00:00 2001 From: Per Sandstrom Date: Wed, 5 Aug 2015 10:22:03 +0200 Subject: [PATCH 42/42] flake8 and pylint --- homeassistant/components/device_tracker/asuswrt.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/device_tracker/asuswrt.py b/homeassistant/components/device_tracker/asuswrt.py index e38e410fe54..e7126d7df91 100644 --- a/homeassistant/components/device_tracker/asuswrt.py +++ b/homeassistant/components/device_tracker/asuswrt.py @@ -62,6 +62,7 @@ _IP_NEIGH_REGEX = re.compile( r'(?P(\w+))') +# pylint: disable=unused-argument def get_scanner(hass, config): """ Validates config and returns a DD-WRT scanner. """ if not validate_config(config, @@ -146,7 +147,8 @@ class AsusWrtDeviceScanner(object): _LOGGER.exception("Unexpected response from router") return except ConnectionRefusedError: - _LOGGER.exception("Connection refused by router, is telnet enabled?") + _LOGGER.exception("Connection refused by router," + + " is telnet enabled?") return devices = {}