zigbee-herdsman-converters 20.44.0 → 21.0.0-pre.1

package/devices/pushok.js

@@ -71,8 +71,8 @@ const definitions = [
                 valueStep: 1,
                 reporting: null,
             }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK002', 'POK007'],
@@ -83,8 +83,8 @@ const definitions = [
             (0, modernExtend_1.humidity)({ reporting: null }),
             (0, modernExtend_1.temperature)({ reporting: null }),
             (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK003'],
@@ -104,15 +104,16 @@ const definitions = [
             }),
             (0, modernExtend_1.temperature)({ reporting: null }),
             (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK004'],
         model: 'POK004',
         vendor: 'PushOk Hardware',
         description: 'Solar powered zigbee router and illuminance sensor',
-        extend: [(0, modernExtend_1.illuminance)({ reporting: null }), (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false }), (0, modernExtend_1.ota)()],
+        extend: [(0, modernExtend_1.illuminance)({ reporting: null }), (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false })],
+        ota: true,
     },
     {
         zigbeeModel: ['POK005'],
@@ -123,8 +124,8 @@ const definitions = [
             (0, modernExtend_1.humidity)({ reporting: null }),
             (0, modernExtend_1.temperature)({ reporting: null }),
             (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK006'],
@@ -137,8 +138,8 @@ const definitions = [
             pushokExtend.valveStatus(),
             (0, modernExtend_1.identify)({ isSleepy: true }),
             pushokExtend.stallTime(),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK008'],
@@ -183,8 +184,8 @@ const definitions = [
                 access: 'ALL',
                 reporting: null,
             }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK009'],
@@ -236,8 +237,8 @@ const definitions = [
             }),
             (0, modernExtend_1.identify)({ isSleepy: true }),
             (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: true, percentageReporting: false }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK010'],
@@ -257,15 +258,16 @@ const definitions = [
             }),
             (0, modernExtend_1.temperature)({ reporting: null }),
             (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
     {
         zigbeeModel: ['POK011'],
         model: 'POK011',
         vendor: 'PushOk Hardware',
         description: 'Illuminance sensor',
-        extend: [(0, modernExtend_1.illuminance)({ reporting: null }), (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false }), (0, modernExtend_1.ota)()],
+        extend: [(0, modernExtend_1.illuminance)({ reporting: null }), (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false })],
+        ota: true,
     },
     {
         zigbeeModel: ['POK012'],
@@ -289,8 +291,8 @@ const definitions = [
                 alarmTimeout: false,
             }),
             (0, modernExtend_1.battery)({ percentage: true, voltage: true, lowStatus: false, percentageReporting: false }),
-            (0, modernExtend_1.ota)(),
         ],
+        ota: true,
     },
 ];
 exports.default = definitions;

package/devices/pushok.js.map

@@ -1 +1 @@
-{"version":3,"file":"pushok.js","sourceRoot":"","sources":["../src/devices/pushok.ts"],"names":[],"mappings":";;AAAA,sDAc6B;AAG7B,MAAM,YAAY,GAAG;IACjB,WAAW,EAAE,CAAC,IAA8B,EAAE,EAAE,CAC5C,IAAA,yBAAU,EAAC;QACP,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC;QAC5C,OAAO,EAAE,oBAAoB;QAC7B,SAAS,EAAE,cAAc;QACzB,oBAAoB,EAAE,EAAE;QACxB,WAAW,EAAE,qBAAqB;QAClC,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,IAAI;QACf,GAAG,IAAI;KACV,CAAC;IACN,SAAS,EAAE,CAAC,IAA2B,EAAE,EAAE,CACvC,IAAA,sBAAO,EAAC;QACJ,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,oBAAoB;QAC7B,SAAS,EAAE,cAAc;QACzB,WAAW,EAAE,8BAA8B;QAC3C,IAAI,EAAE,GAAG;QACT,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,IAAI;QACf,GAAG,IAAI;KACV,CAAC;CACT,CAAC;AAEF,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,gCAAgC;QAC7C,MAAM,EAAE;YACJ,IAAA,oBAAK,EAAC,EAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC;YAC1D,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACvF,YAAY,CAAC,WAAW,EAAE;YAC1B,IAAA,uBAAQ,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;YAC1B,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,sDAAsD;gBACnE,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,YAAY,CAAC,SAAS,EAAE;YACxB,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC;gBACxC,OAAO,EAAE,qBAAqB;gBAC9B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,cAAc;gBAC3B,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,kDAAkD;gBAC/D,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QACjC,KAAK,EAAE,eAAe;QACtB,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,sCAAsC;QACnD,MAAM,EAAE;YACJ,IAAA,uBAAQ,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC3B,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACxF,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE;YACJ,IAAA,qBAAM,EAAC;gBACH,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,+DAA+D;gBAC5E,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACxF,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oDAAoD;QACjE,MAAM,EAAE,CAAC,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,EAAE,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC,EAAE,IAAA,kBAAG,GAAE,CAAC;KAC5I;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,iCAAiC;QAC9C,MAAM,EAAE;YACJ,IAAA,uBAAQ,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC3B,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACxF,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,8BAA8B;QAC3C,MAAM,EAAE;YACJ,IAAA,oBAAK,EAAC,EAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC;YAC1D,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACvF,YAAY,CAAC,WAAW,EAAE;YAC1B,IAAA,uBAAQ,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;YAC1B,YAAY,CAAC,SAAS,EAAE;YACxB,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,kCAAkC;QAC/C,MAAM,EAAE;YACJ,IAAA,oBAAK,EAAC,EAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC;YAC1D,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACxF,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,iBAAiB;gBAC1B,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,oBAAoB;gBACjC,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC,EAAE;gBACb,QAAQ,EAAE,GAAG;gBACb,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,wBAAwB;gBACrC,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,GAAG;gBACb,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,GAAG;gBACd,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,EAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;gBAC1C,OAAO,EAAE,qBAAqB;gBAC9B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,gBAAgB;gBAC7B,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,iBAAiB;QAC9B,MAAM,EAAE;YACJ,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,eAAe;gBAC5B,IAAI,EAAE,GAAG;gBACT,SAAS,EAAE,CAAC;gBACZ,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,qBAAM,EAAC;gBACH,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC;gBACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,gBAAgB;gBAC7B,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,oBAAoB;gBAC7B,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,mBAAmB;gBAChC,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,GAAG;gBACb,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC;gBACtB,OAAO,EAAE,qBAAqB;gBAC9B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,MAAM;gBACnB,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,uBAAQ,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;YAC1B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACvF,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE;YACJ,IAAA,qBAAM,EAAC;gBACH,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,+DAA+D;gBAC5E,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACxF,IAAA,kBAAG,GAAE;SACR;KACJ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,CAAC,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,EAAE,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC,EAAE,IAAA,kBAAG,GAAE,CAAC;KAC5I;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,iEAAiE;QAC9E,MAAM,EAAE;YACJ,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,eAAe;gBACrB,MAAM,EAAE,EAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAC;gBAC1D,OAAO,EAAE,oBAAoB;gBAC7B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,eAAe;gBAC5B,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,2BAAY,EAAC;gBACT,QAAQ,EAAE,SAAS;gBACnB,cAAc,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAC/C,YAAY,EAAE,KAAK;aACtB,CAAC;YACF,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACxF,IAAA,kBAAG,GAAE;SACR;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"pushok.js","sourceRoot":"","sources":["../src/devices/pushok.ts"],"names":[],"mappings":";;AAAA,sDAa6B;AAG7B,MAAM,YAAY,GAAG;IACjB,WAAW,EAAE,CAAC,IAA8B,EAAE,EAAE,CAC5C,IAAA,yBAAU,EAAC;QACP,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC;QAC5C,OAAO,EAAE,oBAAoB;QAC7B,SAAS,EAAE,cAAc;QACzB,oBAAoB,EAAE,EAAE;QACxB,WAAW,EAAE,qBAAqB;QAClC,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,IAAI;QACf,GAAG,IAAI;KACV,CAAC;IACN,SAAS,EAAE,CAAC,IAA2B,EAAE,EAAE,CACvC,IAAA,sBAAO,EAAC;QACJ,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,oBAAoB;QAC7B,SAAS,EAAE,cAAc;QACzB,WAAW,EAAE,8BAA8B;QAC3C,IAAI,EAAE,GAAG;QACT,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,IAAI;QACf,GAAG,IAAI;KACV,CAAC;CACT,CAAC;AAEF,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,gCAAgC;QAC7C,MAAM,EAAE;YACJ,IAAA,oBAAK,EAAC,EAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC;YAC1D,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACvF,YAAY,CAAC,WAAW,EAAE;YAC1B,IAAA,uBAAQ,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;YAC1B,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,sDAAsD;gBACnE,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,YAAY,CAAC,SAAS,EAAE;YACxB,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC;gBACxC,OAAO,EAAE,qBAAqB;gBAC9B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,cAAc;gBAC3B,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,kDAAkD;gBAC/D,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,IAAI;aAClB,CAAC;SACL;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QACjC,KAAK,EAAE,eAAe;QACtB,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,sCAAsC;QACnD,MAAM,EAAE;YACJ,IAAA,uBAAQ,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC3B,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;SAC3F;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE;YACJ,IAAA,qBAAM,EAAC;gBACH,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,+DAA+D;gBAC5E,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;SAC3F;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oDAAoD;QACjE,MAAM,EAAE,CAAC,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,EAAE,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC,CAAC;QAClI,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,iCAAiC;QAC9C,MAAM,EAAE;YACJ,IAAA,uBAAQ,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC3B,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;SAC3F;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,8BAA8B;QAC3C,MAAM,EAAE;YACJ,IAAA,oBAAK,EAAC,EAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC;YAC1D,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACvF,YAAY,CAAC,WAAW,EAAE;YAC1B,IAAA,uBAAQ,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;YAC1B,YAAY,CAAC,SAAS,EAAE;SAC3B;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,kCAAkC;QAC/C,MAAM,EAAE;YACJ,IAAA,oBAAK,EAAC,EAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAC,CAAC;YAC1D,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;YACxF,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,iBAAiB;gBAC1B,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,oBAAoB;gBACjC,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC,EAAE;gBACb,QAAQ,EAAE,GAAG;gBACb,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,wBAAwB;gBACrC,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,GAAG;gBACb,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,GAAG;gBACd,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,EAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;gBAC1C,OAAO,EAAE,qBAAqB;gBAC9B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,gBAAgB;gBAC7B,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;SACL;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,iBAAiB;QAC9B,MAAM,EAAE;YACJ,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,eAAe;gBAC5B,IAAI,EAAE,GAAG;gBACT,SAAS,EAAE,CAAC;gBACZ,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,qBAAM,EAAC;gBACH,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC;gBACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,gBAAgB;gBAC7B,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,sBAAO,EAAC;gBACJ,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,oBAAoB;gBAC7B,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,mBAAmB;gBAChC,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,GAAG;gBACb,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAC;gBACtB,OAAO,EAAE,qBAAqB;gBAC9B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,MAAM;gBACnB,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,uBAAQ,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;YAC1B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;SAC1F;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE;YACJ,IAAA,qBAAM,EAAC;gBACH,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;gBACvB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,cAAc;gBACzB,WAAW,EAAE,+DAA+D;gBAC5E,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;YAC9B,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;SAC3F;QACD,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,CAAC,IAAA,0BAAW,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,EAAE,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC,CAAC;QAClI,GAAG,EAAE,IAAI;KACZ;IACD;QACI,WAAW,EAAE,CAAC,QAAQ,CAAC;QACvB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,iBAAiB;QACzB,WAAW,EAAE,iEAAiE;QAC9E,MAAM,EAAE;YACJ,IAAA,yBAAU,EAAC;gBACP,IAAI,EAAE,eAAe;gBACrB,MAAM,EAAE,EAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAC;gBAC1D,OAAO,EAAE,oBAAoB;gBAC7B,SAAS,EAAE,cAAc;gBACzB,oBAAoB,EAAE,EAAE;gBACxB,WAAW,EAAE,eAAe;gBAC5B,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,IAAI;aAClB,CAAC;YACF,IAAA,2BAAY,EAAC;gBACT,QAAQ,EAAE,SAAS;gBACnB,cAAc,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAC/C,YAAY,EAAE,KAAK;aACtB,CAAC;YACF,IAAA,sBAAO,EAAC,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC;SAC3F;QACD,GAAG,EAAE,IAAI;KACZ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/salus_controls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"salus_controls.d.ts","sourceRoot":"","sources":["../src/devices/salus_controls.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAIlD,QAAA,MAAM,WAAW,EAAE,oBAAoB,EAyFtC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"salus_controls.d.ts","sourceRoot":"","sources":["../src/devices/salus_controls.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAIlD,QAAA,MAAM,WAAW,EAAE,oBAAoB,EAyFtC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/salus_controls.js

@@ -29,7 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
 const exposes = __importStar(require("../lib/exposes"));
 const modernExtend_1 = require("../lib/modernExtend");
-const ota = __importStar(require("../lib/ota"));
 const reporting = __importStar(require("../lib/reporting"));
 const e = exposes.presets;
 const definitions = [
@@ -39,7 +38,7 @@ const definitions = [
         vendor: 'Salus Controls',
         description: 'Smart plug (EU socket)',
         extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)({ cluster: 'metering' })],
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
     {
         zigbeeModel: ['SP600'],
@@ -47,7 +46,7 @@ const definitions = [
         vendor: 'Salus Controls',
         description: 'Smart plug (UK socket)',
         extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)({ cluster: 'metering', fzMetering: fromZigbee_1.default.SP600_power })],
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
     {
         zigbeeModel: ['SX885ZB'],
@@ -55,14 +54,14 @@ const definitions = [
         vendor: 'Salus Controls',
         description: 'miniSmartPlug',
         extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)({ cluster: 'metering' })],
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
     {
         zigbeeModel: ['SR600'],
         model: 'SR600',
         vendor: 'Salus Controls',
         description: 'Relay switch',
-        extend: [(0, modernExtend_1.onOff)({ ota: ota.salus })],
+        extend: [(0, modernExtend_1.onOff)({ ota: { manufacturerName: 'SalusControls' } })],
     },
     {
         zigbeeModel: ['SW600'],
@@ -72,7 +71,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.ias_contact_alarm_1],
         toZigbee: [],
         exposes: [e.contact(), e.battery_low(), e.tamper()],
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
     {
         zigbeeModel: ['WLS600'],
@@ -82,7 +81,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.ias_water_leak_alarm_1],
         toZigbee: [],
         exposes: [e.water_leak(), e.battery_low(), e.tamper()],
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
     {
         zigbeeModel: ['OS600'],
@@ -92,7 +91,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.ias_contact_alarm_1],
         toZigbee: [],
         exposes: [e.contact(), e.battery_low(), e.tamper()],
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
     {
         zigbeeModel: ['SS909ZB', 'PS600'],
@@ -109,7 +108,7 @@ const definitions = [
             await reporting.temperature(endpoint);
             await reporting.batteryVoltage(endpoint);
         },
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
     {
         zigbeeModel: ['RE600'],
@@ -119,7 +118,7 @@ const definitions = [
         fromZigbee: [],
         toZigbee: [],
         exposes: [],
-        ota: ota.salus,
+        ota: { manufacturerName: 'SalusControls' },
     },
 ];
 exports.default = definitions;

package/devices/salus_controls.js.map

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

package/devices/saswell.js

@@ -64,7 +64,7 @@ const definitions = [
             { vendor: 'RTX', model: 'ZB-RT1' },
             { vendor: 'SETTI+', model: 'TRV001' },
         ],
-        fromZigbee: [legacy.fz.saswell_thermostat, fromZigbee_1.default.ignore_tuya_set_time, fromZigbee_1.default.ignore_basic_report, legacy.fz.tuya_thermostat_weekly_schedule_1],
+        fromZigbee: [legacy.fz.saswell_thermostat, fromZigbee_1.default.ignore_tuya_set_time, fromZigbee_1.default.ignore_basic_report, legacy.fz.tuya_thermostat_weekly_schedule_2],
         toZigbee: [
             legacy.tz.saswell_thermostat_current_heating_setpoint,
             legacy.tz.saswell_thermostat_mode,

package/devices/schneider_electric.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schneider_electric.d.ts","sourceRoot":"","sources":["../src/devices/schneider_electric.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,oBAAoB,EAAiC,MAAM,cAAc,CAAC;AAmdlF,QAAA,MAAM,WAAW,EAAE,oBAAoB,EAwgDtC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"schneider_electric.d.ts","sourceRoot":"","sources":["../src/devices/schneider_electric.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAiC,MAAM,cAAc,CAAC;AAmdlF,QAAA,MAAM,WAAW,EAAE,oBAAoB,EAugDtC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/schneider_electric.js

@@ -31,9 +31,7 @@ const fromZigbee_1 = __importDefault(require("../converters/fromZigbee"));
 const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const constants = __importStar(require("../lib/constants"));
 const exposes = __importStar(require("../lib/exposes"));
-const legacy = __importStar(require("../lib/legacy"));
 const modernExtend_1 = require("../lib/modernExtend");
-const ota = __importStar(require("../lib/ota"));
 const reporting = __importStar(require("../lib/reporting"));
 const utils = __importStar(require("../lib/utils"));
 const utils_1 = require("../lib/utils");
@@ -498,8 +496,8 @@ const definitions = [
             fromZigbee_1.default.ignore_haDiagnostic,
             fromZigbee_1.default.ignore_genOta,
             fromZigbee_1.default.ignore_zclversion_read,
-            legacy.fz.wiser_thermostat,
-            legacy.fz.wiser_itrv_battery,
+            fromZigbee_1.default.thermostat,
+            fromZigbee_1.default.battery,
             fromZigbee_1.default.hvac_user_interface,
             fromZigbee_1.default.wiser_device_info,
         ],
@@ -547,7 +545,7 @@ const definitions = [
         model: 'CCT5010-0001',
         vendor: 'Schneider Electric',
         description: 'Micro module dimmer',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [(0, modernExtend_1.light)({ configureReporting: true, levelConfig: {} })],
         fromZigbee: [fromZigbee_1.default.wiser_lighting_ballast_configuration],
         toZigbee: [toZigbee_1.default.ballast_config, toZigbee_1.default.wiser_dimmer_mode],
@@ -573,7 +571,7 @@ const definitions = [
         model: 'CCT5011-0001/CCT5011-0002/MEG5011-0001',
         vendor: 'Schneider Electric',
         description: 'Micro module switch',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [(0, modernExtend_1.onOff)({ powerOnBehavior: false })],
         whiteLabel: [{ vendor: 'Elko', model: 'EKO07144' }],
     },
@@ -582,7 +580,7 @@ const definitions = [
         model: 'CCT5010-0003',
         vendor: 'Schneider Electric',
         description: 'Micro module dimmer with neutral lead',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [(0, modernExtend_1.light)({ configureReporting: true, levelConfig: {} })],
         fromZigbee: [fromZigbee_1.default.wiser_lighting_ballast_configuration],
         toZigbee: [toZigbee_1.default.ballast_config, toZigbee_1.default.wiser_dimmer_mode],
@@ -764,7 +762,7 @@ const definitions = [
                 .withValueMax(254)
                 .withDescription('Specifies the maximum light output of the ballast'),
         ],
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [indicatorMode('smart')],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -782,7 +780,7 @@ const definitions = [
         model: '41E2PBSWMZ/356PB2MBTZ',
         vendor: 'Schneider Electric',
         description: 'Wiser 40/300-Series module switch 2AX',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [(0, modernExtend_1.onOff)({ powerOnBehavior: false }), indicatorMode('smart')],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -799,7 +797,7 @@ const definitions = [
         model: '41E10PBSWMZ-VW',
         vendor: 'Schneider Electric',
         description: 'Wiser 40/300-Series module switch 10AX with ControlLink',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [(0, modernExtend_1.onOff)({ powerOnBehavior: false }), indicatorMode('smart')],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -819,7 +817,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.fan],
         toZigbee: [tzLocal.fan_mode],
         exposes: [e.fan().withModes(['off', 'low', 'medium', 'high', 'on'])],
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [fanIndicatorMode(), fanIndicatorOrientation()],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(7);
@@ -875,8 +873,8 @@ const definitions = [
             fromZigbee_1.default.ignore_haDiagnostic,
             fromZigbee_1.default.ignore_genOta,
             fromZigbee_1.default.ignore_zclversion_read,
-            legacy.fz.wiser_thermostat,
-            legacy.fz.wiser_itrv_battery,
+            fromZigbee_1.default.thermostat,
+            fromZigbee_1.default.battery,
             fromZigbee_1.default.hvac_user_interface,
             fromZigbee_1.default.wiser_device_info,
         ],
@@ -1529,7 +1527,6 @@ const definitions = [
         exposes: [
             e.switch().withEndpoint('l1'),
             e.occupancy(),
-            e.illuminance_lux(),
             e.illuminance(),
             e
                 .numeric('occupancy_timeout', ea.ALL)
@@ -1573,14 +1570,14 @@ const definitions = [
             await reporting.batteryPercentageRemaining(endpoint);
             await reporting.illuminance(endpoint, { min: 15, max: constants.repInterval.HOUR, change: 500 });
         },
-        exposes: [e.battery(), e.illuminance(), e.illuminance_lux(), e.occupancy()],
+        exposes: [e.battery(), e.illuminance(), e.occupancy()],
     },
     {
         zigbeeModel: ['CH/Socket/2'],
         model: '3025CSGZ',
         vendor: 'Schneider Electric',
         description: 'Dual connected smart socket',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { l1: 1, l2: 2 } }), (0, modernExtend_1.onOff)({ endpointNames: ['l1', 'l2'] })],
     },
     {
@@ -1629,7 +1626,7 @@ const definitions = [
         description: 'Wiser smoke alarm',
         fromZigbee: [fromZigbee_1.default.temperature, fromZigbee_1.default.battery, fromZigbee_1.default.ias_enroll, fromZigbee_1.default.ias_smoke_alarm_1],
         toZigbee: [],
-        ota: ota.zigbeeOTA, // local OTA updates are untested
+        ota: true, // local OTA updates are untested
         exposes: [
             e.smoke(),
             e.battery_low(),