Fix mappings for HmIP-HDM* and HBW-LC-RGBWW-IN6-DR (#1432)

* Rename func to make_ce_func * Update version * Add fixed custom mapping for HBW-LC-RGBWW-IN6-DR * Update changelog.md * Fix mapping of HmIP-HDM
SukramJ · Feb 12, 2024 · 19f0801 · 19f0801
1 parent a646dd7
commit 19f0801
Show file tree

Hide file tree

Showing 15 changed files with 266 additions and 159 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,13 @@
+# Version 2024.2.3 (2024-02-12)
+
+- Rename func to make_ce_func
+- Add fixed mapping for HBW-LC-RGBWW-IN6-DR
+- Fix mapping of HmIP-HDM
+
 # Version 2024.2.2 (2024-02-11)
 
 - Add option to un ignore mechanism to ignore the automatic creation of custom entities by device type
-- Remove incomplete/wrong custom mapping for HBW-LC-RGBWW-IN6-DR
+- Remove incomplete/wrong mapping for HBW-LC-RGBWW-IN6-DR
 - Fix mapping of HmIP-HDM
 
 # Version 2024.2.1 (2024-02-02)

diff --git a/hahomematic/platforms/custom/__init__.py b/hahomematic/platforms/custom/__init__.py
@@ -36,10 +36,14 @@ def create_custom_entity_and_append_to_device(
         # Call the custom creation function.
         for entity_configs in get_entity_configs(device.device_type):
             if isinstance(entity_configs, CustomConfig):
-                entity_configs.func(device, entity_configs.channels, entity_configs.extended)
+                entity_configs.make_ce_func(
+                    device, entity_configs.channels, entity_configs.extended
+                )
             else:
                 for entity_config in entity_configs:
-                    entity_config.func(device, entity_config.channels, entity_config.extended)
+                    entity_config.make_ce_func(
+                        device, entity_config.channels, entity_config.extended
+                    )
 
 
 def _importlibs() -> None:

diff --git a/hahomematic/platforms/custom/climate.py b/hahomematic/platforms/custom/climate.py
@@ -677,24 +677,24 @@ def make_ip_thermostat_group(
 # Case for device model is not relevant.
 # HomeBrew (HB-) devices are always listed as HM-.
 DEVICES: Mapping[str, CustomConfig | tuple[CustomConfig, ...]] = {
-    "ALPHA-IP-RBG": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "BC-RT-TRX-CyG": CustomConfig(func=make_thermostat, channels=(1,)),
-    "BC-RT-TRX-CyN": CustomConfig(func=make_thermostat, channels=(1,)),
-    "BC-TC-C-WM": CustomConfig(func=make_thermostat, channels=(1,)),
-    "HM-CC-RT-DN": CustomConfig(func=make_thermostat, channels=(4,)),
-    "HM-CC-TC": CustomConfig(func=make_simple_thermostat, channels=(1,)),
-    "HM-CC-VG-1": CustomConfig(func=make_thermostat_group, channels=(1,)),
-    "HM-TC-IT-WM-W-EU": CustomConfig(func=make_thermostat, channels=(2,)),
-    "HmIP-BWTH": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "HmIP-HEATING": CustomConfig(func=make_ip_thermostat_group, channels=(1,)),
-    "HmIP-STH": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "HmIP-WTH": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "HmIP-eTRV": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "HmIPW-SCTHD": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "HmIPW-STH": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "HmIPW-WTH": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "Thermostat AA": CustomConfig(func=make_ip_thermostat, channels=(1,)),
-    "ZEL STG RM FWT": CustomConfig(func=make_simple_thermostat, channels=(1,)),
+    "ALPHA-IP-RBG": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "BC-RT-TRX-CyG": CustomConfig(make_ce_func=make_thermostat, channels=(1,)),
+    "BC-RT-TRX-CyN": CustomConfig(make_ce_func=make_thermostat, channels=(1,)),
+    "BC-TC-C-WM": CustomConfig(make_ce_func=make_thermostat, channels=(1,)),
+    "HM-CC-RT-DN": CustomConfig(make_ce_func=make_thermostat, channels=(4,)),
+    "HM-CC-TC": CustomConfig(make_ce_func=make_simple_thermostat, channels=(1,)),
+    "HM-CC-VG-1": CustomConfig(make_ce_func=make_thermostat_group, channels=(1,)),
+    "HM-TC-IT-WM-W-EU": CustomConfig(make_ce_func=make_thermostat, channels=(2,)),
+    "HmIP-BWTH": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "HmIP-HEATING": CustomConfig(make_ce_func=make_ip_thermostat_group, channels=(1,)),
+    "HmIP-STH": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "HmIP-WTH": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "HmIP-eTRV": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "HmIPW-SCTHD": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "HmIPW-STH": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "HmIPW-WTH": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "Thermostat AA": CustomConfig(make_ce_func=make_ip_thermostat, channels=(1,)),
+    "ZEL STG RM FWT": CustomConfig(make_ce_func=make_simple_thermostat, channels=(1,)),
 }
 hmed.ALL_DEVICES.append(DEVICES)
 BLACKLISTED_DEVICES: tuple[str, ...] = ("HmIP-STHO",)

diff --git a/hahomematic/platforms/custom/cover.py b/hahomematic/platforms/custom/cover.py
@@ -622,20 +622,20 @@ def make_rf_window_drive(
 # Case for device model is not relevant.
 # HomeBrew (HB-) devices are always listed as HM-.
 DEVICES: Mapping[str, CustomConfig | tuple[CustomConfig, ...]] = {
-    "263 146": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "263 147": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-Bl1-Velux": CustomConfig(func=make_rf_cover, channels=(1,)),  # HB-LC-Bl1-Velux
-    "HM-LC-Bl1-FM": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-Bl1-FM-2": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-Bl1-PB-FM": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-Bl1-SM": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-Bl1-SM-2": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-Bl1PBU-FM": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-BlX": CustomConfig(func=make_rf_cover, channels=(1,)),
-    "HM-LC-Ja1PBU-FM": CustomConfig(func=make_rf_blind, channels=(1,)),
-    "HM-LC-JaX": CustomConfig(func=make_rf_blind, channels=(1,)),
+    "263 146": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "263 147": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-Bl1-Velux": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),  # HB-LC-Bl1-Velux
+    "HM-LC-Bl1-FM": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-Bl1-FM-2": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-Bl1-PB-FM": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-Bl1-SM": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-Bl1-SM-2": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-Bl1PBU-FM": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-BlX": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
+    "HM-LC-Ja1PBU-FM": CustomConfig(make_ce_func=make_rf_blind, channels=(1,)),
+    "HM-LC-JaX": CustomConfig(make_ce_func=make_rf_blind, channels=(1,)),
     "HM-Sec-Win": CustomConfig(
-        func=make_rf_window_drive,
+        make_ce_func=make_rf_window_drive,
         channels=(1,),
         extended=ExtendedConfig(
             additional_entities={
@@ -651,32 +651,32 @@ def make_rf_window_drive(
             }
         ),
     ),
-    "HMW-LC-Bl1": CustomConfig(func=make_rf_cover, channels=(3,)),
-    "HmIP-BBL": CustomConfig(func=make_ip_blind, channels=(3,)),
-    "HmIP-BROLL": CustomConfig(func=make_ip_cover, channels=(3,)),
+    "HMW-LC-Bl1": CustomConfig(make_ce_func=make_rf_cover, channels=(3,)),
+    "HmIP-BBL": CustomConfig(make_ce_func=make_ip_blind, channels=(3,)),
+    "HmIP-BROLL": CustomConfig(make_ce_func=make_ip_cover, channels=(3,)),
     "HmIP-DRBLI4": CustomConfig(
-        func=make_ip_blind,
+        make_ce_func=make_ip_blind,
         channels=(9, 13, 17, 21),
         extended=ExtendedConfig(
             additional_entities={
                 0: (Parameter.ACTUAL_TEMPERATURE,),
             }
         ),
     ),
-    "HmIP-FBL": CustomConfig(func=make_ip_blind, channels=(3,)),
-    "HmIP-FROLL": CustomConfig(func=make_ip_cover, channels=(3,)),
-    "HmIP-HDM": CustomConfig(func=make_ip_hdm, channels=(0,)),
-    "HmIP-MOD-HO": CustomConfig(func=make_ip_garage, channels=(1,)),
-    "HmIP-MOD-TM": CustomConfig(func=make_ip_garage, channels=(1,)),
+    "HmIP-FBL": CustomConfig(make_ce_func=make_ip_blind, channels=(3,)),
+    "HmIP-FROLL": CustomConfig(make_ce_func=make_ip_cover, channels=(3,)),
+    "HmIP-HDM": CustomConfig(make_ce_func=make_ip_hdm, channels=(0,)),
+    "HmIP-MOD-HO": CustomConfig(make_ce_func=make_ip_garage, channels=(1,)),
+    "HmIP-MOD-TM": CustomConfig(make_ce_func=make_ip_garage, channels=(1,)),
     "HmIPW-DRBL4": CustomConfig(
-        func=make_ip_blind,
+        make_ce_func=make_ip_blind,
         channels=(1, 5, 9, 13),
         extended=ExtendedConfig(
             additional_entities={
                 0: (Parameter.ACTUAL_TEMPERATURE,),
             }
         ),
     ),
-    "ZEL STG RM FEP 230V": CustomConfig(func=make_rf_cover, channels=(1,)),
+    "ZEL STG RM FEP 230V": CustomConfig(make_ce_func=make_rf_cover, channels=(1,)),
 }
 hmed.ALL_DEVICES.append(DEVICES)
diff --git a/hahomematic/platforms/custom/definition.py b/hahomematic/platforms/custom/definition.py
@@ -140,9 +140,6 @@
                         Field.LEVEL_2: Parameter.LEVEL_2,
                         Field.STOP: Parameter.STOP,
                     },
-                    2: {
-                        Field.COMBINED_PARAMETER: Parameter.COMBINED_PARAMETER,
-                    },
                 },
             },
         },

diff --git a/hahomematic/platforms/custom/light.py b/hahomematic/platforms/custom/light.py
@@ -894,54 +894,92 @@ def make_ip_rgbw_light(
 # Case for device model is not relevant.
 # HomeBrew (HB-) devices are always listed as HM-.
 DEVICES: Mapping[str, CustomConfig | tuple[CustomConfig, ...]] = {
-    "263 132": CustomConfig(func=make_rf_dimmer, channels=(1,)),
-    "263 133": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "263 134": CustomConfig(func=make_rf_dimmer, channels=(1,)),
-    "HM-DW-WM": CustomConfig(func=make_rf_dimmer, channels=(1, 2, 3, 4)),
-    "HM-LC-AO-SM": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-DW-WM": CustomConfig(func=make_rf_dimmer_color_temp, channels=(1, 3, 5)),
-    "HM-LC-Dim1L-CV": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1L-CV-2": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1L-Pl": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1L-Pl-2": CustomConfig(func=make_rf_dimmer, channels=(1,)),
-    "HM-LC-Dim1L-Pl-3": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1PWM-CV": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1PWM-CV-2": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1T-CV": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1T-CV-2": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1T-DR": CustomConfig(func=make_rf_dimmer, channels=(1, 2, 3)),
-    "HM-LC-Dim1T-FM": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1T-FM-2": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1T-FM-LF": CustomConfig(func=make_rf_dimmer, channels=(1,)),
-    "HM-LC-Dim1T-Pl": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1T-Pl-2": CustomConfig(func=make_rf_dimmer, channels=(1,)),
-    "HM-LC-Dim1T-Pl-3": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1TPBU-FM": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim1TPBU-FM-2": CustomConfig(func=make_rf_dimmer_with_virt_channel, channels=(1,)),
-    "HM-LC-Dim2L-CV": CustomConfig(func=make_rf_dimmer, channels=(1, 2)),
-    "HM-LC-Dim2L-SM": CustomConfig(func=make_rf_dimmer, channels=(1, 2)),
-    "HM-LC-Dim2L-SM-2": CustomConfig(func=make_rf_dimmer, channels=(1, 2, 3, 4, 5, 6)),
-    "HM-LC-Dim2T-SM": CustomConfig(func=make_rf_dimmer, channels=(1, 2)),
-    "HM-LC-Dim2T-SM-2": CustomConfig(func=make_rf_dimmer, channels=(1, 2, 3, 4, 5, 6)),
-    "HM-LC-RGBW-WM": CustomConfig(func=make_rf_dimmer_color_effect, channels=(1,)),
-    "HMW-LC-Dim1L-DR": CustomConfig(func=make_rf_dimmer, channels=(3,)),
-    "HSS-DX": CustomConfig(func=make_rf_dimmer, channels=(1,)),
-    "HmIP-BDT": CustomConfig(func=make_ip_dimmer, channels=(3,)),
-    "HmIP-BSL": CustomConfig(func=make_ip_fixed_color_light, channels=(7, 11)),
+    "263 132": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1,)),
+    "263 133": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "263 134": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1,)),
+    "HBW-LC-RGBWW-IN6-DR": (
+        CustomConfig(
+            make_ce_func=make_rf_dimmer,
+            channels=(7, 8, 9, 10, 11, 12),
+            extended=ExtendedConfig(
+                additional_entities={
+                    (
+                        1,
+                        2,
+                        3,
+                        4,
+                        5,
+                        6,
+                    ): (
+                        Parameter.PRESS_LONG,
+                        Parameter.PRESS_SHORT,
+                        Parameter.SENSOR,
+                    )
+                },
+            ),
+        ),
+        CustomConfig(
+            make_ce_func=make_rf_dimmer_color,
+            channels=(13,),
+            extended=ExtendedConfig(fixed_channels={15: {Field.COLOR: Parameter.COLOR}}),
+        ),
+        CustomConfig(
+            make_ce_func=make_rf_dimmer_color,
+            channels=(14,),
+            extended=ExtendedConfig(fixed_channels={16: {Field.COLOR: Parameter.COLOR}}),
+        ),
+    ),
+    "HM-DW-WM": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2, 3, 4)),
+    "HM-LC-AO-SM": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-DW-WM": CustomConfig(make_ce_func=make_rf_dimmer_color_temp, channels=(1, 3, 5)),
+    "HM-LC-Dim1L-CV": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1L-CV-2": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1L-Pl": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1L-Pl-2": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1,)),
+    "HM-LC-Dim1L-Pl-3": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1PWM-CV": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1PWM-CV-2": CustomConfig(
+        make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)
+    ),
+    "HM-LC-Dim1T-CV": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1T-CV-2": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1T-DR": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2, 3)),
+    "HM-LC-Dim1T-FM": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1T-FM-2": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1T-FM-LF": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1,)),
+    "HM-LC-Dim1T-Pl": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1T-Pl-2": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1,)),
+    "HM-LC-Dim1T-Pl-3": CustomConfig(make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)),
+    "HM-LC-Dim1TPBU-FM": CustomConfig(
+        make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)
+    ),
+    "HM-LC-Dim1TPBU-FM-2": CustomConfig(
+        make_ce_func=make_rf_dimmer_with_virt_channel, channels=(1,)
+    ),
+    "HM-LC-Dim2L-CV": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2)),
+    "HM-LC-Dim2L-SM": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2)),
+    "HM-LC-Dim2L-SM-2": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2, 3, 4, 5, 6)),
+    "HM-LC-Dim2T-SM": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2)),
+    "HM-LC-Dim2T-SM-2": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2, 3, 4, 5, 6)),
+    "HM-LC-RGBW-WM": CustomConfig(make_ce_func=make_rf_dimmer_color_effect, channels=(1,)),
+    "HMW-LC-Dim1L-DR": CustomConfig(make_ce_func=make_rf_dimmer, channels=(3,)),
+    "HSS-DX": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1,)),
+    "HmIP-BDT": CustomConfig(make_ce_func=make_ip_dimmer, channels=(3,)),
+    "HmIP-BSL": CustomConfig(make_ce_func=make_ip_fixed_color_light, channels=(7, 11)),
     "HmIP-DRDI3": CustomConfig(
-        func=make_ip_dimmer,
+        make_ce_func=make_ip_dimmer,
         channels=(4, 8, 12),
         extended=ExtendedConfig(
             additional_entities={
                 0: (Parameter.ACTUAL_TEMPERATURE,),
             }
         ),
     ),
-    "HmIP-FDT": CustomConfig(func=make_ip_dimmer, channels=(1,)),
-    "HmIP-PDT": CustomConfig(func=make_ip_dimmer, channels=(2,)),
-    "HmIP-RGBW": CustomConfig(func=make_ip_rgbw_light, channels=(0,)),
+    "HmIP-FDT": CustomConfig(make_ce_func=make_ip_dimmer, channels=(1,)),
+    "HmIP-PDT": CustomConfig(make_ce_func=make_ip_dimmer, channels=(2,)),
+    "HmIP-RGBW": CustomConfig(make_ce_func=make_ip_rgbw_light, channels=(0,)),
     "HmIP-SCTH230": CustomConfig(
-        func=make_ip_dimmer,
+        make_ce_func=make_ip_dimmer,
         channels=(11,),
         extended=ExtendedConfig(
             additional_entities={
@@ -954,7 +992,7 @@ def make_ip_rgbw_light(
         ),
     ),
     "HmIPW-DRD3": CustomConfig(
-        func=make_ip_dimmer,
+        make_ce_func=make_ip_dimmer,
         channels=(1, 5, 9),
         extended=ExtendedConfig(
             additional_entities={
@@ -963,8 +1001,8 @@ def make_ip_rgbw_light(
         ),
     ),
     "HmIPW-WRC6": CustomConfig(
-        func=make_ip_simple_fixed_color_light_wired, channels=(7, 8, 9, 10, 11, 12, 13)
+        make_ce_func=make_ip_simple_fixed_color_light_wired, channels=(7, 8, 9, 10, 11, 12, 13)
     ),
-    "OLIGO.smart.iq.HM": CustomConfig(func=make_rf_dimmer, channels=(1, 2, 3, 4, 5, 6)),
+    "OLIGO.smart.iq.HM": CustomConfig(make_ce_func=make_rf_dimmer, channels=(1, 2, 3, 4, 5, 6)),
 }
 hmed.ALL_DEVICES.append(DEVICES)
diff --git a/hahomematic/platforms/custom/lock.py b/hahomematic/platforms/custom/lock.py
@@ -216,7 +216,7 @@ def make_rf_lock(
 # HomeBrew (HB-) devices are always listed as HM-.
 DEVICES: Mapping[str, CustomConfig | tuple[CustomConfig, ...]] = {
     "HM-Sec-Key": CustomConfig(
-        func=make_rf_lock,
+        make_ce_func=make_rf_lock,
         channels=(1,),
         extended=ExtendedConfig(
             additional_entities={
@@ -228,7 +228,7 @@ def make_rf_lock(
         ),
     ),
     "HmIP-DLD": CustomConfig(
-        func=make_ip_lock,
+        make_ce_func=make_ip_lock,
         channels=(0,),
         extended=ExtendedConfig(
             additional_entities={

diff --git a/hahomematic/platforms/custom/siren.py b/hahomematic/platforms/custom/siren.py
@@ -266,7 +266,7 @@ def make_ip_siren_smoke(
 # Case for device model is not relevant.
 # HomeBrew (HB-) devices are always listed as HM-.
 DEVICES: Mapping[str, CustomConfig | tuple[CustomConfig, ...]] = {
-    "HmIP-ASIR": CustomConfig(func=make_ip_siren, channels=(0,)),
-    "HmIP-SWSD": CustomConfig(func=make_ip_siren_smoke, channels=(0,)),
+    "HmIP-ASIR": CustomConfig(make_ce_func=make_ip_siren, channels=(0,)),
+    "HmIP-SWSD": CustomConfig(make_ce_func=make_ip_siren_smoke, channels=(0,)),
 }
 hmed.ALL_DEVICES.append(DEVICES)
diff --git a/hahomematic/platforms/custom/support.py b/hahomematic/platforms/custom/support.py
@@ -12,7 +12,7 @@
 class CustomConfig:
     """Data for custom entity creation."""
 
-    func: Callable
+    make_ce_func: Callable
     channels: tuple[int, ...]
     extended: ExtendedConfig | None = None
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,9 +140,6 @@ @@
                             Field.LEVEL_2: Parameter.LEVEL_2,
                             Field.STOP: Parameter.STOP,
                         },
-: {
-                            Field.COMBINED_PARAMETER: Parameter.COMBINED_PARAMETER,
-                        },
                     },
                 },
             },
@@ Expand Down @@