zigbee-herdsman-converters 23.0.0 → 23.1.0

package/dist/devices/lumi.js

@@ -32,13 +32,10 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.definitions = void 0;
-const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
-const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
+const fz = __importStar(require("../converters/fromZigbee"));
+const tz = __importStar(require("../converters/toZigbee"));
 const exposes = __importStar(require("../lib/exposes"));
 const logger_1 = require("../lib/logger");
 const lumi = __importStar(require("../lib/lumi"));
@@ -56,7 +53,7 @@ exports.definitions = [
         model: "SJCGQ13LM",
         vendor: "Aqara",
         description: "Water leak sensor E1",
-        fromZigbee: [fromZigbee_1.default.ias_water_leak_alarm_1, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.battery],
+        fromZigbee: [fz.ias_water_leak_alarm_1, lumi.fromZigbee.lumi_specific, fz.battery],
         toZigbee: [],
         exposes: [e.water_leak(), e.battery(), e.battery_low(), e.battery_voltage(), e.device_temperature(), e.power_outage_count(false)],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
@@ -71,7 +68,7 @@ exports.definitions = [
         model: "KQJCMB11LM",
         vendor: "Aqara",
         description: "Air monitoring panel S1",
-        fromZigbee: [fromZigbee_1.default.temperature, fromZigbee_1.default.humidity, lumi.fromZigbee.lumi_pm25, lumi.fromZigbee.lumi_co2],
+        fromZigbee: [fz.temperature, fz.humidity, lumi.fromZigbee.lumi_pm25, lumi.fromZigbee.lumi_co2],
         toZigbee: [],
         exposes: [e.temperature(), e.humidity(), e.pm25(), e.co2()],
         extend: [lumiZigbeeOTA()],
@@ -81,7 +78,7 @@ exports.definitions = [
         model: "MCCGQ14LM",
         vendor: "Aqara",
         description: "Door and window sensor E1",
-        fromZigbee: [fromZigbee_1.default.ias_contact_alarm_1, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.battery],
+        fromZigbee: [fz.ias_contact_alarm_1, lumi.fromZigbee.lumi_specific, fz.battery],
         toZigbee: [],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         exposes: [e.contact(), e.battery(), e.battery_low(), e.battery_voltage()],
@@ -101,7 +98,7 @@ exports.definitions = [
         model: "MCCGQ13LM",
         vendor: "Aqara",
         description: "Door and window sensor P1",
-        fromZigbee: [lumi.fromZigbee.lumi_contact, fromZigbee_1.default.ias_contact_alarm_1, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [lumi.fromZigbee.lumi_contact, fz.ias_contact_alarm_1, lumi.fromZigbee.lumi_specific],
         toZigbee: [lumi.toZigbee.lumi_detection_distance],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         exposes: [
@@ -428,9 +425,9 @@ exports.definitions = [
         model: "WS-USC01",
         vendor: "Aqara",
         description: "Smart wall switch (no neutral, single rocker), US",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_flip_indicator_light,
             lumi.toZigbee.lumi_switch_mode_switch,
@@ -462,9 +459,9 @@ exports.definitions = [
         model: "WS-USC02",
         vendor: "Aqara",
         description: "Smart wall switch (no neutral, double rocker), US",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_flip_indicator_light,
             lumi.toZigbee.lumi_switch_power_outage_memory,
@@ -501,9 +498,9 @@ exports.definitions = [
         model: "WS-USC03",
         vendor: "Aqara",
         description: "Smart wall switch (with neutral, single rocker), US",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_power,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
@@ -533,9 +530,9 @@ exports.definitions = [
         model: "WS-USC04",
         vendor: "Aqara",
         description: "Smart wall switch (with neutral, double rocker), US",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_power,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
@@ -572,9 +569,9 @@ exports.definitions = [
         model: "QBKG27LM",
         vendor: "Aqara",
         description: "Smart wall switch H1 (no neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -604,9 +601,9 @@ exports.definitions = [
         model: "QBKG28LM",
         vendor: "Aqara",
         description: "Smart wall switch H1 (no neutral, double rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_flip_indicator_light,
@@ -641,9 +638,9 @@ exports.definitions = [
         model: "QBKG29LM",
         vendor: "Aqara",
         description: "Smart wall switch H1 (no neutral, triple rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_flip_indicator_light,
@@ -697,9 +694,9 @@ exports.definitions = [
         model: "QBKG30LM",
         vendor: "Aqara",
         description: "Smart wall switch H1 Pro (with neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -729,9 +726,9 @@ exports.definitions = [
         endpoint: (device) => {
             return { left: 1, right: 2 };
         },
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -763,9 +760,9 @@ exports.definitions = [
         endpoint: (device) => {
             return { left: 1, center: 2, right: 3 };
         },
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -813,9 +810,9 @@ exports.definitions = [
         model: "WS-EUK01",
         vendor: "Aqara",
         description: "Smart wall switch H1 EU (no neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_flip_indicator_light,
@@ -848,9 +845,9 @@ exports.definitions = [
         model: "WS-EUK02",
         vendor: "Aqara",
         description: "Smart wall switch H1 EU (no neutral, double rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_flip_indicator_light,
@@ -886,10 +883,10 @@ exports.definitions = [
         model: "WS-EUK03",
         vendor: "Aqara",
         description: "Smart wall switch H1 EU (with neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
-            toZigbee_1.default.electrical_measurement_power,
+            tz.on_off,
+            tz.electrical_measurement_power,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_flip_indicator_light,
@@ -919,9 +916,9 @@ exports.definitions = [
         model: "WS-EUK04",
         vendor: "Aqara",
         description: "Smart wall switch H1 EU (with neutral, double rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_power,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
@@ -964,7 +961,7 @@ exports.definitions = [
             e.action(["release", "hold", "double", "single", "hold_release"]),
             e.enum("operation_mode", ea.STATE_SET, ["control_relay", "decoupled"]).withDescription("Decoupled mode"),
         ],
-        toZigbee: [toZigbee_1.default.on_off, { ...lumi.toZigbee.lumi_switch_operation_mode_basic, convertGet: null }],
+        toZigbee: [tz.on_off, { ...lumi.toZigbee.lumi_switch_operation_mode_basic, convertGet: null }],
         endpoint: (device) => {
             return { system: 1, default: 2 };
         },
@@ -986,7 +983,7 @@ exports.definitions = [
             lumi.fromZigbee.lumi_on_off,
             lumi.fromZigbee.lumi_basic,
             lumi.fromZigbee.lumi_operation_mode_basic,
-            fromZigbee_1.default.ignore_multistate_report,
+            fz.ignore_multistate_report,
             lumi.fromZigbee.lumi_power,
         ],
         exposes: [
@@ -997,7 +994,7 @@ exports.definitions = [
             e.action(["single", "double", "release", "hold"]),
             e.enum("operation_mode", ea.ALL, ["control_relay", "decoupled"]).withDescription("Decoupled mode"),
         ],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic, lumi.toZigbee.lumi_power],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic, lumi.toZigbee.lumi_power],
         endpoint: (device) => {
             return { system: 1 };
         },
@@ -1039,7 +1036,7 @@ exports.definitions = [
                 .withEndpoint("right")
                 .withCategory("config"),
         ],
-        toZigbee: [toZigbee_1.default.on_off, { ...lumi.toZigbee.lumi_switch_operation_mode_basic, convertGet: null }, lumi.toZigbee.lumi_power],
+        toZigbee: [tz.on_off, { ...lumi.toZigbee.lumi_switch_operation_mode_basic, convertGet: null }, lumi.toZigbee.lumi_power],
         meta: { multiEndpoint: true },
         endpoint: (device) => {
             return { system: 1, left: 2, right: 3 };
@@ -1094,7 +1091,7 @@ exports.definitions = [
                 .withEndpoint("right"),
         ],
         meta: { multiEndpoint: true, multiEndpointSkip: ["power", "energy"] },
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic, lumi.toZigbee.lumi_power],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic, lumi.toZigbee.lumi_power],
         endpoint: (device) => {
             return { left: 1, right: 2, system: 1 };
         },
@@ -1143,7 +1140,7 @@ exports.definitions = [
             e.action(["release", "hold", "double", "single", "hold_release"]),
             e.enum("operation_mode", ea.ALL, ["control_relay", "decoupled"]).withDescription("Decoupled mode"),
         ],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic],
         endpoint: (device) => {
             return { system: 1, default: 2 };
         },
@@ -1184,7 +1181,7 @@ exports.definitions = [
                 .withDescription("Operation mode for right button")
                 .withEndpoint("right"),
         ],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_switch_operation_mode_basic],
         meta: { multiEndpoint: true },
         endpoint: (device) => {
             return { system: 1, left: 2, right: 3 };
@@ -1201,9 +1198,9 @@ exports.definitions = [
         model: "QBKG25LM",
         vendor: "Aqara",
         description: "Smart wall switch D1 (no neutral, triple rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -1293,9 +1290,9 @@ exports.definitions = [
                 "double_all",
             ]),
         ],
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_action_multistate],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -1315,8 +1312,8 @@ exports.definitions = [
         model: "QBKG23LM",
         vendor: "Aqara",
         description: "Smart wall switch D1 (with neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_action_multistate],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_power, lumi.toZigbee.lumi_switch_operation_mode_basic],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_action_multistate],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_power, lumi.toZigbee.lumi_switch_operation_mode_basic],
         endpoint: (device) => {
             return { system: 1 };
         },
@@ -1342,14 +1339,14 @@ exports.definitions = [
         vendor: "Aqara",
         description: "Smart wall switch D1 (with neutral, double rocker)",
         fromZigbee: [
-            fromZigbee_1.default.on_off,
+            fz.on_off,
             lumi.fromZigbee.lumi_power,
             lumi.fromZigbee.lumi_action_multistate,
             lumi.fromZigbee.lumi_operation_mode_basic,
             lumi.fromZigbee.lumi_specific,
             lumi.fromZigbee.lumi_basic,
         ],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_power, lumi.toZigbee.lumi_switch_operation_mode_basic],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_power, lumi.toZigbee.lumi_switch_operation_mode_basic],
         meta: { multiEndpoint: true, multiEndpointSkip: ["power", "energy"] },
         endpoint: (device) => {
             return { left: 1, right: 2, system: 1 };
@@ -1500,7 +1497,7 @@ exports.definitions = [
         ],
         description: "Mi temperature and humidity sensor",
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_temperature, fromZigbee_1.default.humidity],
+        fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_temperature, fz.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
         extend: [m.quirkCheckinInterval("1_HOUR")],
@@ -1511,7 +1508,7 @@ exports.definitions = [
         vendor: "Aqara",
         description: "Temperature and humidity sensor",
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_temperature, fromZigbee_1.default.humidity, fromZigbee_1.default.pressure],
+        fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_temperature, fz.humidity, fz.pressure],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.pressure(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint) => {
@@ -1529,7 +1526,7 @@ exports.definitions = [
             { vendor: "Aqara", model: "TH-S02D" },
             { vendor: "Yandex", model: "YNDX-00523" },
         ],
-        fromZigbee: [lumi.fromZigbee.lumi_specific, fromZigbee_1.default.temperature, fromZigbee_1.default.humidity, lumi.fromZigbee.lumi_pressure, fromZigbee_1.default.battery],
+        fromZigbee: [lumi.fromZigbee.lumi_specific, fz.temperature, fz.humidity, lumi.fromZigbee.lumi_pressure, fz.battery],
         toZigbee: [],
         exposes: [e.temperature(), e.humidity(), e.pressure(), e.device_temperature(), e.battery(), e.battery_voltage(), e.power_outage_count(false)],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
@@ -1553,7 +1550,7 @@ exports.definitions = [
         ],
         description: "Mi motion sensor",
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        fromZigbee: [lumi.fromZigbee.lumi_basic, fromZigbee_1.default.occupancy_with_timeout],
+        fromZigbee: [lumi.fromZigbee.lumi_basic, fz.occupancy_with_timeout],
         toZigbee: [],
         exposes: [e.battery(), e.occupancy(), e.battery_voltage(), e.power_outage_count(false)],
         extend: [m.quirkCheckinInterval("1_HOUR")],
@@ -1564,7 +1561,7 @@ exports.definitions = [
         vendor: "Aqara",
         description: "Motion sensor",
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        fromZigbee: [lumi.fromZigbee.lumi_basic, fromZigbee_1.default.occupancy_with_timeout, lumi.fromZigbee.lumi_illuminance],
+        fromZigbee: [lumi.fromZigbee.lumi_basic, fz.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: [m.quirkCheckinInterval("1_HOUR")],
@@ -1575,7 +1572,7 @@ exports.definitions = [
         vendor: "Aqara",
         description: "Motion sensor T1",
         whiteLabel: [{ vendor: "Yandex", model: "YNDX-00522" }],
-        fromZigbee: [lumi.fromZigbee.lumi_occupancy_illuminance, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.battery],
+        fromZigbee: [lumi.fromZigbee.lumi_occupancy_illuminance, lumi.fromZigbee.lumi_specific, fz.battery],
         toZigbee: [lumi.toZigbee.lumi_detection_interval],
         exposes: [
             e.occupancy(),
@@ -1604,7 +1601,7 @@ exports.definitions = [
         model: "RTCGQ13LM",
         vendor: "Aqara",
         description: "High precision motion sensor",
-        fromZigbee: [lumi.fromZigbee.lumi_occupancy, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.battery],
+        fromZigbee: [lumi.fromZigbee.lumi_occupancy, lumi.fromZigbee.lumi_specific, fz.battery],
         toZigbee: [lumi.toZigbee.lumi_detection_interval, lumi.toZigbee.lumi_motion_sensitivity],
         exposes: [
             e.occupancy(),
@@ -1635,7 +1632,7 @@ exports.definitions = [
         vendor: "Aqara",
         whiteLabel: [{ vendor: "Aqara", model: "MS-S02" }],
         description: "Motion sensor P1",
-        fromZigbee: [lumi.fromZigbee.lumi_occupancy_illuminance, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.battery],
+        fromZigbee: [lumi.fromZigbee.lumi_occupancy_illuminance, lumi.fromZigbee.lumi_specific, fz.battery],
         toZigbee: [lumi.toZigbee.lumi_detection_interval, lumi.toZigbee.lumi_motion_sensitivity, lumi.toZigbee.lumi_trigger_indicator],
         exposes: [
             e.occupancy(),
@@ -1670,7 +1667,7 @@ exports.definitions = [
         model: "RTCGQ15LM",
         vendor: "Aqara",
         description: "Motion sensor E1",
-        fromZigbee: [lumi.fromZigbee.lumi_occupancy_illuminance, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.battery],
+        fromZigbee: [lumi.fromZigbee.lumi_occupancy_illuminance, lumi.fromZigbee.lumi_specific, fz.battery],
         toZigbee: [lumi.toZigbee.lumi_detection_interval],
         exposes: [
             e.occupancy(),
@@ -1837,7 +1834,7 @@ exports.definitions = [
         vendor: "Aqara",
         description: "Water leak sensor",
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        fromZigbee: [lumi.fromZigbee.lumi_basic, fromZigbee_1.default.ias_water_leak_alarm_1],
+        fromZigbee: [lumi.fromZigbee.lumi_basic, fz.ias_water_leak_alarm_1],
         toZigbee: [],
         exposes: [
             e.battery(),
@@ -1860,7 +1857,7 @@ exports.definitions = [
             { vendor: "Yandex", model: "YNDX-00521" },
         ],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        fromZigbee: [lumi.fromZigbee.lumi_basic, fromZigbee_1.default.ias_water_leak_alarm_1, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [lumi.fromZigbee.lumi_basic, fz.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: [m.quirkCheckinInterval("1_HOUR"), lumiZigbeeOTA()],
@@ -1893,8 +1890,8 @@ exports.definitions = [
         model: "ZNCZ02LM",
         description: "Mi smart plug",
         vendor: "Xiaomi",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic, fromZigbee_1.default.ignore_occupancy_report, fromZigbee_1.default.ignore_illuminance_report],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_power_outage_memory, lumi.toZigbee.lumi_power],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic, fz.ignore_occupancy_report, fz.ignore_illuminance_report],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_switch_power_outage_memory, lumi.toZigbee.lumi_power],
         exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature(), e.power_outage_memory()],
         extend: [lumiZigbeeOTA()],
     },
@@ -1903,8 +1900,8 @@ exports.definitions = [
         model: "ZNCZ03LM",
         description: "Mi smart plug TW",
         vendor: "Xiaomi",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic, fromZigbee_1.default.ignore_occupancy_report, fromZigbee_1.default.ignore_illuminance_report],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_power],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic, fz.ignore_occupancy_report, fz.ignore_illuminance_report],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_power],
         exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE), e.voltage()],
     },
     {
@@ -1913,15 +1910,15 @@ exports.definitions = [
         description: "Mi smart plug EU",
         vendor: "Xiaomi",
         fromZigbee: [
-            fromZigbee_1.default.on_off,
+            fz.on_off,
             lumi.fromZigbee.lumi_power,
             lumi.fromZigbee.lumi_specific,
-            fromZigbee_1.default.ignore_occupancy_report,
-            fromZigbee_1.default.ignore_illuminance_report,
-            fromZigbee_1.default.ignore_time_read,
+            fz.ignore_occupancy_report,
+            fz.ignore_illuminance_report,
+            fz.ignore_time_read,
         ],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_power,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_auto_off,
@@ -1949,15 +1946,15 @@ exports.definitions = [
         description: "Smart plug US",
         vendor: "Aqara",
         fromZigbee: [
-            fromZigbee_1.default.on_off,
+            fz.on_off,
             lumi.fromZigbee.lumi_power,
             lumi.fromZigbee.lumi_specific,
             lumi.fromZigbee.lumi_basic,
-            fromZigbee_1.default.ignore_occupancy_report,
-            fromZigbee_1.default.ignore_illuminance_report,
+            fz.ignore_occupancy_report,
+            fz.ignore_illuminance_report,
         ],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_power,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_auto_off,
@@ -1986,16 +1983,16 @@ exports.definitions = [
         vendor: "Aqara",
         extend: [m.forceDeviceType({ type: "Router" }), lumiZigbeeOTA()],
         fromZigbee: [
-            fromZigbee_1.default.on_off,
+            fz.on_off,
             lumi.fromZigbee.lumi_basic,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
+            fz.electrical_measurement,
+            fz.metering,
             lumi.fromZigbee.lumi_specific,
             lumi.fromZigbee.lumi_power,
-            fromZigbee_1.default.device_temperature,
+            fz.device_temperature,
         ],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
             lumi.toZigbee.lumi_overload_protection,
@@ -2072,9 +2069,9 @@ exports.definitions = [
         model: "ZNCZ11LM",
         vendor: "Aqara",
         description: "Smart plug",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, fromZigbee_1.default.ignore_occupancy_report, lumi.fromZigbee.lumi_basic],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, fz.ignore_occupancy_report, lumi.fromZigbee.lumi_basic],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_power,
             lumi.toZigbee.lumi_led_disabled_night,
             lumi.toZigbee.lumi_switch_power_outage_memory,
@@ -2097,8 +2094,8 @@ exports.definitions = [
         model: "QBCZ11LM",
         description: "Smart wall outlet",
         vendor: "Aqara",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_power_outage_memory, lumi.toZigbee.lumi_power],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_basic],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_switch_power_outage_memory, lumi.toZigbee.lumi_power],
         exposes: [
             e.switch(),
             e.power().withAccess(ea.STATE_GET),
@@ -2139,7 +2136,7 @@ exports.definitions = [
         vendor: "Xiaomi",
         whiteLabel: [{ vendor: "Xiaomi", model: "YTC4019RT" }],
         description: "Mijia Honeywell gas leak detector",
-        fromZigbee: [fromZigbee_1.default.ias_gas_alarm_1, lumi.fromZigbee.lumi_gas_sensitivity, lumi.fromZigbee.lumi_gas_density],
+        fromZigbee: [fz.ias_gas_alarm_1, lumi.fromZigbee.lumi_gas_sensitivity, lumi.fromZigbee.lumi_gas_density],
         toZigbee: [lumi.toZigbee.lumi_sensitivity, lumi.toZigbee.lumi_selftest],
         exposes: [
             e.gas(),
@@ -2223,7 +2220,7 @@ exports.definitions = [
         vendor: "Aqara",
         description: "Smart smoke detector",
         whiteLabel: [{ vendor: "Aqara", model: "JY-GZ-03AQ" }],
-        fromZigbee: [lumi.fromZigbee.lumi_specific, fromZigbee_1.default.battery],
+        fromZigbee: [lumi.fromZigbee.lumi_specific, fz.battery],
         toZigbee: [
             lumi.toZigbee.lumi_alarm,
             lumi.toZigbee.lumi_density,
@@ -2473,7 +2470,7 @@ exports.definitions = [
         fromZigbee: [
             lumi.fromZigbee.lumi_curtain_position,
             lumi.fromZigbee.lumi_curtain_status,
-            fromZigbee_1.default.ignore_basic_report,
+            fz.ignore_basic_report,
             lumi.fromZigbee.lumi_specific,
         ],
         toZigbee: [lumi.toZigbee.lumi_curtain_position_state, lumi.toZigbee.lumi_curtain_battery, lumi.toZigbee.lumi_curtain_charging_status],
@@ -2521,7 +2518,7 @@ exports.definitions = [
             { vendor: "Aqara", model: "CM-M01R" },
         ],
         description: "Curtain driver E1",
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_curtain_position_tilt, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.power_source],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_curtain_position_tilt, lumi.fromZigbee.lumi_specific, fz.power_source],
         toZigbee: [
             lumi.toZigbee.lumi_curtain_position_state,
             lumi.toZigbee.lumi_curtain_battery_voltage,
@@ -2529,8 +2526,8 @@ exports.definitions = [
             lumi.toZigbee.lumi_curtain_hooks_state,
             lumi.toZigbee.lumi_curtain_hand_open,
             lumi.toZigbee.lumi_curtain_limits_calibration,
-            toZigbee_1.default.power_source,
-            toZigbee_1.default.battery_percentage_remaining,
+            tz.power_source,
+            tz.battery_percentage_remaining,
         ],
         exposes: [
             e.cover_position().setAccess("state", ea.ALL),
@@ -2567,9 +2564,9 @@ exports.definitions = [
         model: "LLKZMK11LM",
         vendor: "Aqara",
         description: "Dual relay module",
-        fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_power, fromZigbee_1.default.ignore_multistate_report, fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_basic_raw],
+        fromZigbee: [lumi.fromZigbee.lumi_basic, lumi.fromZigbee.lumi_power, fz.ignore_multistate_report, fz.on_off, lumi.fromZigbee.lumi_basic_raw],
         meta: { multiEndpoint: true },
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_interlock, lumi.toZigbee.lumi_power, lumi.toZigbee.lumi_switch_power_outage_memory],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_interlock, lumi.toZigbee.lumi_power, lumi.toZigbee.lumi_switch_power_outage_memory],
         endpoint: (device) => {
             return { l1: 1, l2: 2 };
         },
@@ -2597,8 +2594,8 @@ exports.definitions = [
         vendor: "Aqara",
         whiteLabel: [{ vendor: "Aqara", model: "DCM-K01" }],
         description: "Dual relay module T2",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_power],
-        toZigbee: [toZigbee_1.default.on_off],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_power],
+        toZigbee: [tz.on_off],
         meta: { multiEndpoint: true, multiEndpointSkip: ["power", "energy"] },
         endpoint: (device) => {
             return { l1: 1, l2: 2 };
@@ -2694,7 +2691,7 @@ exports.definitions = [
         model: "ZNMS13LM",
         description: "Smart door lock S2 Pro",
         vendor: "Aqara",
-        fromZigbee: [lumi.fromZigbee.lumi_door_lock_report, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [lumi.fromZigbee.lumi_door_lock_report, fz.ignore_basic_report],
         toZigbee: [],
         exposes: [
             e.binary("state", ea.STATE, "UNLOCK", "LOCK"),
@@ -2731,7 +2728,7 @@ exports.definitions = [
         model: "ZNMS11LM",
         description: "Smart door lock",
         vendor: "Aqara",
-        fromZigbee: [lumi.fromZigbee.lumi_door_lock_report, fromZigbee_1.default.ignore_basic_report],
+        fromZigbee: [lumi.fromZigbee.lumi_door_lock_report, fz.ignore_basic_report],
         toZigbee: [],
         exposes: [
             e.binary("state", ea.STATE, "UNLOCK", "LOCK"),
@@ -2766,7 +2763,7 @@ exports.definitions = [
         fromZigbee: [
             lumi.fromZigbee.lumi_action_on,
             lumi.fromZigbee.lumi_action_off,
-            fromZigbee_1.default.battery,
+            fz.battery,
             lumi.fromZigbee.lumi_action_multistate,
             lumi.fromZigbee.lumi_specific,
         ],
@@ -2808,7 +2805,7 @@ exports.definitions = [
             lumi.fromZigbee.lumi_action_off,
             lumi.fromZigbee.lumi_action_step,
             lumi.fromZigbee.lumi_action_step_color_temp,
-            fromZigbee_1.default.battery,
+            fz.battery,
             lumi.fromZigbee.lumi_action_multistate,
             lumi.fromZigbee.lumi_specific,
         ],
@@ -2863,7 +2860,7 @@ exports.definitions = [
             lumi.fromZigbee.lumi_action_stop,
             lumi.fromZigbee.lumi_action_step_color_temp,
             lumi.fromZigbee.lumi_action_move_color_temp,
-            fromZigbee_1.default.battery,
+            fz.battery,
             lumi.fromZigbee.lumi_action_multistate,
             lumi.fromZigbee.lumi_specific,
         ],
@@ -2922,7 +2919,7 @@ exports.definitions = [
         vendor: "Xiaomi",
         whiteLabel: [{ vendor: "Xiaomi", model: "YTC4043GL" }],
         description: "Mi light sensor",
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_specific],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         extend: [m.quirkCheckinInterval("1_HOUR"), m.illuminance()],
         exposes: [e.battery(), e.battery_voltage()],
@@ -3023,11 +3020,11 @@ exports.definitions = [
         description: "Single switch module T1 (with neutral)",
         // Ignore energy metering reports, rely on aqara_opple: https://github.com/Koenkk/zigbee2mqtt/issues/10709
         fromZigbee: [
-            fromZigbee_1.default.on_off,
-            fromZigbee_1.default.device_temperature,
+            fz.on_off,
+            fz.device_temperature,
             lumi.fromZigbee.lumi_specific,
-            fromZigbee_1.default.ignore_metering,
-            fromZigbee_1.default.ignore_electrical_measurement,
+            fz.ignore_metering,
+            fz.ignore_electrical_measurement,
             lumi.fromZigbee.lumi_power,
         ],
         exposes: [
@@ -3041,7 +3038,7 @@ exports.definitions = [
             e.voltage(),
             e.current(),
         ],
-        toZigbee: [lumi.toZigbee.lumi_switch_type, toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_power_outage_memory, lumi.toZigbee.lumi_led_disabled_night],
+        toZigbee: [lumi.toZigbee.lumi_switch_type, tz.on_off, lumi.toZigbee.lumi_switch_power_outage_memory, lumi.toZigbee.lumi_led_disabled_night],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff", "genDeviceTempCfg"]);
@@ -3058,9 +3055,9 @@ exports.definitions = [
         model: "DLKZMK11LM",
         vendor: "Aqara",
         description: "Single switch module T1 (with neutral), CN",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_power,
             lumi.toZigbee.lumi_switch_type,
             lumi.toZigbee.lumi_switch_power_outage_memory,
@@ -3089,9 +3086,9 @@ exports.definitions = [
         model: "SSM-U02",
         vendor: "Aqara",
         description: "Single switch module T1 (no neutral)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_specific],
         exposes: [e.switch(), e.power_outage_memory(), e.switch_type(), e.power_outage_count(), e.device_temperature()],
-        toZigbee: [lumi.toZigbee.lumi_switch_type, toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_power_outage_memory],
+        toZigbee: [lumi.toZigbee.lumi_switch_type, tz.on_off, lumi.toZigbee.lumi_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff"]);
@@ -3105,9 +3102,9 @@ exports.definitions = [
         model: "DLKZMK12LM",
         vendor: "Aqara",
         description: "Single switch module T1 (no neutral), CN",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_specific],
         exposes: [e.switch(), e.power_outage_memory(), e.switch_type()],
-        toZigbee: [lumi.toZigbee.lumi_switch_type, toZigbee_1.default.on_off, lumi.toZigbee.lumi_switch_power_outage_memory],
+        toZigbee: [lumi.toZigbee.lumi_switch_type, tz.on_off, lumi.toZigbee.lumi_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff"]);
@@ -3121,8 +3118,8 @@ exports.definitions = [
         model: "ZNCJMB14LM",
         vendor: "Aqara",
         description: "Smart touch panel S1",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_smart_panel_ZNCJMB14LM],
-        toZigbee: [toZigbee_1.default.on_off, lumi.toZigbee.lumi_smart_panel_ZNCJMB14LM],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_smart_panel_ZNCJMB14LM],
+        toZigbee: [tz.on_off, lumi.toZigbee.lumi_smart_panel_ZNCJMB14LM],
         meta: { multiEndpoint: true },
         endpoint: (device) => {
             return { left: 1, center: 2, right: 3 };
@@ -3189,7 +3186,7 @@ exports.definitions = [
         description: "Wireless remote switch T1 (single rocker)",
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         extend: [m.quirkCheckinInterval("1_HOUR")],
-        fromZigbee: [lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_action_multistate, fromZigbee_1.default.battery, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [lumi.fromZigbee.lumi_action, lumi.fromZigbee.lumi_action_multistate, fz.battery, lumi.fromZigbee.lumi_specific],
         toZigbee: [],
         exposes: [e.action(["single", "double", "hold"]), e.battery()],
     },
@@ -3199,7 +3196,7 @@ exports.definitions = [
         vendor: "Aqara",
         whiteLabel: [{ vendor: "Aqara", model: "WRS-R02" }],
         description: "Wireless remote switch H1 (double rocker)",
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.command_toggle],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fz.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: [m.quirkCheckinInterval("1_HOUR")],
@@ -3248,9 +3245,9 @@ exports.definitions = [
         model: "QBKG38LM",
         vendor: "Aqara",
         description: "Smart wall switch E1 (no neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_switch_mode_switch,
@@ -3277,9 +3274,9 @@ exports.definitions = [
         model: "QBKG39LM",
         vendor: "Aqara",
         description: "Smart wall switch E1 (no neutral, double rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_switch_mode_switch,
@@ -3313,7 +3310,7 @@ exports.definitions = [
         vendor: "Aqara",
         whiteLabel: [{ vendor: "Aqara", model: "AAQS-S01" }],
         description: "TVOC air quality monitor",
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_specific],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         exposes: [e.device_temperature(), e.battery(), e.battery_voltage()],
         extend: [
@@ -3342,9 +3339,9 @@ exports.definitions = [
         model: "QBKG41LM",
         vendor: "Aqara",
         description: "Smart wall switch E1 (with neutral, double rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_flip_indicator_light,
@@ -3373,9 +3370,9 @@ exports.definitions = [
         model: "ZNCZ15LM",
         vendor: "Aqara",
         description: "Smart plug T1, CN",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
             lumi.toZigbee.lumi_overload_protection,
@@ -3401,9 +3398,9 @@ exports.definitions = [
         model: "QBKG40LM",
         vendor: "Aqara",
         description: "Smart wall switch E1 (with neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_flip_indicator_light,
@@ -3431,7 +3428,7 @@ exports.definitions = [
             { vendor: "Yandex", model: "YNDX-00524" },
         ],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [],
         exposes: [e.battery(), e.battery_voltage(), e.action(["single", "double", "triple", "quadruple", "quintuple", "hold", "release", "many"])],
         configure: async (device, coordinatorEndpoint) => {
@@ -3445,7 +3442,7 @@ exports.definitions = [
         model: "GZCGQ11LM",
         vendor: "Aqara",
         description: "Light sensor T1",
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_specific],
         toZigbee: [lumi.toZigbee.lumi_detection_period],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         exposes: [
@@ -3470,9 +3467,9 @@ exports.definitions = [
         model: "QBCZ15LM",
         vendor: "Aqara",
         description: "Smart wall outlet H1 (USB)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
             lumi.toZigbee.lumi_button_switch_mode,
@@ -3510,7 +3507,7 @@ exports.definitions = [
             { vendor: "Aqara", model: "DW-S03D" },
             { vendor: "Yandex", model: "YNDX-00520" },
         ],
-        fromZigbee: [lumi.fromZigbee.lumi_contact, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.ias_contact_alarm_1],
+        fromZigbee: [lumi.fromZigbee.lumi_contact, lumi.fromZigbee.lumi_specific, fz.ias_contact_alarm_1],
         toZigbee: [],
         exposes: [e.contact(), e.battery(), e.battery_voltage()],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
@@ -3521,9 +3518,9 @@ exports.definitions = [
         model: "QBCZ14LM",
         vendor: "Aqara",
         description: "Smart wall outlet T1",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
             lumi.toZigbee.lumi_overload_protection,
@@ -3615,7 +3612,7 @@ exports.definitions = [
         model: "WXKG14LM",
         vendor: "Aqara",
         description: "Wireless remote switch H1 (single rocker)",
-        fromZigbee: [lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.command_toggle],
+        fromZigbee: [lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fz.command_toggle],
         toZigbee: [lumi.toZigbee.lumi_switch_click_mode, lumi.toZigbee.lumi_operation_mode_opple],
         exposes: [
             e.battery(),
@@ -3642,8 +3639,8 @@ exports.definitions = [
         model: "SRTS-A01",
         vendor: "Aqara",
         description: "Smart radiator thermostat E1",
-        fromZigbee: [lumi.fromZigbee.lumi_trv, fromZigbee_1.default.thermostat, fromZigbee_1.default.battery],
-        toZigbee: [lumi.toZigbee.lumi_trv, toZigbee_1.default.thermostat_occupied_heating_setpoint],
+        fromZigbee: [lumi.fromZigbee.lumi_trv, fz.thermostat, fz.battery],
+        toZigbee: [lumi.toZigbee.lumi_trv, tz.thermostat_occupied_heating_setpoint],
         exposes: [
             e.setup().withDescription("Indicates if the device is in setup mode (E11)"),
             e
@@ -3755,7 +3752,7 @@ exports.definitions = [
         model: "WXKG20LM",
         vendor: "Aqara",
         description: "Wireless mini switch E1",
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [],
         meta: { battery: { voltageToPercentage: { min: 2850, max: 3000 } } },
         extend: [m.quirkCheckinInterval("1_HOUR")],
@@ -3772,7 +3769,7 @@ exports.definitions = [
         model: "WXKG22LM",
         vendor: "Aqara",
         description: "Wireless remote switch H1M (double rocker)",
-        fromZigbee: [fromZigbee_1.default.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fromZigbee_1.default.command_toggle],
+        fromZigbee: [fz.battery, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, fz.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: [m.quirkCheckinInterval("1_HOUR")],
@@ -4064,7 +4061,7 @@ exports.definitions = [
             lumi.fromZigbee.lumi_specific,
             lumi.fromZigbee.lumi_action_multistate,
             lumi.fromZigbee.lumi_action_analog,
-            fromZigbee_1.default.ignore_onoff_report,
+            fz.ignore_onoff_report,
         ],
         toZigbee: [lumi.toZigbee.lumi_cube_operation_mode],
         exposes: [
@@ -4116,9 +4113,9 @@ exports.definitions = [
         model: "ZNQBKG31LM",
         vendor: "Aqara",
         description: "Smart wall switch E1 (with neutral, triple rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_switch_mode_switch,
@@ -4168,9 +4165,9 @@ exports.definitions = [
         model: "ZNQBKG24LM",
         vendor: "Aqara",
         description: "Smart wall switch H1M (with neutral, single rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_power, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -4195,9 +4192,9 @@ exports.definitions = [
         model: "ZNQBKG25LM",
         vendor: "Aqara",
         description: "Smart wall switch H1M (with neutral, double rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_power],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_power],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,
@@ -4240,9 +4237,9 @@ exports.definitions = [
         model: "ZNQBKG26LM",
         vendor: "Aqara",
         description: "Smart wall switch H1M (with neutral, triple rocker)",
-        fromZigbee: [fromZigbee_1.default.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_power],
+        fromZigbee: [fz.on_off, lumi.fromZigbee.lumi_action_multistate, lumi.fromZigbee.lumi_specific, lumi.fromZigbee.lumi_power],
         toZigbee: [
-            toZigbee_1.default.on_off,
+            tz.on_off,
             lumi.toZigbee.lumi_switch_operation_mode_opple,
             lumi.toZigbee.lumi_switch_power_outage_memory,
             lumi.toZigbee.lumi_led_disabled_night,