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

Revert changes to platforms using self.device (#16209)

Browse source 
* Revert tank_utility

* Fix Soundtouch

* Fix Plex

* Fix Emby

* Fix Radiotherm

* Fix Juicenet

* Fix Qwikswitch

* Fix Xiaomi miio

* Fix Nest

* Fix Tellduslive

* Fix KNX
This commit is contained in:
Robert Svensson 2018-08-26 21:25:39 +02:00 • committed by Paulus Schoutsen
parent 289b1802fd
commit 5341785aae
28 changed files with 256 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

32
homeassistant/components/light/knx.py
View file

@ -79,7 +79,7 @@ class KNXLight(Light):
def __init__(self, hass, device):
"""Initialize of KNX light."""
self._device = device
self.device = device
self.hass = hass
self.async_register_callbacks()
@ -89,12 +89,12 @@ class KNXLight(Light):
async def after_update_callback(device):
"""Call after device was updated."""
await self.async_update_ha_state()
self._device.register_device_updated_cb(after_update_callback)
self.device.register_device_updated_cb(after_update_callback)
@property
def name(self):
"""Return the name of the KNX device."""
return self._device.name
return self.device.name
@property
def available(self):
@ -109,15 +109,15 @@ class KNXLight(Light):
@property
def brightness(self):
"""Return the brightness of this light between 0..255."""
return self._device.current_brightness \
if self._device.supports_brightness else \
return self.device.current_brightness \
if self.device.supports_brightness else \
None
@property
def hs_color(self):
"""Return the HS color value."""
if self._device.supports_color:
return color_util.color_RGB_to_hs(*self._device.current_color)
if self.device.supports_color:
return color_util.color_RGB_to_hs(*self.device.current_color)
return None
@property
@ -143,30 +143,30 @@ class KNXLight(Light):
@property
def is_on(self):
"""Return true if light is on."""
return self._device.state
return self.device.state
@property
def supported_features(self):
"""Flag supported features."""
flags = 0
if self._device.supports_brightness:
if self.device.supports_brightness:
flags |= SUPPORT_BRIGHTNESS
if self._device.supports_color:
if self.device.supports_color:
flags |= SUPPORT_COLOR
return flags
async def async_turn_on(self, **kwargs):
"""Turn the light on."""
if ATTR_BRIGHTNESS in kwargs:
if self._device.supports_brightness:
await self._device.set_brightness(int(kwargs[ATTR_BRIGHTNESS]))
if self.device.supports_brightness:
await self.device.set_brightness(int(kwargs[ATTR_BRIGHTNESS]))
elif ATTR_HS_COLOR in kwargs:
if self._device.supports_color:
await self._device.set_color(color_util.color_hs_to_RGB(
if self.device.supports_color:
await self.device.set_color(color_util.color_hs_to_RGB(
*kwargs[ATTR_HS_COLOR]))
else:
await self._device.set_on()
await self.device.set_on()
async def async_turn_off(self, **kwargs):
"""Turn the light off."""
await self._device.set_off()
await self.device.set_off()