zigbee-herdsman-converters 15.0.78 → 15.0.80

package/devices/ledvance.js

@@ -210,6 +210,22 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['A60 RGBW T'],
+        model: '4058075729025',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ lamp E27 RGBTW',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
+    {
+        zigbeeModel: ['A60 RGBW B22D T'],
+        model: '4058075729049',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ lamp B22D RGBTW',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
     {
         zigbeeModel: ['A60 DIM T'],
         model: '4058075728981',

package/devices/owon.js

@@ -282,7 +282,7 @@ module.exports = [
         ],
     },
     {
-        zigbeeModel: ['PCT504'],
+        zigbeeModel: ['PCT504', 'PCT504-E'],
         model: 'PCT504',
         vendor: 'OWON',
         description: 'HVAC fan coil',

package/devices/saswell.js

@@ -35,7 +35,7 @@ module.exports = [
         toZigbee: [tz.saswell_thermostat_current_heating_setpoint, tz.saswell_thermostat_mode, tz.saswell_thermostat_away,
             tz.saswell_thermostat_child_lock, tz.saswell_thermostat_window_detection, tz.saswell_thermostat_frost_detection,
             tz.saswell_thermostat_calibration, tz.saswell_thermostat_anti_scaling, tz.tuya_thermostat_weekly_schedule],
-        onEvent: tuya.onEventSetTime,
+        onEvent: (type, data, device) => !['_TZE200_c88teujp'].includes(device.manufacturerName) && tuya.onEventSetTime(type, data, device),
         meta: {
             thermostat: {
                 weeklyScheduleMaxTransitions: 4,

package/devices/tuya.js

@@ -2665,6 +2665,26 @@ module.exports = [
                 [66, 100, 160].includes(device.applicationVersion), // polling for energy
             ),
     },
+    {
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_wbloefbf'}],
+        model: 'TS011F_switch_5_gang',
+        description: '2 gang 2 usb 1 wall ac outlet',
+        whiteLabel: [{vendor: 'Milfra', model: 'M11Z'}],
+        vendor: 'TuYa',
+        extend: tuya.extend.switch({powerOutageMemory: true, childLock: true, endpoints: ['l1', 'l2', 'l3', 'l4', 'l5']}),
+        endpoint: (device) => {
+            return {l1: 1, l2: 2, l3: 3, l4: 4, l5: 5};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(5), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
     {
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ntcy3xu1', '_TZE200_ytibqbra']),
         model: 'TS0601_smoke_1',

package/devices/ubisys.js

@@ -925,4 +925,14 @@ module.exports = [
         },
         ota: ota.ubisys,
     },
+    {
+        zigbeeModel: ['R0 (5501)'],
+        model: 'R0',
+        vendor: 'Ubisys',
+        description: 'Zigbee Router',
+        fromZigbee: [fz.linkquality_from_basic],
+        toZigbee: [],
+        exposes: [],
+        ota: ota.ubisys,
+    },
 ];

package/lib/tuya.js

@@ -1245,6 +1245,14 @@ const valueConverter = {
     divideBy10: valueConverterBasic.divideBy(10),
     divideBy1000: valueConverterBasic.divideBy(1000),
     raw: valueConverterBasic.raw(),
+    coverPosition: {
+        to: async (v, meta) => {
+            return meta.options.invert_cover ? 100 - v : v;
+        },
+        from: (v, meta, options) => {
+            return options.invert_cover ? 100 - v : v;
+        },
+    },
     plus1: {
         from: (v) => v + 1,
         to: (v) => v - 1,
@@ -1824,9 +1832,9 @@ const tuyaFz = {
                 if (dpEntry) {
                     const value = getDataValue(dpValue);
                     if (dpEntry[1]) {
-                        result[dpEntry[1]] = dpEntry[2].from(value, meta);
+                        result[dpEntry[1]] = dpEntry[2].from(value, meta, options);
                     } else if (dpEntry[2]) {
-                        result = {...result, ...dpEntry[2].from(value, meta)};
+                        result = {...result, ...dpEntry[2].from(value, meta, options)};
                     }
                 } else {
                     meta.logger.debug(`Datapoint ${dpId} not defined for '${meta.device.manufacturerName}' ` +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.78",
+  "version": "15.0.80",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [