Fix KNX Light - individual color initialisation from UI config (home-assistant#151815)

Author: farmio

homeassistant/components/knx/light.py

@@ -285,13 +285,19 @@ def _create_ui_light(xknx: XKNX, knx_config: ConfigType, name: str) -> XknxLight
         group_address_switch_green_state=conf.get_state_and_passive(
             CONF_COLOR, CONF_GA_GREEN_SWITCH
         ),
-        group_address_brightness_green=conf.get_write(CONF_GA_GREEN_BRIGHTNESS),
+        group_address_brightness_green=conf.get_write(
+            CONF_COLOR, CONF_GA_GREEN_BRIGHTNESS
+        ),
         group_address_brightness_green_state=conf.get_state_and_passive(
             CONF_COLOR, CONF_GA_GREEN_BRIGHTNESS
         ),
-        group_address_switch_blue=conf.get_write(CONF_GA_BLUE_SWITCH),
-        group_address_switch_blue_state=conf.get_state_and_passive(CONF_GA_BLUE_SWITCH),
-        group_address_brightness_blue=conf.get_write(CONF_GA_BLUE_BRIGHTNESS),
+        group_address_switch_blue=conf.get_write(CONF_COLOR, CONF_GA_BLUE_SWITCH),
+        group_address_switch_blue_state=conf.get_state_and_passive(
+            CONF_COLOR, CONF_GA_BLUE_SWITCH
+        ),
+        group_address_brightness_blue=conf.get_write(
+            CONF_COLOR, CONF_GA_BLUE_BRIGHTNESS
+        ),
         group_address_brightness_blue_state=conf.get_state_and_passive(
             CONF_COLOR, CONF_GA_BLUE_BRIGHTNESS
         ),

homeassistant/components/knx/storage/entity_store_schema.py

@@ -240,19 +240,19 @@ class LightColorMode(StrEnum):
                             write_required=True, valid_dpt="5.001"
                         ),
                         "section_blue": KNXSectionFlat(),
-                        vol.Required(CONF_GA_BLUE_BRIGHTNESS): GASelector(
-                            write_required=True, valid_dpt="5.001"
-                        ),
                         vol.Optional(CONF_GA_BLUE_SWITCH): GASelector(
                             write_required=False, valid_dpt="1"
                         ),
-                        "section_white": KNXSectionFlat(),
-                        vol.Optional(CONF_GA_WHITE_BRIGHTNESS): GASelector(
+                        vol.Required(CONF_GA_BLUE_BRIGHTNESS): GASelector(
                             write_required=True, valid_dpt="5.001"
                         ),
+                        "section_white": KNXSectionFlat(),
                         vol.Optional(CONF_GA_WHITE_SWITCH): GASelector(
                             write_required=False, valid_dpt="1"
                         ),
+                        vol.Optional(CONF_GA_WHITE_BRIGHTNESS): GASelector(
+                            write_required=True, valid_dpt="5.001"
+                        ),
                     },
                 ),
                 GroupSelectOption(

tests/components/knx/snapshots/test_websocket.ambr

@@ -575,44 +575,44 @@
                 'type': 'knx_section_flat',
               }),
               dict({
-                'name': 'ga_blue_brightness',
+                'name': 'ga_blue_switch',
+                'optional': True,
                 'options': dict({
                   'passive': True,
                   'state': dict({
                     'required': False,
                   }),
                   'validDPTs': list([
                     dict({
-                      'main': 5,
-                      'sub': 1,
+                      'main': 1,
+                      'sub': None,
                     }),
                   ]),
                   'write': dict({
-                    'required': True,
+                    'required': False,
                   }),
                 }),
-                'required': True,
+                'required': False,
                 'type': 'knx_group_address',
               }),
               dict({
-                'name': 'ga_blue_switch',
-                'optional': True,
+                'name': 'ga_blue_brightness',
                 'options': dict({
                   'passive': True,
                   'state': dict({
                     'required': False,
                   }),
                   'validDPTs': list([
                     dict({
-                      'main': 1,
-                      'sub': None,
+                      'main': 5,
+                      'sub': 1,
                     }),
                   ]),
                   'write': dict({
-                    'required': False,
+                    'required': True,
                   }),
                 }),
-                'required': False,
+                'required': True,
                 'type': 'knx_group_address',
               }),
               dict({
@@ -622,7 +622,7 @@
                 'type': 'knx_section_flat',
               }),
               dict({
-                'name': 'ga_white_brightness',
+                'name': 'ga_white_switch',
                 'optional': True,
                 'options': dict({
                   'passive': True,
@@ -631,19 +631,19 @@
                   }),
                   'validDPTs': list([
                     dict({
-                      'main': 5,
-                      'sub': 1,
+                      'main': 1,
+                      'sub': None,
                     }),
                   ]),
                   'write': dict({
-                    'required': True,
+                    'required': False,
                   }),
                 }),
                 'required': False,
                 'type': 'knx_group_address',
               }),
               dict({
-                'name': 'ga_white_switch',
+                'name': 'ga_white_brightness',
                 'optional': True,
                 'options': dict({
                   'passive': True,
@@ -652,12 +652,12 @@
                   }),
                   'validDPTs': list([
                     dict({
-                      'main': 1,
-                      'sub': None,
+                      'main': 5,
+                      'sub': 1,
                     }),
                   ]),
                   'write': dict({
-                    'required': False,
+                    'required': True,
                   }),
                 }),
                 'required': False,