evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update for new library, slightly revise switch logic.

Browse source
This commit is contained in:
pavoni 2016-01-10 12:30:47 +00:00
parent af21f72d17
commit 4b4fb038e3
3 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/components/light/vera.py
View file

@ -14,7 +14,7 @@ from homeassistant.components.switch.vera import VeraSwitch
from homeassistant.components.light import ATTR_BRIGHTNESS from homeassistant.components.light import ATTR_BRIGHTNESS
from homeassistant.const import EVENT_HOMEASSISTANT_STOP from homeassistant.const import EVENT_HOMEASSISTANT_STOP, STATE_ON
REQUIREMENTS = ['pyvera==0.2.3'] REQUIREMENTS = ['pyvera==0.2.3']
@ -59,7 +59,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
lights = [] lights = []
for device in devices: for device in devices:
extra_data = device_data.get(device.deviceId, {}) extra_data = device_data.get(device.device_id, {})
exclude = extra_data.get('exclude', False) exclude = extra_data.get('exclude', False)
if exclude is not True: if exclude is not True:
@ -86,4 +86,5 @@ class VeraLight(VeraSwitch):
else: else:
self.vera_device.switch_on() self.vera_device.switch_on()
self.is_on_status = True self._state = STATE_ON
self.update_ha_state()

6
homeassistant/components/sensor/vera.py
View file

@ -56,7 +56,7 @@ def get_devices(hass, config):
vera_sensors = [] vera_sensors = []
for device in devices: for device in devices:
extra_data = device_data.get(device.deviceId, {}) extra_data = device_data.get(device.device_id, {})
exclude = extra_data.get('exclude', False) exclude = extra_data.get('exclude', False)
if exclude is not True: if exclude is not True:
@ -89,12 +89,10 @@ class VeraSensor(Entity):
def _update_callback(self, _device): def _update_callback(self, _device):
""" Called by the vera device callback to update state. """ """ Called by the vera device callback to update state. """
_LOGGER.info(
'Subscription update for %s', self.name)
self.update_ha_state(True) self.update_ha_state(True)
def __str__(self): def __str__(self):
return "%s %s %s" % (self.name, self.vera_device.deviceId, self.state) return "%s %s %s" % (self.name, self.vera_device.device_id, self.state)
@property @property
def state(self): def state(self):

30
homeassistant/components/switch/vera.py
View file

@ -12,12 +12,16 @@ from requests.exceptions import RequestException
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from homeassistant.helpers.entity import ToggleEntity from homeassistant.helpers.entity import ToggleEntity
from homeassistant.components.switch import SwitchDevice
from homeassistant.const import ( from homeassistant.const import (
ATTR_BATTERY_LEVEL, ATTR_BATTERY_LEVEL,
ATTR_TRIPPED, ATTR_TRIPPED,
ATTR_ARMED, ATTR_ARMED,
ATTR_LAST_TRIP_TIME, ATTR_LAST_TRIP_TIME,
EVENT_HOMEASSISTANT_STOP) EVENT_HOMEASSISTANT_STOP,
STATE_ON,
STATE_OFF)
REQUIREMENTS = ['pyvera==0.2.3'] REQUIREMENTS = ['pyvera==0.2.3']
@ -60,7 +64,7 @@ def get_devices(hass, config):
vera_switches = [] vera_switches = []
for device in devices: for device in devices:
extra_data = device_data.get(device.deviceId, {}) extra_data = device_data.get(device.device_id, {})
exclude = extra_data.get('exclude', False) exclude = extra_data.get('exclude', False)
if exclude is not True: if exclude is not True:
@ -75,7 +79,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
add_devices(get_devices(hass, config)) add_devices(get_devices(hass, config))
class VeraSwitch(ToggleEntity): class VeraSwitch(SwitchDevice):
""" Represents a Vera Switch. """ """ Represents a Vera Switch. """
def __init__(self, vera_device, controller, extra_data=None): def __init__(self, vera_device, controller, extra_data=None):
@ -86,15 +90,17 @@ class VeraSwitch(ToggleEntity):
self._name = self.extra_data.get('name') self._name = self.extra_data.get('name')
else: else:
self._name = self.vera_device.name self._name = self.vera_device.name
self.is_on_status = False self._state = STATE_OFF
self.controller.register(vera_device, self._update_callback) self.controller.register(vera_device, self._update_callback)
def _update_callback(self, _device): def _update_callback(self, _device):
""" Called by the vera device callback to update state. """ """ Called by the vera device callback to update state. """
_LOGGER.info( if self.vera_device.is_switched_on():
'Subscription update for %s', self.name) self._state = STATE_ON
self.update_ha_state(True) else:
self._state = STATE_OFF
self.update_ha_state()
@property @property
def name(self): def name(self):
@ -129,12 +135,14 @@ class VeraSwitch(ToggleEntity):
def turn_on(self, **kwargs): def turn_on(self, **kwargs):
self.vera_device.switch_on() self.vera_device.switch_on()
self.is_on_status = True self._state = STATE_ON
self.update_ha_state()
def turn_off(self, **kwargs): def turn_off(self, **kwargs):
self.vera_device.switch_off() self.vera_device.switch_off()
self.is_on_status = False self._state = STATE_OFF
self.update_ha_state()
@property @property
def should_poll(self): def should_poll(self):
@ -144,7 +152,5 @@ class VeraSwitch(ToggleEntity):
@property @property
def is_on(self): def is_on(self):
""" True if device is on. """ """ True if device is on. """
return self.is_on_status return self._state == STATE_ON
def update(self):
self.is_on_status = self.vera_device.is_switched_on()