zigbee-herdsman-converters 18.48.0 → 19.0.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [19.0.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v18.49.0...v19.0.0) (2024-03-11)
+
+
+### ⚠ BREAKING CHANGES
+
+* Remove legacy extend support ([#7200](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7200))
+
+### Features
+
+* Remove legacy extend support ([#7200](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7200)) ([0558a15](https://github.com/Koenkk/zigbee-herdsman-converters/commit/0558a1527d4e112747ce912ac68a054314e3fc06))
+
+
+### Bug Fixes
+
+* Refactor all switches to modernExtend ([#7198](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7198)) ([cb24821](https://github.com/Koenkk/zigbee-herdsman-converters/commit/cb24821aebe8c2be5cef27bbd3a71f5937580b1f))
+
+## [18.49.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v18.48.0...v18.49.0) (2024-03-11)
+
+
+### Features
+
+* **add:** LED2109G6 [@millionsofjeffries](https://github.com/millionsofjeffries) https://github.com/Koenkk/zigbee2mqtt/issues/21755 ([dbf268e](https://github.com/Koenkk/zigbee-herdsman-converters/commit/dbf268ead2d2397a1544aac3354e7d0a50b96f27))
+* **add:** TS0601_gas_sensor_3 [@onmobs](https://github.com/onmobs) https://github.com/Koenkk/zigbee2mqtt/issues/21741 ([abd30a8](https://github.com/Koenkk/zigbee-herdsman-converters/commit/abd30a89429a373fdfafc15e72a828d4c1503c86))
+* Improve Aqara ZNCLDJ14LM support ([#7191](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7191)) ([c951b18](https://github.com/Koenkk/zigbee-herdsman-converters/commit/c951b187489280d02f92f070b385efb00da3cac8))
+* Support battery and OTA for IKEA E2202 ([#7196](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7196)) ([e2860b2](https://github.com/Koenkk/zigbee-herdsman-converters/commit/e2860b2ec6ab4ccabbb418565bfd0aa5a5bf385e))
+
+
+### Bug Fixes
+
+* Fix some Aqara modernExtend ([#7192](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7192)) ([d22efc7](https://github.com/Koenkk/zigbee-herdsman-converters/commit/d22efc74acb70a2e41adfa216469ceef147c1446))
+* **ignore:** add back level config https://github.com/Koenkk/zigbee-herdsman-converters/pull/7168 ([63756b5](https://github.com/Koenkk/zigbee-herdsman-converters/commit/63756b57cf711dd01304b582684ca57db80464c6))
+* Refactor more devices to modernExtend ([#7194](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7194)) ([fe6f97e](https://github.com/Koenkk/zigbee-herdsman-converters/commit/fe6f97ec8da0a3e5048bddff155b283c96035819))
+
 ## [18.48.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v18.47.0...v18.48.0) (2024-03-10)
 
 

package/devices/ajax_online.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ajax_online.d.ts","sourceRoot":"","sources":["../src/devices/ajax_online.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAIxC,QAAA,MAAM,WAAW,EAAE,UAAU,EA4C5B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"ajax_online.d.ts","sourceRoot":"","sources":["../src/devices/ajax_online.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAIxC,QAAA,MAAM,WAAW,EAAE,UAAU,EA2C5B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/ajax_online.js

@@ -59,8 +59,7 @@ const definitions = [
         model: 'AJ_RGBCCT_CTRL',
         vendor: 'Ajax Online',
         description: 'Smart Zigbee LED strip RGB+CCT',
-        extend: tuya.extend.light_onoff_brightness_colortemp_color({ colorTempRange: [153, 500] }),
-        meta: { applyRedFix: true, supportsEnhancedHue: false },
+        extend: [tuya.modernExtend.tuyaLight({ color: true, colorTemp: { range: [153, 500] } })],
     },
     {
         fingerprint: [{ modelID: 'CCT Light', manufacturerName: 'ZB/Ajax Online', manufacturerID: 4137 }],

package/devices/ajax_online.js.map

@@ -1 +1 @@
-{"version":3,"file":"ajax_online.js","sourceRoot":"","sources":["../src/devices/ajax_online.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AACpC,sDAA0C;AAE1C,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,CAAC,kBAAkB,CAAC;QACjC,KAAK,EAAE,qBAAqB;QAC5B,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,WAAW;QACxB,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;KAChE;IACD;QACI,WAAW,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;QAC9C,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,sCAAsC;QACnD,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,CAAC,CAAC;KAChF;IACD;QACI,WAAW,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC;QAC1C,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,+BAA+B;QAC5C,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAC,CAAC,CAAC;KAC9F;IACD;QACI,WAAW,EAAE,CAAC,cAAc,CAAC;QAC7B,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,qCAAqC;QAClD,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;KACjE;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACzE,KAAK,EAAE,gBAAgB;QACvB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,gCAAgC;QAC7C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,sCAAsC,CAAC,EAAC,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,CAAC;QACxF,IAAI,EAAE,EAAC,WAAW,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC;KACxD;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,EAAC,CAAC;QAC/F,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,kEAAkE;QAC/E,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAC,CAAC,CAAC;KACpD;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"ajax_online.js","sourceRoot":"","sources":["../src/devices/ajax_online.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AACpC,sDAA0C;AAE1C,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,CAAC,kBAAkB,CAAC;QACjC,KAAK,EAAE,qBAAqB;QAC5B,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,WAAW;QACxB,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;KAChE;IACD;QACI,WAAW,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;QAC9C,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,sCAAsC;QACnD,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,CAAC,CAAC;KAChF;IACD;QACI,WAAW,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC;QAC1C,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,+BAA+B;QAC5C,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAC,CAAC,CAAC;KAC9F;IACD;QACI,WAAW,EAAE,CAAC,cAAc,CAAC;QAC7B,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,qCAAqC;QAClD,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;KACjE;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACzE,KAAK,EAAE,gBAAgB;QACvB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,gCAAgC;QAC7C,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAC,CAAC,CAAC;KACvF;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,EAAC,CAAC;QAC/F,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,aAAa;QACrB,WAAW,EAAE,kEAAkE;QAC/E,MAAM,EAAE,CAAC,IAAA,oBAAK,EAAC,EAAC,SAAS,EAAE,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAC,EAAC,CAAC,CAAC;KACpD;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/automaton.js

@@ -31,7 +31,7 @@ const definitions = [
         model: 'AUT000069',
         vendor: 'AutomatOn',
         description: 'Underfloor heating controller - 5 zones',
-        extend: tuya.extend.switch({ powerOnBehavior2: true, childLock: true, endpoints: ['l1', 'l2', 'l3', 'l4', 'l5'] }),
+        extend: [tuya.modernExtend.tuyaOnOff({ powerOnBehavior2: true, childLock: true, endpoints: ['l1', 'l2', 'l3', 'l4', 'l5'] })],
         endpoint: (device) => {
             return { 'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4, 'l5': 5 };
         },

package/devices/automaton.js.map

@@ -1 +1 @@
-{"version":3,"file":"automaton.js","sourceRoot":"","sources":["../src/devices/automaton.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAA8C;AAC9C,kDAAoC;AAEpC,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,kBAAkB,CAAC,CAAC;QAC7D,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,yCAAyC;QACtD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAC,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAC,CAAC;QAChH,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,EAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC;QACzD,CAAC;QACD,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,EAAE;YACrD,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YACrE,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,CAAC,WAAW,GAAG,sBAAsB,CAAC;YAC5C,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"automaton.js","sourceRoot":"","sources":["../src/devices/automaton.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAA8C;AAC9C,kDAAoC;AAEpC,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,kBAAkB,CAAC,CAAC;QAC7D,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,yCAAyC;QACtD,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAC,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAC,CAAC,CAAC;QAC3H,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,EAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC;QACzD,CAAC;QACD,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,EAAE;YACrD,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YACrE,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,CAAC,WAAW,GAAG,sBAAsB,CAAC;YAC5C,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/blitzwolf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blitzwolf.d.ts","sourceRoot":"","sources":["../src/devices/blitzwolf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AASxC,QAAA,MAAM,WAAW,EAAE,UAAU,EAoC5B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"blitzwolf.d.ts","sourceRoot":"","sources":["../src/devices/blitzwolf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAOxC,QAAA,MAAM,WAAW,EAAE,UAAU,EA2B5B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/blitzwolf.js

@@ -29,8 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const exposes = __importStar(require("../lib/exposes"));
 const legacy = __importStar(require("../lib/legacy"));
 const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
-const reporting = __importStar(require("../lib/reporting"));
-const extend_1 = __importDefault(require("../lib/extend"));
 const modernExtend_1 = require("../lib/modernExtend");
 const e = exposes.presets;
 const definitions = [
@@ -56,17 +54,8 @@ const definitions = [
         model: 'BW-SS7_2gang',
         vendor: 'BlitzWolf',
         description: 'Zigbee 3.0 smart light switch module 2 gang',
-        extend: extend_1.default.switch(),
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
-        endpoint: (device) => {
-            return { 'l1': 1, 'l2': 2 };
-        },
+        extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { l1: 1, l2: 2 } }), (0, modernExtend_1.onOff)({ endpointNames: ['l1', 'l2'] })],
         toZigbee: [toZigbee_1.default.TYZB01_on_off],
-        meta: { multiEndpoint: true },
-        configure: async (device, coordinatorEndpoint, logger) => {
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-        },
     },
 ];
 exports.default = definitions;

package/devices/blitzwolf.js.map

@@ -1 +1 @@
-{"version":3,"file":"blitzwolf.js","sourceRoot":"","sources":["../src/devices/blitzwolf.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAC1C,sDAAwC;AACxC,sEAAwC;AACxC,4DAA8C;AAC9C,2DAAmC;AACnC,sDAA0C;AAC1C,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAE1B,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC;QACzC,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,uCAAuC;QACpD,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,gCAAgC,CAAC;QACxD,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;KAC3B;IACD;QAEI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,6CAA6C;QAC1D,MAAM,EAAE,CAAC,IAAA,oBAAK,GAAE,CAAC;QACjB,QAAQ,EAAE,CAAC,kBAAE,CAAC,aAAa,CAAC;KAC/B;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,6CAA6C;QAC1D,MAAM,EAAE,gBAAM,CAAC,MAAM,EAAE;QACvB,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvE,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,EAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC;QAC9B,CAAC;QACD,QAAQ,EAAE,CAAC,kBAAE,CAAC,aAAa,CAAC;QAC5B,IAAI,EAAE,EAAC,aAAa,EAAE,IAAI,EAAC;QAC3B,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,EAAE;YACrD,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QACnF,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"blitzwolf.js","sourceRoot":"","sources":["../src/devices/blitzwolf.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAC1C,sDAAwC;AACxC,sEAAwC;AACxC,sDAA2D;AAC3D,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAE1B,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC;QACzC,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,uCAAuC;QACpD,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,gCAAgC,CAAC;QACxD,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;KAC3B;IACD;QAEI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,6CAA6C;QAC1D,MAAM,EAAE,CAAC,IAAA,oBAAK,GAAE,CAAC;QACjB,QAAQ,EAAE,CAAC,kBAAE,CAAC,aAAa,CAAC;KAC/B;IACD;QACI,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,kBAAkB,EAAC,CAAC;QACxE,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,6CAA6C;QAC1D,MAAM,EAAE,CAAC,IAAA,8BAAe,EAAC,EAAC,SAAS,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC,EAAC,CAAC,EAAE,IAAA,oBAAK,EAAC,EAAC,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAC,CAAC,CAAC;QAC5F,QAAQ,EAAE,CAAC,kBAAE,CAAC,aAAa,CAAC;KAC/B;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/bticino.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bticino.d.ts","sourceRoot":"","sources":["../src/devices/bticino.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAYxC,QAAA,MAAM,WAAW,EAAE,UAAU,EA8F5B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"bticino.d.ts","sourceRoot":"","sources":["../src/devices/bticino.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAWxC,QAAA,MAAM,WAAW,EAAE,UAAU,EAmF5B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/bticino.js

@@ -30,7 +30,6 @@ const exposes = __importStar(require("../lib/exposes"));
 const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
 const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const reporting = __importStar(require("../lib/reporting"));
-const extend_1 = __importDefault(require("../lib/extend"));
 const ota = __importStar(require("../lib/ota"));
 const legrand_1 = require("../lib/legrand");
 const modernExtend_1 = require("../lib/modernExtend");
@@ -89,24 +88,13 @@ const definitions = [
         model: 'F20T60A',
         description: 'DIN power consumption module (same as Legrand 412015)',
         vendor: 'BTicino',
-        extend: extend_1.default.switch(),
-        fromZigbee: [fromZigbee_1.default.identify, fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, legrand_1.fzLegrand.cluster_fc01, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ignore_genOta],
-        toZigbee: [toZigbee_1.default.legrand_device_mode, toZigbee_1.default.on_off, toZigbee_1.default.legrand_identify, toZigbee_1.default.electrical_measurement_power],
+        extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)({ cluster: 'electrical' })],
+        fromZigbee: [fromZigbee_1.default.identify, legrand_1.fzLegrand.cluster_fc01, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ignore_genOta],
+        toZigbee: [toZigbee_1.default.legrand_device_mode, toZigbee_1.default.legrand_identify],
         exposes: [
-            e.switch()
-                .withState('state', true, 'On/off (works only if device is in "switch" mode)'),
-            e.power()
-                .withAccess(ea.STATE_GET),
             e.enum('device_mode', ea.ALL, ['switch', 'auto'])
                 .withDescription('switch: allow on/off, auto will use wired action via C1/C2 on contactor for example with HC/HP'),
         ],
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genIdentify', 'genOnOff', 'haElectricalMeasurement']);
-            await reporting.onOff(endpoint);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.activePower(endpoint);
-        },
     },
     {
         zigbeeModel: ['Power socket Bticino Serie LL '],

package/devices/bticino.js.map

@@ -1 +1 @@
-{"version":3,"file":"bticino.js","sourceRoot":"","sources":["../src/devices/bticino.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bticino.js","sourceRoot":"","sources":["../src/devices/bticino.ts"],"names":[],"mappings":"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"}

package/devices/cleode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleode.d.ts","sourceRoot":"","sources":["../src/devices/cleode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAMxC,QAAA,MAAM,WAAW,EAAE,UAAU,EAc5B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"cleode.d.ts","sourceRoot":"","sources":["../src/devices/cleode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAGxC,QAAA,MAAM,WAAW,EAAE,UAAU,EAQ5B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/cleode.js

@@ -1,48 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const exposes = __importStar(require("../lib/exposes"));
-const reporting = __importStar(require("../lib/reporting"));
-const e = exposes.presets;
-const extend_1 = __importDefault(require("../lib/extend"));
+const modernExtend_1 = require("../lib/modernExtend");
 const definitions = [
     {
         zigbeeModel: ['ZPLUG'],
         model: 'ZPLUG_Boost',
         vendor: 'CLEODE',
         description: 'ZPlug boost',
-        extend: extend_1.default.switch(),
-        exposes: [e.switch(), e.power()],
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-        },
+        extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)({ cluster: 'metering' })],
     },
 ];
 exports.default = definitions;

package/devices/cleode.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleode.js","sourceRoot":"","sources":["../src/devices/cleode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAC1C,4DAA8C;AAC9C,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAC1B,2DAAmC;AAEnC,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,CAAC,OAAO,CAAC;QACtB,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,aAAa;QAC1B,MAAM,EAAE,gBAAM,CAAC,MAAM,EAAE;QACvB,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAChC,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,EAAE;YACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;YAChF,MAAM,SAAS,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;QAC5D,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"cleode.js","sourceRoot":"","sources":["../src/devices/cleode.ts"],"names":[],"mappings":";;AACA,sDAA4D;AAE5D,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,CAAC,OAAO,CAAC;QACtB,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,aAAa;QAC1B,MAAM,EAAE,CAAC,IAAA,oBAAK,GAAE,EAAE,IAAA,+BAAgB,EAAC,EAAC,OAAO,EAAE,UAAU,EAAC,CAAC,CAAC;KAC7D;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/custom_devices_diy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom_devices_diy.d.ts","sourceRoot":"","sources":["../src/devices/custom_devices_diy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,UAAU,EAA4C,MAAM,cAAc,CAAC;AA0dnF,QAAA,MAAM,WAAW,EAAE,UAAU,EAijC5B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"custom_devices_diy.d.ts","sourceRoot":"","sources":["../src/devices/custom_devices_diy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,UAAU,EAA4C,MAAM,cAAc,CAAC;AA0dnF,QAAA,MAAM,WAAW,EAAE,UAAU,EAoiC5B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/custom_devices_diy.js

@@ -33,7 +33,6 @@ const legacy = __importStar(require("../lib/legacy"));
 const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const reporting = __importStar(require("../lib/reporting"));
 const ota = __importStar(require("../lib/ota"));
-const extend_1 = __importDefault(require("../lib/extend"));
 const constants = __importStar(require("../lib/constants"));
 const e = exposes.presets;
 const ea = exposes.access;
@@ -794,46 +793,35 @@ const definitions = [
         model: 'DNCKATSW002',
         vendor: 'Custom devices (DiY)',
         description: 'DNCKAT double key wired wall light switch',
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.DNCKAT_S00X_buttons],
-        meta: { multiEndpoint: true },
-        extend: extend_1.default.switch(),
-        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
-            e.action(['release_left', 'hold_left', 'release_right', 'hold_right'])],
-        endpoint: (device) => {
-            return { 'left': 1, 'right': 2 };
-        },
+        fromZigbee: [fromZigbee_1.default.DNCKAT_S00X_buttons],
+        extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { left: 1, right: 2 } }), (0, modernExtend_1.onOff)({ endpointNames: ['left', 'right'] })],
+        exposes: [e.action(['release_left', 'hold_left', 'release_right', 'hold_right'])],
     },
     {
         zigbeeModel: ['DNCKAT_S003'],
         model: 'DNCKATSW003',
         vendor: 'Custom devices (DiY)',
         description: 'DNCKAT triple key wired wall light switch',
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.DNCKAT_S00X_buttons],
-        meta: { multiEndpoint: true },
-        extend: extend_1.default.switch(),
-        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'), e.switch().withEndpoint('center'),
-            e.action(['release_left', 'hold_left', 'release_right', 'hold_right', 'release_center', 'hold_center'])],
-        endpoint: (device) => {
-            return { 'left': 1, 'center': 2, 'right': 3 };
-        },
+        fromZigbee: [fromZigbee_1.default.DNCKAT_S00X_buttons],
+        extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { left: 1, center: 2, right: 3 } }), (0, modernExtend_1.onOff)({ endpointNames: ['left', 'center', 'right'] })],
+        exposes: [e.action(['release_left', 'hold_left', 'release_right', 'hold_right', 'release_center', 'hold_center'])],
     },
     {
         zigbeeModel: ['DNCKAT_S004'],
         model: 'DNCKATSW004',
         vendor: 'Custom devices (DiY)',
         description: 'DNCKAT quadruple key wired wall light switch',
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.DNCKAT_S00X_buttons],
-        meta: { multiEndpoint: true },
-        extend: extend_1.default.switch(),
-        exposes: [e.switch().withEndpoint('bottom_left'), e.switch().withEndpoint('bottom_right'),
-            e.switch().withEndpoint('top_left'), e.switch().withEndpoint('top_right'),
+        fromZigbee: [fromZigbee_1.default.DNCKAT_S00X_buttons],
+        extend: [
+            (0, modernExtend_1.deviceEndpoints)({ endpoints: { bottom_left: 1, bottom_right: 2, top_left: 3, top_right: 4 } }),
+            (0, modernExtend_1.onOff)({ endpointNames: ['bottom_left', 'bottom_right', 'top_left', 'top_right'] })
+        ],
+        exposes: [
             e.action([
                 'release_bottom_left', 'hold_bottom_left', 'release_bottom_right', 'hold_bottom_right',
                 'release_top_left', 'hold_top_left', 'release_top_right', 'hold_top_right',
-            ])],
-        endpoint: (device) => {
-            return { 'bottom_left': 1, 'bottom_right': 2, 'top_left': 3, 'top_right': 4 };
-        },
+            ])
+        ],
     },
     {
         zigbeeModel: ['ZigUP'],