merge from HA upstream 2020.12.1-dev

XKNX · Dec 22, 2020 · 9cf40e6 · 9cf40e6
1 parent 03c9673
commit 9cf40e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/home-assistant-plugin/custom_components/xknx/light.py b/home-assistant-plugin/custom_components/xknx/light.py
@@ -86,7 +86,8 @@ def color_temp(self):
         """Return the color temperature in mireds."""
         if self._device.supports_color_temperature:
             kelvin = self._device.current_color_temperature
-            if kelvin is not None:
+            # Avoid division by zero if actuator reported 0 Kelvin (e.g., uninitialized DALI-Gateway)
+            if kelvin is not None and kelvin > 0:
                 return color_util.color_temperature_kelvin_to_mired(kelvin)
         if self._device.supports_tunable_white:
             relative_ct = self._device.current_tunable_white

diff --git a/home-assistant-plugin/custom_components/xknx/schema.py b/home-assistant-plugin/custom_components/xknx/schema.py
@@ -112,7 +112,7 @@ class BinarySensorSchema:
                 ),
                 vol.Optional(CONF_DEVICE_CLASS): cv.string,
                 vol.Optional(CONF_INVERT): cv.boolean,
-                vol.Optional(CONF_RESET_AFTER): cv.positive_int,
+                vol.Optional(CONF_RESET_AFTER): cv.positive_float,
             }
         ),
     )