Tidy / Refactor Vera (#2569)

* Add power attribute to switch.

* Move device_state_attributes into base class.

* Fix imports following refactor.

* Bump pyvera version - should add contributed support for older (UI5) version dimmers and locks.

* Refactor device lookup to be based on vera classes, push category back into library.

* Add generic power attribute, fix inherited class order bug.

* Tidy.
This commit is contained in:
Greg Dowling authored and Paulus Schoutsen committed 2016-07-19 19:13:33 -07:00
1 parent 7c431911d1
commit e34bfb7381
7 files changed
+73 -140

No files matched your search

+8 -28
View File
@@ -6,10 +6,9 @@ https://home-assistant.io/components/switch.vera/
"""
import logging
import homeassistant.util.dt as dt_util
from homeassistant.util import convert
from homeassistant.components.switch import SwitchDevice
from homeassistant.const import (
ATTR_ARMED, ATTR_BATTERY_LEVEL, ATTR_LAST_TRIP_TIME, ATTR_TRIPPED,
STATE_OFF, STATE_ON)
from homeassistant.components.vera import (
VeraDevice, VERA_DEVICES, VERA_CONTROLLER)
@@ -34,32 +33,6 @@ class VeraSwitch(VeraDevice, SwitchDevice):
self._state = False
VeraDevice.__init__(self, vera_device, controller)
@property
def device_state_attributes(self):
"""Return the state attributes of the device."""
attr = {}
if self.vera_device.has_battery:
attr[ATTR_BATTERY_LEVEL] = self.vera_device.battery_level + '%'
if self.vera_device.is_armable:
armed = self.vera_device.is_armed
attr[ATTR_ARMED] = 'True' if armed else 'False'
if self.vera_device.is_trippable:
last_tripped = self.vera_device.last_trip
if last_tripped is not None:
utc_time = dt_util.utc_from_timestamp(int(last_tripped))
attr[ATTR_LAST_TRIP_TIME] = utc_time.isoformat()
else:
attr[ATTR_LAST_TRIP_TIME] = None
tripped = self.vera_device.is_tripped
attr[ATTR_TRIPPED] = 'True' if tripped else 'False'
attr['Vera Device Id'] = self.vera_device.vera_device_id
return attr
def turn_on(self, **kwargs):
"""Turn device on."""
self.vera_device.switch_on()
@@ -72,6 +45,13 @@ class VeraSwitch(VeraDevice, SwitchDevice):
self._state = STATE_OFF
self.update_ha_state()
@property
def current_power_mwh(self):
"""Current power usage in mWh."""
power = self.vera_device.power
if power:
return convert(power, float, 0.0) * 1000
@property
def is_on(self):
"""Return true if device is on."""