Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1401 from balloob/wemo_insight_updates 

Wemo updates
pull/1403/head
Greg Dowling 2016-02-26 00:23:17 +00:00
parent dc02370b43 ddbceebd65
commit f92802fd5c
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
homeassistant/components/switch/wemo.py
View File

@ -9,7 +9,8 @@ https://home-assistant.io/components/switch.wemo/
import logging
from homeassistant.components.switch import SwitchDevice
from homeassistant.const import STATE_OFF, STATE_ON, STATE_STANDBY
from homeassistant.const import (
STATE_OFF, STATE_ON, STATE_STANDBY, STATE_UNKNOWN)
from homeassistant.loader import get_component
DEPENDENCIES = ['wemo']
@ -18,10 +19,18 @@ _LOGGER = logging.getLogger(__name__)
ATTR_SENSOR_STATE = "sensor_state"
ATTR_SWITCH_MODE = "switch_mode"
ATTR_CURRENT_STATE_DETAIL = 'state_detail'
MAKER_SWITCH_MOMENTARY = "momentary"
MAKER_SWITCH_TOGGLE = "toggle"
MAKER_SWITCH_MOMENTARY = "momentary"
MAKER_SWITCH_TOGGLE = "toggle"
WEMO_ON = 1
WEMO_OFF = 0
WEMO_STANDBY = 8
# pylint: disable=unused-argument, too-many-function-args
def setup_platform(hass, config, add_devices_callback, discovery_info=None):
@ -43,6 +52,7 @@ class WemoSwitch(SwitchDevice):
self.wemo = device
self.insight_params = None
self.maker_params = None
self._state = None
wemo = get_component('wemo')
wemo.SUBSCRIPTION_REGISTRY.register(self.wemo)
@ -88,17 +98,10 @@ class WemoSwitch(SwitchDevice):
else:
attr[ATTR_SWITCH_MODE] = MAKER_SWITCH_TOGGLE
return attr
if self.insight_params:
attr[ATTR_CURRENT_STATE_DETAIL] = self.detail_state
@property
def state(self):
"""Returns the state."""
is_on = self.is_on
if not is_on:
return STATE_OFF
elif self.is_standby:
return STATE_STANDBY
return STATE_ON
return attr
@property
def current_power_mwh(self):
@ -113,21 +116,23 @@ class WemoSwitch(SwitchDevice):
return self.insight_params['todaymw']
@property
def is_standby(self):
def detail_state(self):
"""Is the device on - or in standby."""
if self.insight_params:
standby_state = self.insight_params['state']
# Standby is actually '8' but seems more defensive
# to check for the On and Off states
if standby_state == '1' or standby_state == '0':
return False
standby_state = int(self.insight_params['state'])
if standby_state == WEMO_ON:
return STATE_OFF
elif standby_state == WEMO_OFF:
return STATE_OFF
elif standby_state == WEMO_STANDBY:
return STATE_STANDBY
else:
return True
return STATE_UNKNOWN
@property
def is_on(self):
"""True if switch is on."""
return self.wemo.get_state()
"""True if switch is on. Standby is on!"""
return self._state
@property
def available(self):
@ -143,16 +148,20 @@ class WemoSwitch(SwitchDevice):
def turn_on(self, **kwargs):
"""Turns the switch on."""
self._state = WEMO_ON
self.update_ha_state()
self.wemo.on()
def turn_off(self):
"""Turns the switch off."""
self._state = WEMO_OFF
self.update_ha_state()
self.wemo.off()
def update(self):
"""Update WeMo state."""
try:
self.wemo.get_state(True)
self._state = self.wemo.get_state(True)
if self.wemo.model_name == 'Insight':
self.insight_params = self.wemo.insight_params
self.insight_params['standby_state'] = (

8
homeassistant/components/wemo.py
View File

@ -25,6 +25,7 @@ WEMO_MODEL_DISPATCH = {
'Maker': DISCOVER_SWITCHES,
'Motion': DISCOVER_MOTION,
'Socket': DISCOVER_SWITCHES,
'LightSwitch': DISCOVER_SWITCHES
}
WEMO_SERVICE_DISPATCH = {
DISCOVER_LIGHTS: 'light',
@ -64,12 +65,11 @@ def setup(hass, config):
return
KNOWN_DEVICES.append(mac)
service = WEMO_MODEL_DISPATCH.get(model_name)
service = WEMO_MODEL_DISPATCH.get(model_name) or DISCOVER_SWITCHES
component = WEMO_SERVICE_DISPATCH.get(service)
if service is not None:
discovery.discover(hass, service, discovery_info,
component, config)
discovery.discover(hass, service, discovery_info,
component, config)
discovery.listen(hass, discovery.SERVICE_WEMO, discovery_dispatch)