zigbee-herdsman-converters 21.20.0 → 21.21.0

package/devices/lumi.js

@@ -41,7 +41,6 @@ const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const exposes = __importStar(require("../lib/exposes"));
 const logger_1 = require("../lib/logger");
 const lumi = __importStar(require("../lib/lumi"));
-const modernExtend_1 = require("../lib/modernExtend");
 const m = __importStar(require("../lib/modernExtend"));
 const reporting = __importStar(require("../lib/reporting"));
 const globalStore = __importStar(require("../lib/store"));
@@ -64,7 +63,7 @@ const definitions = [
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.airm.fhac01'],
@@ -90,7 +89,7 @@ const definitions = [
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
         },
         extend: [
-            (0, modernExtend_1.quirkCheckinInterval)('1_HOUR'),
+            m.quirkCheckinInterval('1_HOUR'),
             // OTA request: "fieldControl":0, "manufacturerCode":4447, "imageType":10635, no available for now
             // https://github.com/Koenkk/zigbee-OTA/pull/138
             // lumiZigbeeOTA(),
@@ -113,18 +112,18 @@ const definitions = [
                 .enum('detection_distance', ea.ALL, ['10mm', '20mm', '30mm'])
                 .withDescription('The sensor will be considered "off" within the set distance. Please press the device button before setting'),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.dimmer.rcbac1'],
         model: 'ZNDDMK11LM',
         vendor: 'Aqara',
         description: 'Smart lightstrip driver',
-        fromZigbee: [lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, ...(0, modernExtend_1.light)({ colorTemp: { range: undefined }, color: true }).fromZigbee],
+        fromZigbee: [lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, ...m.light({ colorTemp: { range: undefined }, color: true }).fromZigbee],
         toZigbee: [
             lumi.toZigbee.lumi_dimmer_mode,
             lumi.toZigbee.lumi_switch_power_outage_memory,
-            ...(0, modernExtend_1.light)({ colorTemp: { range: undefined }, color: true }).toZigbee,
+            ...m.light({ colorTemp: { range: undefined }, color: true }).toZigbee,
         ],
         exposes: [
             e.power(),
@@ -138,7 +137,7 @@ const definitions = [
             e.light_brightness_colortemp([153, 370]).removeFeature('color_temp_startup').withEndpoint('l2'),
             e.enum('dimmer_mode', ea.ALL, ['rgbw', 'dual_ct']).withDescription('Switch between rgbw mode or dual color temperature mode'),
         ],
-        extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { l1: 1, l2: 2 } }), lumiZigbeeOTA()],
+        extend: [m.deviceEndpoints({ endpoints: { l1: 1, l2: 2 } }), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.light.aqcn02'],
@@ -163,8 +162,8 @@ const definitions = [
         extend: [
             lumiZigbeeOTA(),
             lumiLight({ colorTemp: true, powerOutageMemory: 'switch' }),
-            (0, modernExtend_1.forceDeviceType)({ type: 'Router' }),
-            (0, modernExtend_1.forcePowerSource)({ powerSource: 'Mains (single phase)' }),
+            m.forceDeviceType({ type: 'Router' }),
+            m.forcePowerSource({ powerSource: 'Mains (single phase)' }),
         ],
     },
     {
@@ -225,7 +224,7 @@ const definitions = [
             e.power_outage_count(false),
         ],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.sensor_switch.aq2', 'lumi.remote.b1acn01'],
@@ -242,7 +241,7 @@ const definitions = [
         ],
         fromZigbee: [lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_basic],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.sensor_switch.aq3', 'lumi.sensor_swit'],
@@ -253,7 +252,7 @@ const definitions = [
         exposes: [e.battery(), e.action(['single', 'double', 'hold', 'release', 'shake']), e.battery_voltage()],
         fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_action_multistate],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.sensor_86sw1'],
@@ -264,7 +263,7 @@ const definitions = [
         exposes: [e.battery(), e.action(['single']), e.battery_voltage()],
         fromZigbee: [lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_basic],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiPreventReset()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiPreventReset()],
     },
     {
         zigbeeModel: ['lumi.remote.b186acn01'],
@@ -275,7 +274,7 @@ const definitions = [
         exposes: [e.battery(), e.action(['single', 'double', 'hold']), e.battery_voltage()],
         fromZigbee: [lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_basic],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiPreventReset()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiPreventReset()],
     },
     {
         zigbeeModel: ['lumi.remote.b186acn02'],
@@ -286,7 +285,7 @@ const definitions = [
         toZigbee: [],
         exposes: [e.battery(), e.action(['single', 'double', 'hold']), e.battery_voltage()],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiPreventReset()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiPreventReset()],
         configure: async (device, coordinatorEndpoint) => {
             try {
                 const endpoint = device.endpoints[1];
@@ -304,9 +303,9 @@ const definitions = [
         whiteLabel: [{ vendor: 'Aqara', model: 'RLS-K01D' }],
         description: 'Light strip T1',
         extend: [
-            (0, modernExtend_1.light)({ effect: false, powerOnBehavior: false, colorTemp: { startup: false, range: [153, 370] }, color: true }),
+            m.light({ effect: false, powerOnBehavior: false, colorTemp: { startup: false, range: [153, 370] }, color: true }),
             lumiPowerOnBehavior(),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'length',
                 valueMin: 1,
                 valueMax: 10,
@@ -318,7 +317,7 @@ const definitions = [
                 description: 'LED strip length',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'min_brightness',
                 valueMin: 0,
                 valueMax: 99,
@@ -328,7 +327,7 @@ const definitions = [
                 description: 'Minimum brightness level',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'max_brightness',
                 valueMin: 1,
                 valueMax: 100,
@@ -338,7 +337,7 @@ const definitions = [
                 description: 'Maximum brightness level',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.binary)({
+            m.binary({
                 name: 'audio',
                 valueOn: ['ON', 1],
                 valueOff: ['OFF', 0],
@@ -347,7 +346,7 @@ const definitions = [
                 description: 'Enabling audio',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'audio_sensitivity',
                 lookup: { low: 0, medium: 1, high: 2 },
                 cluster: 'manuSpecificLumi',
@@ -355,7 +354,7 @@ const definitions = [
                 description: 'Audio sensitivity',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'audio_effect',
                 lookup: { random: 0, blink: 1, rainbow: 2, wave: 3 },
                 cluster: 'manuSpecificLumi',
@@ -363,7 +362,7 @@ const definitions = [
                 description: 'Audio effect',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'preset',
                 valueMin: 1,
                 valueMax: 32,
@@ -372,7 +371,7 @@ const definitions = [
                 description: 'Preset index (0-6 default presets)',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'speed',
                 valueMin: 1,
                 valueMax: 100,
@@ -393,7 +392,7 @@ const definitions = [
         exposes: [e.battery(), e.action(['single_left', 'single_right', 'single_both']), e.battery_voltage(), e.power_outage_count(false)],
         fromZigbee: [lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_basic],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiPreventReset()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiPreventReset()],
     },
     {
         zigbeeModel: ['lumi.remote.b286acn01'],
@@ -418,7 +417,7 @@ const definitions = [
         ],
         fromZigbee: [lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_basic],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiPreventReset()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiPreventReset()],
     },
     {
         zigbeeModel: ['lumi.switch.b1laus01'],
@@ -1127,7 +1126,7 @@ const definitions = [
                 'hold_both',
             ]),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiPreventReset()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiPreventReset()],
     },
     {
         zigbeeModel: ['lumi.switch.b1lacn02'],
@@ -1389,7 +1388,7 @@ const definitions = [
         description: 'Smart wall switch T1 (no neutral, double rocker)',
         extend: [
             lumiZigbeeOTA(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { left: 1, right: 2 } }),
+            m.deviceEndpoints({ endpoints: { left: 1, right: 2 } }),
             lumiOnOff({ powerOutageMemory: 'binary', operationMode: true, endpointNames: ['left', 'right'] }),
             lumiLedDisabledNight(),
             lumiFlipIndicatorLight(),
@@ -1419,10 +1418,10 @@ const definitions = [
         vendor: 'Aqara',
         description: 'Smart wall switch T1 (with neutral, double rocker)',
         extend: [
-            (0, modernExtend_1.forceDeviceType)({ type: 'Router' }),
-            (0, modernExtend_1.forcePowerSource)({ powerSource: 'Mains (single phase)' }),
+            m.forceDeviceType({ type: 'Router' }),
+            m.forcePowerSource({ powerSource: 'Mains (single phase)' }),
             lumiZigbeeOTA(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { left: 1, right: 2 } }),
+            m.deviceEndpoints({ endpoints: { left: 1, right: 2 } }),
             lumiOnOff({ powerOutageMemory: 'binary', operationMode: true, endpointNames: ['left', 'right'] }),
             lumiLedDisabledNight(),
             lumiFlipIndicatorLight(),
@@ -1439,7 +1438,7 @@ const definitions = [
         description: 'Smart wall switch T1 (no neutral, triple rocker)',
         extend: [
             lumiZigbeeOTA(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { left: 1, center: 2, right: 3 } }),
+            m.deviceEndpoints({ endpoints: { left: 1, center: 2, right: 3 } }),
             lumiOnOff({ powerOutageMemory: 'binary', operationMode: true, endpointNames: ['left', 'center', 'right'] }),
             lumiLedDisabledNight(),
             lumiFlipIndicatorLight(),
@@ -1465,7 +1464,7 @@ const definitions = [
         description: 'Smart wall switch T1 (with neutral, triple rocker)',
         extend: [
             lumiZigbeeOTA(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { left: 1, center: 2, right: 3 } }),
+            m.deviceEndpoints({ endpoints: { left: 1, center: 2, right: 3 } }),
             lumiOnOff({ powerOutageMemory: 'binary', operationMode: true, endpointNames: ['left', 'center', 'right'] }),
             lumiLedDisabledNight(),
             lumiFlipIndicatorLight(),
@@ -1500,7 +1499,7 @@ const definitions = [
         fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_temperature, fromZigbee_1.default.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.weather'],
@@ -1515,7 +1514,7 @@ const definitions = [
             device.powerSource = 'Battery';
             device.save();
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.sensor_ht.agl02'],
@@ -1536,7 +1535,7 @@ const definitions = [
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.sensor_motion'],
@@ -1553,7 +1552,7 @@ const definitions = [
         fromZigbee: [lumi.fromZigbee.lumi_basic, fromZigbee_1.default.occupancy_with_timeout],
         toZigbee: [],
         exposes: [e.battery(), e.occupancy(), e.battery_voltage(), e.power_outage_count(false)],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.sensor_motion.aq2'],
@@ -1564,7 +1563,7 @@ const definitions = [
         fromZigbee: [lumi.fromZigbee.lumi_basic, fromZigbee_1.default.occupancy_with_timeout, lumi.fromZigbee.lumi_illuminance],
         toZigbee: [],
         exposes: [e.battery(), e.occupancy(), e.device_temperature(), e.battery_voltage(), e.illuminance(), e.power_outage_count(false)],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.motion.agl02'],
@@ -1594,7 +1593,7 @@ const definitions = [
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
             await endpoint.read('manuSpecificLumi', [0x0102], { manufacturerCode: manufacturerCode });
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.motion.agl04'],
@@ -1624,7 +1623,7 @@ const definitions = [
             await endpoint.read('manuSpecificLumi', [0x0102], { manufacturerCode: manufacturerCode });
             await endpoint.read('manuSpecificLumi', [0x010c], { manufacturerCode: manufacturerCode });
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.motion.ac02'],
@@ -1660,7 +1659,7 @@ const definitions = [
             await endpoint.read('manuSpecificLumi', [0x010c], { manufacturerCode: manufacturerCode });
             await endpoint.read('manuSpecificLumi', [0x0152], { manufacturerCode: manufacturerCode });
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.motion.acn001'],
@@ -1689,7 +1688,7 @@ const definitions = [
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
             await endpoint.read('manuSpecificLumi', [0x0102], { manufacturerCode: manufacturerCode });
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.motion.ac01'],
@@ -1793,7 +1792,7 @@ const definitions = [
             lumi.lumiModernExtend.fp1eDetectionRange(),
             lumi.lumiModernExtend.fp1eSpatialLearning(),
             lumi.lumiModernExtend.fp1eRestartDevice(),
-            (0, modernExtend_1.identify)(),
+            m.identify(),
         ],
     },
     {
@@ -1811,7 +1810,7 @@ const definitions = [
         fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_contact],
         toZigbee: [],
         exposes: [e.battery(), e.contact(), e.battery_voltage(), e.power_outage_count(false)],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.sensor_magnet.aq2'],
@@ -1822,7 +1821,7 @@ const definitions = [
         fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_contact],
         toZigbee: [],
         exposes: [e.battery(), e.contact(), e.device_temperature(), e.battery_voltage(), e.power_outage_count(false), e.trigger_count()],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         configure: async (device) => {
             device.powerSource = 'Battery';
             device.save();
@@ -1845,7 +1844,7 @@ const definitions = [
             e.power_outage_count(false),
             e.trigger_count(),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.flood.agl02'],
@@ -1860,7 +1859,7 @@ const definitions = [
         fromZigbee: [lumi.fromZigbee.lumi_basic, fromZigbee_1.default.ias_water_leak_alarm_1, lumi.fromZigbee.lumi_specific],
         toZigbee: [],
         exposes: [e.battery(), e.water_leak(), e.battery_low(), e.tamper(), e.battery_voltage()],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.sensor_cube', 'lumi.sensor_cube.aqgl01'],
@@ -1883,7 +1882,7 @@ const definitions = [
             e.action(['shake', 'throw', 'wakeup', 'fall', 'tap', 'slide', 'flip180', 'flip90', 'rotate_left', 'rotate_right']),
         ],
         toZigbee: [],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.plug'],
@@ -1981,7 +1980,7 @@ const definitions = [
         model: 'SP-EUC01',
         description: 'Smart plug EU',
         vendor: 'Aqara',
-        extend: [(0, modernExtend_1.forceDeviceType)({ type: 'Router' }), lumiZigbeeOTA()],
+        extend: [m.forceDeviceType({ type: 'Router' }), lumiZigbeeOTA()],
         fromZigbee: [
             fromZigbee_1.default.on_off,
             lumi.fromZigbee.lumi_basic,
@@ -2087,7 +2086,7 @@ const definitions = [
             e.led_disabled_night(),
             e.auto_off(30),
         ],
-        extend: [(0, modernExtend_1.customTimeResponse)('2000_LOCAL')],
+        extend: [m.customTimeResponse('2000_LOCAL')],
     },
     {
         zigbeeModel: ['lumi.ctrl_86plug', 'lumi.ctrl_86plug.aq1'],
@@ -2128,7 +2127,7 @@ const definitions = [
             e.device_temperature(),
             e.power_outage_count(false),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.sensor_natgas'],
@@ -2272,7 +2271,7 @@ const definitions = [
             await endpoint.read('manuSpecificLumi', [0x0126], { manufacturerCode: manufacturerCode });
             await endpoint.read('manuSpecificLumi', [0x014b], { manufacturerCode: manufacturerCode });
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.lock.v1'],
@@ -2307,7 +2306,7 @@ const definitions = [
             e.battery_voltage(),
             e.power_outage_count(false),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
     },
     {
         zigbeeModel: ['lumi.vibration.agl01'],
@@ -2319,9 +2318,9 @@ const definitions = [
             // Doesn't seem to be working at all
             // https://github.com/Koenkk/zigbee2mqtt/issues/21731
             // lumiMiscellaneous(),
-            (0, modernExtend_1.battery)({ voltageToPercentage: { min: 2850, max: 3000 }, voltage: true }),
+            m.battery({ voltageToPercentage: { min: 2850, max: 3000 }, voltage: true }),
             lumiZigbeeOTA(),
-            (0, modernExtend_1.quirkCheckinInterval)('1_HOUR'),
+            m.quirkCheckinInterval('1_HOUR'),
         ],
     },
     {
@@ -2444,7 +2443,7 @@ const definitions = [
                 .withDescription('Performs an automatic calibration process similar to Aqara’s method to set curtain limits.'),
         ],
         extend: [
-            (0, modernExtend_1.windowCovering)({ controls: ['lift'], coverInverted: true, configureReporting: true }),
+            m.windowCovering({ controls: ['lift'], coverInverted: true, configureReporting: true }),
             lumiCurtainSpeed(),
             lumiCurtainManualOpenClose(),
             lumiCurtainAdaptivePullingSpeed(),
@@ -2457,7 +2456,7 @@ const definitions = [
             lumiCurtainCalibrationStatus(),
             lumiCurtainCalibrated(),
             lumiCurtainIdentifyBeep(),
-            (0, modernExtend_1.identify)(),
+            m.identify(),
             lumiZigbeeOTA(),
         ],
     },
@@ -2500,7 +2499,7 @@ const definitions = [
             await endpoint.read('manuSpecificLumi', [0x040a], { manufacturerCode: manufacturerCode });
         },
         extend: [
-            (0, modernExtend_1.quirkAddEndpointCluster)({
+            m.quirkAddEndpointCluster({
                 endpointID: 1,
                 inputClusters: ['manuSpecificLumi'],
             }),
@@ -2615,7 +2614,7 @@ const definitions = [
             lumiOperationMode({ description: 'Decoupled mode for 1st relay', endpointName: 'l1' }),
             lumiOperationMode({ description: 'Decoupled mode for 2nd relay', endpointName: 'l2' }),
             lumiAction({ endpointNames: ['l1', 'l2'] }),
-            (0, modernExtend_1.binary)({
+            m.binary({
                 name: 'interlock',
                 valueOn: ['ON', 1],
                 valueOff: ['OFF', 0],
@@ -2624,7 +2623,7 @@ const definitions = [
                 description: 'Enabling prevents both relays being on at the same time (Interlock)',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'mode',
                 lookup: { power: 0, pulse: 1, dry: 3 },
                 cluster: 'manuSpecificLumi',
@@ -2632,7 +2631,7 @@ const definitions = [
                 description: 'Work mode: Power mode, Dry mode with impulse, Dry mode',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'pulse_length',
                 valueMin: 200,
                 valueMax: 2000,
@@ -2684,7 +2683,7 @@ const definitions = [
             device.type = 'EndDevice';
             device.save();
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.lock.acn03'],
@@ -2716,7 +2715,7 @@ const definitions = [
                 'door_closed',
             ]),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         configure: async (device, coordinatorEndpoint) => {
             // Device advertises itself as Router but is an EndDevice
             device.type = 'EndDevice';
@@ -2753,7 +2752,7 @@ const definitions = [
                 'door_closed',
             ]),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.remote.b286opcn01'],
@@ -2788,7 +2787,7 @@ const definitions = [
         ],
         toZigbee: [lumi.toZigbee.lumi_operation_mode_opple],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.write('manuSpecificLumi', { mode: 1 }, { manufacturerCode: manufacturerCode });
@@ -2840,7 +2839,7 @@ const definitions = [
         ],
         toZigbee: [lumi.toZigbee.lumi_operation_mode_opple],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.write('manuSpecificLumi', { mode: 1 }, { manufacturerCode: manufacturerCode });
@@ -2906,7 +2905,7 @@ const definitions = [
         ],
         toZigbee: [lumi.toZigbee.lumi_operation_mode_opple],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.write('manuSpecificLumi', { mode: 1 }, { manufacturerCode: manufacturerCode });
@@ -2921,7 +2920,7 @@ const definitions = [
         description: 'Mi light sensor',
         fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_specific],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), m.illuminance()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), m.illuminance()],
         exposes: [e.battery(), e.battery_voltage()],
     },
     {
@@ -2942,7 +2941,7 @@ const definitions = [
                 powerOutageMemory: 'enum',
                 levelConfig: { disabledFeatures: ['current_level_startup'] },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'min_brightness',
                 valueMin: 0,
                 valueMax: 99,
@@ -2952,7 +2951,7 @@ const definitions = [
                 description: 'Minimum brightness level',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'max_brightness',
                 valueMin: 1,
                 valueMax: 100,
@@ -2969,7 +2968,7 @@ const definitions = [
         model: 'ZNTGMK11LM',
         vendor: 'Aqara',
         description: 'Smart RGBW light controller',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: undefined }, color: { modes: ['xy', 'hs'] } }), lumiZigbeeOTA()],
+        extend: [m.light({ colorTemp: { range: undefined }, color: { modes: ['xy', 'hs'] } }), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.light.cwacn1'],
@@ -2983,7 +2982,7 @@ const definitions = [
         model: 'HLQDQ01LM',
         vendor: 'Aqara',
         description: 'Smart LED controller',
-        extend: [(0, modernExtend_1.light)(), lumiZigbeeOTA()],
+        extend: [m.light(), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.light.acn004'],
@@ -3185,7 +3184,7 @@ const definitions = [
         vendor: 'Aqara',
         description: 'Wireless remote switch T1 (single rocker)',
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         fromZigbee: [lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_action_multistate, fromZigbee_1.default.battery, lumi.fromZigbee.lumi_specific],
         toZigbee: [],
         exposes: [e.action(['single', 'double', 'hold']), e.battery()],
@@ -3199,7 +3198,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.command_toggle],
         toZigbee: [lumi.toZigbee.lumi_switch_click_mode, lumi.toZigbee.lumi_operation_mode_opple],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } }, multiEndpoint: true },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         exposes: [
             e.battery(),
             e.battery_voltage(),
@@ -3314,15 +3313,15 @@ const definitions = [
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         exposes: [e.device_temperature(), e.battery(), e.battery_voltage()],
         extend: [
-            (0, modernExtend_1.quirkCheckinInterval)('1_HOUR'),
-            (0, modernExtend_1.quirkAddEndpointCluster)({
+            m.quirkCheckinInterval('1_HOUR'),
+            m.quirkAddEndpointCluster({
                 endpointID: 1,
                 inputClusters: ['msTemperatureMeasurement', 'msRelativeHumidity', 'genAnalogInput', 'manuSpecificLumi'],
             }),
             lumiAirQuality(),
             lumiVoc(),
-            (0, modernExtend_1.temperature)(),
-            (0, modernExtend_1.humidity)(),
+            m.temperature(),
+            m.humidity(),
             lumiDisplayUnit(),
             lumiOutageCountRestoreBindReporting(),
             lumiZigbeeOTA(),
@@ -3435,7 +3434,7 @@ const definitions = [
             const endpoint1 = device.getEndpoint(1);
             await endpoint1.write('manuSpecificLumi', { mode: 1 }, { manufacturerCode: manufacturerCode, disableResponse: true });
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.sen_ill.agl01'],
@@ -3460,7 +3459,7 @@ const definitions = [
             await device.getEndpoint(1).write('manuSpecificLumi', { mode: 1 }, { manufacturerCode: manufacturerCode, disableResponse: true });
             await endpoint.read('manuSpecificLumi', [0x0000], { manufacturerCode: manufacturerCode });
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA(), m.illuminance({ reporting: false })],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA(), m.illuminance({ reporting: false })],
     },
     {
         zigbeeModel: ['lumi.plug.sacn03'],
@@ -3511,7 +3510,7 @@ const definitions = [
         toZigbee: [],
         exposes: [e.contact(), e.battery(), e.battery_voltage()],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.plug.sacn02'],
@@ -3546,13 +3545,13 @@ const definitions = [
         vendor: 'Aqara',
         description: 'Smart rotary knob H1 (wireless)',
         extend: [
-            (0, modernExtend_1.quirkCheckinInterval)('1_HOUR'),
+            m.quirkCheckinInterval('1_HOUR'),
             lumiPreventReset(),
             lumiCommandMode(),
             lumiAction({ actionLookup: { hold: 0, single: 1, double: 2, release: 255 } }),
             lumiBattery({ voltageToPercentage: { min: 2850, max: 3000 } }),
             lumiKnobRotation(),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'sensitivity',
                 lookup: { low: 720, medium: 360, high: 180 },
                 cluster: 'manuSpecificLumi',
@@ -3568,7 +3567,7 @@ const definitions = [
         vendor: 'Aqara',
         description: 'Wireless remote switch E1 (single rocker)',
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         fromZigbee: [lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [lumi.toZigbee.lumi_switch_click_mode],
         exposes: [
@@ -3590,7 +3589,7 @@ const definitions = [
         vendor: 'Aqara',
         description: 'Wireless remote switch E1 (double rocker)',
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiPreventReset()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiPreventReset()],
         exposes: [
             e.battery(),
             e.battery_voltage(),
@@ -3627,7 +3626,7 @@ const definitions = [
                 .withDescription('Operation mode, select "command" to enable bindings (wake up the device before changing modes!)'),
         ],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint1 = device.getEndpoint(1);
             await endpoint1.write('manuSpecificLumi', { mode: 1 }, { manufacturerCode: manufacturerCode, disableResponse: true });
@@ -3679,7 +3678,7 @@ const definitions = [
             await endpoint.read('manuSpecificLumi', [0x040a], { manufacturerCode: manufacturerCode });
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
         },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['aqara.feeder.acn001'],
@@ -3755,7 +3754,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         exposes: [
             e.battery(),
             e.battery_voltage(),
@@ -3772,7 +3771,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.command_toggle],
         toZigbee: [lumi.toZigbee.lumi_switch_click_mode, lumi.toZigbee.lumi_operation_mode_opple],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } }, multiEndpoint: true },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR')],
+        extend: [m.quirkCheckinInterval('1_HOUR')],
         exposes: [
             e.battery(),
             e.battery_voltage(),
@@ -3845,7 +3844,7 @@ const definitions = [
                 'button_3_triple',
             ]),
         ],
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
     },
     {
         zigbeeModel: ['lumi.switch.acn048'],
@@ -3872,7 +3871,7 @@ const definitions = [
         extend: [
             lumiZigbeeOTA(),
             lumiPreventReset(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { top: 1, bottom: 2 } }),
+            m.deviceEndpoints({ endpoints: { top: 1, bottom: 2 } }),
             lumiOnOff({
                 operationMode: true,
                 powerOutageMemory: 'enum',
@@ -3895,7 +3894,7 @@ const definitions = [
         extend: [
             lumiZigbeeOTA(),
             lumiPreventReset(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { top: 1, center: 2, bottom: 3 } }),
+            m.deviceEndpoints({ endpoints: { top: 1, center: 2, bottom: 3 } }),
             lumiOnOff({
                 operationMode: true,
                 powerOutageMemory: 'enum',
@@ -3918,7 +3917,7 @@ const definitions = [
         extend: [
             lumiZigbeeOTA(),
             lumiPreventReset(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { top: 1, center: 2, bottom: 3, wireless: 4 } }),
+            m.deviceEndpoints({ endpoints: { top: 1, center: 2, bottom: 3, wireless: 4 } }),
             lumiOnOff({
                 operationMode: true,
                 powerOutageMemory: 'enum',
@@ -3961,7 +3960,7 @@ const definitions = [
         extend: [
             lumiZigbeeOTA(),
             lumiPreventReset(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { top: 1, bottom: 2 } }),
+            m.deviceEndpoints({ endpoints: { top: 1, bottom: 2 } }),
             lumiOnOff({
                 operationMode: true,
                 powerOutageMemory: 'enum',
@@ -3987,7 +3986,7 @@ const definitions = [
         extend: [
             lumiZigbeeOTA(),
             lumiPreventReset(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { top: 1, center: 2, bottom: 3 } }),
+            m.deviceEndpoints({ endpoints: { top: 1, center: 2, bottom: 3 } }),
             lumiOnOff({
                 operationMode: true,
                 powerOutageMemory: 'enum',
@@ -4013,7 +4012,7 @@ const definitions = [
         extend: [
             lumiZigbeeOTA(),
             lumiPreventReset(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { top: 1, center: 2, bottom: 3, wireless: 4 } }),
+            m.deviceEndpoints({ endpoints: { top: 1, center: 2, bottom: 3, wireless: 4 } }),
             lumiOnOff({
                 operationMode: true,
                 powerOutageMemory: 'enum',
@@ -4056,7 +4055,7 @@ const definitions = [
         whiteLabel: [{ vendor: 'Aqara', model: 'MFCZQ12LM' }],
         description: 'Cube T1 Pro',
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        extend: [(0, modernExtend_1.quirkCheckinInterval)('1_HOUR'), lumiZigbeeOTA()],
+        extend: [m.quirkCheckinInterval('1_HOUR'), lumiZigbeeOTA()],
         fromZigbee: [
             lumi.fromZigbee.lumi_specific,
             lumi.fromZigbee.lumi_action_multistate,
@@ -4301,7 +4300,7 @@ const definitions = [
             lumiOverloadProtection(),
             lumiLedIndicator(),
             lumiButtonLock(),
-            (0, modernExtend_1.binary)({
+            m.binary({
                 name: 'charging_protection',
                 cluster: 'manuSpecificLumi',
                 attribute: { ID: 0x0202, type: 0x10 },
@@ -4311,7 +4310,7 @@ const definitions = [
                 access: 'ALL',
                 zigbeeCommandOptions: { manufacturerCode },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'charging_limit',
                 cluster: 'manuSpecificLumi',
                 attribute: { ID: 0x0206, type: 0x39 },
@@ -4331,7 +4330,7 @@ const definitions = [
         vendor: 'Aqara',
         description: 'Ceiling light T1',
         extend: [
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { white: 1, rgb: 2 } }),
+            m.deviceEndpoints({ endpoints: { white: 1, rgb: 2 } }),
             lumiLight({ colorTemp: true, powerOutageMemory: 'light', endpointNames: ['white'] }),
             lumiLight({ colorTemp: true, deviceTemperature: false, powerOutageCount: false, color: { modes: ['xy', 'hs'] }, endpointNames: ['rgb'] }),
             lumiZigbeeOTA(),
@@ -4343,11 +4342,11 @@ const definitions = [
         vendor: 'Aqara',
         description: 'Ceiling light T1M',
         extend: [
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { white: 1, rgb: 2 } }),
+            m.deviceEndpoints({ endpoints: { white: 1, rgb: 2 } }),
             lumiLight({ colorTemp: true, endpointNames: ['white'] }),
             lumiLight({ colorTemp: true, deviceTemperature: false, powerOutageCount: false, color: { modes: ['xy', 'hs'] }, endpointNames: ['rgb'] }),
             lumiZigbeeOTA(),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'power_on_behaviour',
                 lookup: { on: 0, previous: 1, off: 2 },
                 cluster: 'manuSpecificLumi',
@@ -4364,7 +4363,7 @@ const definitions = [
         description: 'Smart rotary knob H1 (with neutral)',
         extend: [
             lumiPreventReset(),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { left: 1, center: 2, right: 3 } }),
+            m.deviceEndpoints({ endpoints: { left: 1, center: 2, right: 3 } }),
             lumiOnOff({ powerOutageMemory: 'binary', endpointNames: ['left', 'center', 'right'] }),
             lumiCommandMode(),
             lumiAction({ actionLookup: { hold: 0, single: 1, double: 2, release: 255 } }),
@@ -4379,7 +4378,7 @@ const definitions = [
         model: 'VC-X01D',
         vendor: 'Aqara',
         description: 'Valve controller T1',
-        extend: [lumiZigbeeOTA(), (0, modernExtend_1.onOff)({ powerOnBehavior: false }), (0, modernExtend_1.battery)()],
+        extend: [lumiZigbeeOTA(), m.onOff({ powerOnBehavior: false }), m.battery()],
     },
 ];
 exports.default = definitions;