zigbee-herdsman-converters 21.20.0 → 21.21.1

package/devices/yokis.js

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const zigbee_herdsman_1 = require("zigbee-herdsman");
 const exposes = __importStar(require("../lib/exposes"));
 const logger_1 = require("../lib/logger");
-const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const utils = __importStar(require("../lib/utils"));
 // #region Constants
 const e = exposes.presets;
@@ -1277,7 +1277,7 @@ const YokisDeviceExtend = [
 ];
 const YokisInputExtend = [
     // InputMode
-    (0, modernExtend_1.enumLookup)({
+    m.enumLookup({
         name: 'input_mode',
         lookup: inputModeEnum,
         cluster: 'manuSpecificYokisInput',
@@ -1291,7 +1291,7 @@ const YokisInputExtend = [
         entityCategory: 'config',
     }),
     // InputMode
-    (0, modernExtend_1.enumLookup)({
+    m.enumLookup({
         name: 'contact_mode',
         lookup: { nc: 0x00, no: 0x01 },
         cluster: 'manuSpecificYokisInput',
@@ -1302,7 +1302,7 @@ const YokisInputExtend = [
         entityCategory: 'config',
     }),
     // LastLocalCommandState
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'last_local_command_state',
         cluster: 'manuSpecificYokisInput',
         attribute: 'lastLocalCommandState',
@@ -1313,7 +1313,7 @@ const YokisInputExtend = [
         entityCategory: 'diagnostic',
     }),
     // LastBPConnectState
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'last_bp_connect_state',
         cluster: 'manuSpecificYokisInput',
         attribute: 'lastBPConnectState',
@@ -1345,7 +1345,7 @@ const YokisInputExtendWithBacklight: ModernExtend[] = [
 */
 const YokisEntryExtend = [
     // eShortPress
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_short_press',
         cluster: 'manuSpecificYokisEntryConfigurator',
         attribute: 'eShortPress',
@@ -1355,7 +1355,7 @@ const YokisEntryExtend = [
         entityCategory: 'config',
     }),
     // eLongPress
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_long_press',
         cluster: 'manuSpecificYokisEntryConfigurator',
         attribute: 'eLongPress',
@@ -1365,7 +1365,7 @@ const YokisEntryExtend = [
         entityCategory: 'config',
     }),
     // LongPressDuration
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'long_press_duration',
         cluster: 'manuSpecificYokisEntryConfigurator',
         attribute: 'longPressDuration',
@@ -1377,7 +1377,7 @@ const YokisEntryExtend = [
         entityCategory: 'config',
     }),
     // TimeBetweenPress
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'time_between_press',
         cluster: 'manuSpecificYokisEntryConfigurator',
         attribute: 'timeBetweenPress',
@@ -1389,7 +1389,7 @@ const YokisEntryExtend = [
         entityCategory: 'config',
     }),
     // eR12MLongPress
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_R12M_long_press',
         cluster: 'manuSpecificYokisEntryConfigurator',
         attribute: 'eR12MLongPress',
@@ -1399,7 +1399,7 @@ const YokisEntryExtend = [
         entityCategory: 'config',
     }),
     // eLocalConfigLock
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_local_config_lock',
         cluster: 'manuSpecificYokisEntryConfigurator',
         attribute: 'eLocalConfigLock',
@@ -1410,7 +1410,7 @@ const YokisEntryExtend = [
     }),
 ];
 const YokisSubSystemExtend = [
-    (0, modernExtend_1.enumLookup)({
+    m.enumLookup({
         name: 'power_failure_mode',
         lookup: { last_state: 0x00, off: 0x01, on: 0x02, blink: 0x03 },
         cluster: 'manuSpecificYokisSubSystem',
@@ -1436,7 +1436,7 @@ const yokisLightControlExtend = [
     //     entityCategory: 'diagnostic',
     // }),
     // PrevState
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'prev_state',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'prevState',
@@ -1459,7 +1459,7 @@ const yokisLightControlExtend = [
     //     valueOff: ['OFF', 0x00],
     //     entityCategory: 'config',
     // }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'on_timer',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'onTimer',
@@ -1471,7 +1471,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // preOnDelay
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_pre_on_delay',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'ePreOnDelay',
@@ -1480,7 +1480,7 @@ const yokisLightControlExtend = [
         valueOff: ['OFF', 0x00],
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'pre_on_delay',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'preOnDelay',
@@ -1492,7 +1492,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // preOffDelay
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_pre_off_delay',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'ePreOffDelay',
@@ -1501,7 +1501,7 @@ const yokisLightControlExtend = [
         valueOff: ['OFF', 0x00],
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'pre_off_delay',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'preOffDelay',
@@ -1513,7 +1513,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // Pulseduration
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'pulse_duration',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'pulseDuration',
@@ -1525,7 +1525,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // TimeType
-    (0, modernExtend_1.enumLookup)({
+    m.enumLookup({
         name: 'time_type',
         lookup: { seconds: 0x00, minutes: 0x01 },
         cluster: 'manuSpecificYokisLightControl',
@@ -1536,7 +1536,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // LongOnDuration
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'long_on_duration',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'longOnDuration',
@@ -1548,7 +1548,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // OperatingMode
-    (0, modernExtend_1.enumLookup)({
+    m.enumLookup({
         name: 'operating_mode',
         lookup: { timer: 0x00, staircase: 0x01, pulse: 0x02 },
         cluster: 'manuSpecificYokisLightControl',
@@ -1560,7 +1560,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // stopAnnounce
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_stop_announce',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'eStopAnnounce',
@@ -1569,7 +1569,7 @@ const yokisLightControlExtend = [
         valueOff: ['OFF', 0x00],
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'stop_announce_time',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'stopAnnounceTime',
@@ -1581,7 +1581,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // eDeaf
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_deaf',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'eDeaf',
@@ -1590,7 +1590,7 @@ const yokisLightControlExtend = [
         valueOff: ['OFF', 0x00],
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'deaf_blink_amount',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'deafBlinkAmount',
@@ -1600,7 +1600,7 @@ const yokisLightControlExtend = [
         valueStep: 1,
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'deaf_blink_time',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'deafBlinkTime',
@@ -1611,7 +1611,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // Blink
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_blink',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'eBlink',
@@ -1620,7 +1620,7 @@ const yokisLightControlExtend = [
         valueOff: ['OFF', 0x00],
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'blink_amount',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'blinkAmount',
@@ -1630,7 +1630,7 @@ const yokisLightControlExtend = [
         valueStep: 1,
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'blink_on_time',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'blinkOnTime',
@@ -1640,7 +1640,7 @@ const yokisLightControlExtend = [
         valueStep: 1,
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'blink_off_time',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'blinkOffTime',
@@ -1651,7 +1651,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // StateAfterBlink
-    (0, modernExtend_1.enumLookup)({
+    m.enumLookup({
         name: 'state_after_blink',
         lookup: stateAfterBlinkEnum,
         cluster: 'manuSpecificYokisLightControl',
@@ -1664,7 +1664,7 @@ const yokisLightControlExtend = [
         entityCategory: 'config',
     }),
     // eNcCommand
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_nc_command',
         cluster: 'manuSpecificYokisLightControl',
         attribute: 'eNcCommand',
@@ -1681,7 +1681,7 @@ const yokisLightControlExtend = [
 ];
 const YokisDimmerExtend = [
     // currentPosition
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'current_position',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'currentPosition',
@@ -1690,7 +1690,7 @@ const YokisDimmerExtend = [
         entityCategory: 'diagnostic',
     }),
     // memoryPosition
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'memory_position',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'memoryPosition',
@@ -1699,7 +1699,7 @@ const YokisDimmerExtend = [
         entityCategory: 'diagnostic',
     }),
     // RampUp
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_ramp_up',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'eRampUp',
@@ -1708,7 +1708,7 @@ const YokisDimmerExtend = [
         valueOff: ['OFF', 0x00],
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'ramp_up',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'rampUp',
@@ -1719,7 +1719,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // RampDown
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'enable_ramp_down',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'eRampDown',
@@ -1728,7 +1728,7 @@ const YokisDimmerExtend = [
         valueOff: ['OFF', 0x00],
         entityCategory: 'config',
     }),
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'ramp_down',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'rampDown',
@@ -1739,7 +1739,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // rampContinuousTime
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'ramp_continuous_time',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'rampContinuousTime',
@@ -1750,7 +1750,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // stepUp
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'step_up',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'stepUp',
@@ -1761,7 +1761,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // lowDimLimit
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'low_dim_limit',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'lowDimLimit',
@@ -1772,7 +1772,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // highDimLimit
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'high_dim_limit',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'highDimLimit',
@@ -1783,7 +1783,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // nightLightStartingDelay
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'nightlight_starting_delay',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'nightLightStartingDelay',
@@ -1794,7 +1794,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // nightLightStartingBrightness
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'nightlight_starting_brightness',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'nightLightStartingBrightness',
@@ -1805,7 +1805,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // nightLightEndingBrightness
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'nightlight_ending_brightness',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'nightLightEndingBrightness',
@@ -1816,7 +1816,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // nightLightRampTime
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'nightlight_ramp_time',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'nightLightRampTime',
@@ -1827,7 +1827,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // nightLightOnTime
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'nightlight_on_time',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'nightLightOnTime',
@@ -1838,7 +1838,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // favoritePosition1
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'favorite_position_1',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'favoritePosition1',
@@ -1849,7 +1849,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // favoritePosition2
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'favorite_position_2',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'favoritePosition2',
@@ -1860,7 +1860,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // favoritePosition3
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'favorite_position_3',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'favoritePosition3',
@@ -1871,7 +1871,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // stepControllerMode
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'step_controller_mode',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'stepControllerMode',
@@ -1881,7 +1881,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // memoryPositionMode
-    (0, modernExtend_1.binary)({
+    m.binary({
         name: 'memory_position_mode',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'memoryPositionMode',
@@ -1891,7 +1891,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // stepDown
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'step_down',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'stepDown',
@@ -1902,7 +1902,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // stepContinuous
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'step_continuous',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'stepContinuous',
@@ -1913,7 +1913,7 @@ const YokisDimmerExtend = [
         entityCategory: 'config',
     }),
     // stepNightLigth
-    (0, modernExtend_1.numeric)({
+    m.numeric({
         name: 'step_nightlight',
         cluster: 'manuSpecificYokisDimmer',
         attribute: 'stepNightLight',
@@ -2074,15 +2074,15 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Remote power switch with timer 500W',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
-            (0, modernExtend_1.onOff)({ powerOnBehavior: false }), // StartupOnOff is not supported
-            (0, modernExtend_1.identify)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
+            m.deviceAddCustomCluster('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
+            m.deviceAddCustomCluster('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
+            m.onOff({ powerOnBehavior: false }), // StartupOnOff is not supported
+            m.identify(),
             ...YokisSubSystemExtend,
             ...yokisLightControlExtend,
             ...YokisDeviceExtend,
@@ -2099,15 +2099,15 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Remote power switch with timer 1300W',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
-            (0, modernExtend_1.onOff)({ powerOnBehavior: false }), // StartupOnOff is not supported
-            (0, modernExtend_1.identify)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
+            m.deviceAddCustomCluster('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
+            m.deviceAddCustomCluster('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
+            m.onOff({ powerOnBehavior: false }), // StartupOnOff is not supported
+            m.identify(),
             ...YokisSubSystemExtend,
             ...yokisLightControlExtend,
             ...YokisDeviceExtend,
@@ -2124,15 +2124,15 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Remote power switch with timer 2000W',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
-            (0, modernExtend_1.onOff)({ powerOnBehavior: false }), // StartupOnOff is not supported
-            (0, modernExtend_1.identify)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
+            m.deviceAddCustomCluster('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
+            m.deviceAddCustomCluster('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
+            m.onOff({ powerOnBehavior: false }), // StartupOnOff is not supported
+            m.identify(),
             ...YokisSubSystemExtend,
             ...yokisLightControlExtend,
             ...YokisDeviceExtend,
@@ -2149,16 +2149,16 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Remote dimmer with timer 300W',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
-            (0, modernExtend_1.light)({ configureReporting: true, powerOnBehavior: false }), // StartupOnOff is not supported, TODO: review dimmer cluster instead
-            (0, modernExtend_1.identify)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
+            m.deviceAddCustomCluster('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
+            m.deviceAddCustomCluster('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
+            m.light({ configureReporting: true, powerOnBehavior: false }), // StartupOnOff is not supported, TODO: review dimmer cluster instead
+            m.identify(),
             ...yokisLightControlExtend,
             ...YokisSubSystemExtend,
             ...YokisDimmerExtend,
@@ -2176,16 +2176,16 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Roller shutter module 500W',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.windowCovering)({ controls: ['lift'] }),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisEntryConfigurator', YokisClustersDefinition['manuSpecificYokisEntryConfigurator']),
+            m.deviceAddCustomCluster('manuSpecificYokisSubSystem', YokisClustersDefinition['manuSpecificYokisSubSystem']),
+            m.deviceAddCustomCluster('manuSpecificYokisLoadManager', YokisClustersDefinition['manuSpecificYokisLoadManager']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']),
+            m.deviceAddCustomCluster('manuSpecificYokisStats', YokisClustersDefinition['manuSpecificYokisStats']), // Pending implementation
+            m.identify(),
+            m.windowCovering({ controls: ['lift'] }),
+            m.commandsWindowCovering(),
             ...YokisSubSystemExtend,
             ...YokisWindowCoveringExtend,
             ...YokisDeviceExtend,
@@ -2202,18 +2202,18 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Flush-mounted independent 2-channel transmitter',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2227,18 +2227,18 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Flush-mounted independent 4-channel transmitter',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2252,18 +2252,18 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Tabletop Design series 1-button remote control',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2277,18 +2277,18 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Keyring Design series 2-button remote control',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2302,18 +2302,18 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Keyring Design series 4-button remote control',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2327,18 +2327,18 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Keyring Design series 8-button remote control',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2352,18 +2352,18 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Wall-mounted 1-button transmitter',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2377,19 +2377,19 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Wall-mounted 2-button transmitter',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2403,19 +2403,19 @@ const definitions = [
         vendor: 'YOKIS',
         description: 'Wall-mounted 4-button transmitter',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,
@@ -2429,19 +2429,19 @@ const definitions = [
         vendor: 'YOKIS',
         description: '4-button remote control',
         extend: [
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
-            (0, modernExtend_1.deviceAddCustomCluster)('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsWindowCovering)(),
+            m.deviceAddCustomCluster('manuSpecificYokisDevice', YokisClustersDefinition['manuSpecificYokisDevice']),
+            m.deviceAddCustomCluster('manuSpecificYokisInput', YokisClustersDefinition['manuSpecificYokisInput']),
+            m.deviceAddCustomCluster('manuSpecificYokisLightControl', YokisClustersDefinition['manuSpecificYokisLightControl']),
+            m.deviceAddCustomCluster('manuSpecificYokisDimmer', YokisClustersDefinition['manuSpecificYokisDimmer']),
+            m.deviceAddCustomCluster('manuSpecificYokisWindowCovering', YokisClustersDefinition['manuSpecificYokisWindowCovering']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisChannel', YokisClustersDefinition['manuSpecificYokisChannel']),
+            m.deviceAddCustomCluster('manuSpecificYokisPilotWire', YokisClustersDefinition['manuSpecificYokisPilotWire']), // Pending implementation
+            m.deviceAddCustomCluster('manuSpecificYokisTemperatureMeasurement', YokisClustersDefinition['manuSpecificYokisTemperatureMeasurement']), // Pending implementation
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 } }),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsWindowCovering(),
             // ...YokisDeviceExtend,
             // ...YokisInputExtend,
             // ...YokisChannelExtend,