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

Bumped (minor) version of xknx within knx-component. This fixes a bug with inverted percentage within sensors. (#12929)

Browse source
This commit is contained in:
Julius Mittenzwei 2018-03-06 00:10:45 +01:00 • committed by Paulus Schoutsen
parent 05204a982e
commit 13cb9cb07b
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/knx.py
View file

@ -17,7 +17,7 @@ import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.event import async_track_state_change
from homeassistant.helpers.script import Script from homeassistant.helpers.script import Script
REQUIREMENTS = ['xknx==0.8.3'] REQUIREMENTS = ['xknx==0.8.4']
DOMAIN = "knx" DOMAIN = "knx"
DATA_KNX = "data_knx" DATA_KNX = "data_knx"

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

@ -109,8 +109,8 @@ class KNXLight(Light):
@property @property
def brightness(self): def brightness(self):
"""Return the brightness of this light between 0..255.""" """Return the brightness of this light between 0..255."""
return self.device.brightness \ return self.device.current_brightness \
if self.device.supports_dimming else \ if self.device.supports_brightness else \
None None
@property @property
@ -122,7 +122,7 @@ class KNXLight(Light):
def rgb_color(self): def rgb_color(self):
"""Return the RBG color value.""" """Return the RBG color value."""
if self.device.supports_color: if self.device.supports_color:
return self.device.current_color() return self.device.current_color
return None return None
@property @property
@ -154,7 +154,7 @@ class KNXLight(Light):
def supported_features(self): def supported_features(self):
"""Flag supported features.""" """Flag supported features."""
flags = 0 flags = 0
if self.device.supports_dimming: if self.device.supports_brightness:
flags |= SUPPORT_BRIGHTNESS flags |= SUPPORT_BRIGHTNESS
if self.device.supports_color: if self.device.supports_color:
flags |= SUPPORT_RGB_COLOR flags |= SUPPORT_RGB_COLOR
@ -162,10 +162,12 @@ class KNXLight(Light):
async def async_turn_on(self, **kwargs): async def async_turn_on(self, **kwargs):
"""Turn the light on.""" """Turn the light on."""
if ATTR_BRIGHTNESS in kwargs and self.device.supports_dimming: if ATTR_BRIGHTNESS in kwargs:
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_RGB_COLOR in kwargs: elif ATTR_RGB_COLOR in kwargs:
await self.device.set_color(kwargs[ATTR_RGB_COLOR]) if self.device.supports_color:
await self.device.set_color(kwargs[ATTR_RGB_COLOR])
else: else:
await self.device.set_on() await self.device.set_on()

2
requirements_all.txt
View file

@ -1268,7 +1268,7 @@ xbee-helper==0.0.7
xboxapi==0.1.1 xboxapi==0.1.1
# homeassistant.components.knx # homeassistant.components.knx
xknx==0.8.3 xknx==0.8.4
# homeassistant.components.media_player.bluesound # homeassistant.components.media_player.bluesound
# homeassistant.components.sensor.startca # homeassistant.components.sensor.startca