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

Update xknx to 2.11.0: Add support for Light DPT 9 color temperature (#95213)

Browse source 
Update xknx to 2.11.0
This commit is contained in:
Matthias Alphart 2023-06-26 03:05:35 +02:00 • committed by GitHub
parent 1d9821efa2
commit f4756fe1f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
homeassistant/components/knx/const.py
View file

@ -118,6 +118,7 @@ class ColorTempModes(Enum):
"""Color temperature modes for config validation."""
ABSOLUTE = "DPT-7.600"
ABSOLUTE_FLOAT = "DPT-9"
RELATIVE = "DPT-5.001"

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

@ -4,7 +4,11 @@ from __future__ import annotations
from typing import Any, cast
from xknx import XKNX
from xknx.devices.light import Light as XknxLight, XYYColor
from xknx.devices.light import (
ColorTemperatureType,
Light as XknxLight,
XYYColor,
)
from homeassistant import config_entries
from homeassistant.components.light import (
@ -56,16 +60,20 @@ def _create_light(xknx: XKNX, config: ConfigType) -> XknxLight:
group_address_tunable_white_state = None
group_address_color_temp = None
group_address_color_temp_state = None
if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.ABSOLUTE:
group_address_color_temp = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
group_address_color_temp_state = config.get(
LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
)
elif config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.RELATIVE:
color_temperature_type = ColorTemperatureType.UINT_2_BYTE
if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.RELATIVE:
group_address_tunable_white = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
group_address_tunable_white_state = config.get(
LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
)
else:
# absolute uint or float
group_address_color_temp = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
group_address_color_temp_state = config.get(
LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
)
if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.ABSOLUTE_FLOAT:
color_temperature_type = ColorTemperatureType.FLOAT_2_BYTE
return XknxLight(
xknx,
@ -140,6 +148,7 @@ def _create_light(xknx: XKNX, config: ConfigType) -> XknxLight:
group_address_brightness_white_state=individual_color_addresses(
LightSchema.CONF_WHITE, LightSchema.CONF_BRIGHTNESS_STATE_ADDRESS
),
color_temperature_type=color_temperature_type,
min_kelvin=config[LightSchema.CONF_MIN_KELVIN],
max_kelvin=config[LightSchema.CONF_MAX_KELVIN],
)
@ -239,7 +248,7 @@ class KNXLight(KnxEntity, LightEntity):
"""Return the color temperature in Kelvin."""
if self._device.supports_color_temperature:
if kelvin := self._device.current_color_temperature:
return kelvin
return int(kelvin)
if self._device.supports_tunable_white:
relative_ct = self._device.current_tunable_white
if relative_ct is not None:

2
homeassistant/components/knx/manifest.json
View file

@ -11,7 +11,7 @@
"loggers": ["xknx", "xknxproject"],
"quality_scale": "platinum",
"requirements": [
"xknx==2.10.0",
"xknx==2.11.0",
"xknxproject==3.2.0",
"knx-frontend==2023.6.23.191712"
]

2
requirements_all.txt
View file

@ -2688,7 +2688,7 @@ xbox-webapi==2.0.11
xiaomi-ble==0.17.2
# homeassistant.components.knx
xknx==2.10.0
xknx==2.11.0
# homeassistant.components.knx
xknxproject==3.2.0

2
requirements_test_all.txt
View file

@ -1967,7 +1967,7 @@ xbox-webapi==2.0.11
xiaomi-ble==0.17.2
# homeassistant.components.knx
xknx==2.10.0
xknx==2.11.0
# homeassistant.components.knx
xknxproject==3.2.0