zigbee-herdsman-converters 14.0.693 → 15.0.0

package/README.md

@@ -3,6 +3,11 @@
 # zigbee-herdsman-converters
 Collection of device converters to be used with zigbee-herdsman.
 
+## Breaking changes
+15.0.0
+- OTA `isUpdateAvailable` now returns an object instead of a boolean (e.g. `{available: true, currentFileVersion: 120, otaFileVersion: 125}`)
+- OTA `updateToLatest` now returns a number (`fileVersion` of the new OTA) instead of a void
+
 ## Contributing
 See [Zigbee2MQTT how to support new devices](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html).
 

package/devices/centralite.js

@@ -129,7 +129,7 @@ module.exports = [
                 // For some this fails so set manually
                 // https://github.com/Koenkk/zigbee2mqtt/issues/3575
                 endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {
-                    acCurrentDivisor: 10, acCurrentMultiplier: 1, powerMultiplier: 1, powerDivisor: 10});
+                    acCurrentDivisor: 1000, acCurrentMultiplier: 1, powerMultiplier: 1, powerDivisor: 10});
             }
             await reporting.rmsVoltage(endpoint, {change: 2}); // Voltage reports in V
             await reporting.rmsCurrent(endpoint, {change: 10}); // Current reports in mA

package/devices/legrand.js

@@ -123,14 +123,7 @@ module.exports = [
         model: '067776',
         vendor: 'Legrand',
         description: 'Netatmo wired shutter switch',
-        // the physical LED will be green when permit join is true, off otherwise and red when not linked
-        fromZigbee: [
-            // Devices can send an identify message when the configuration button is pressed
-            // (behind the physical buttons)
-            // Used on the official gateway to send to every devices an identify command (green)
-            fz.identify, fz.ignore_basic_report,
-            // support binary report on moving state (supposed)
-            fz.legrand_binary_input_moving, fz.cover_position_tilt],
+        fromZigbee: [fz.identify, fz.ignore_basic_report, fz.legrand_binary_input_moving, fz.cover_position_tilt],
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.legrand_identify, tz.legrand_settingEnableLedInDark],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -139,6 +132,22 @@ module.exports = [
         },
         exposes: [e.cover_position()],
     },
+    {
+        // swbuildid 001a requires coverInverted: https://github.com/Koenkk/zigbee2mqtt/issues/15101#issuecomment-1356787490
+        fingerprint: [{modelID: ' Shutter switch with neutral\u0000\u0000\u0000', softwareBuildID: '001a'}],
+        model: '067776_001a',
+        vendor: 'Legrand',
+        description: 'Netatmo wired shutter switch',
+        fromZigbee: [fz.identify, fz.ignore_basic_report, fz.legrand_binary_input_moving, fz.cover_position_tilt],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.legrand_identify, tz.legrand_settingEnableLedInDark],
+        meta: {coverInverted: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genBinaryInput', 'closuresWindowCovering', 'genIdentify']);
+            await reporting.currentPositionLiftPercentage(endpoint);
+        },
+        exposes: [e.cover_position()],
+    },
     {
         zigbeeModel: [
             ' Remote switch\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'],

package/devices/paulmann.js

@@ -11,7 +11,8 @@ module.exports = [
         description: 'Smart switch 4 buttons white',
         fromZigbee: [fz.command_on, fz.command_off, fz.battery],
         toZigbee: [],
-        exposes: [e.battery(), e.action(['on_1', 'off_1', 'on_2', 'off_2'])],
+        exposes: [e.battery(), e.action(['on_1', 'off_1', 'on_2', 'off_2', 'brightness_move_up_1', 'brightness_move_down_1',
+            'brightness_move_stop_1', 'brightness_move_up_2', 'brightness_move_down_2', 'brightness_move_stop_2'])],
         meta: {multiEndpoint: true},
     },
     {

package/devices/tuya.js

@@ -1632,6 +1632,7 @@ module.exports = [
             {modelID: 'TS0201', manufacturerName: '_TZ3000_6uzkisv2'},
             {modelID: 'TS0201', manufacturerName: '_TZ3000_xr3htd96'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_9yapgbuv'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_yjjdcqsq'},
         ],
         model: 'WSD500A',
         vendor: 'TuYa',
@@ -3662,7 +3663,17 @@ module.exports = [
         model: 'TS110E_1gang_1',
         vendor: 'TuYa',
         description: '1 channel dimmer',
-        extend: extend.light_onoff_brightness(),
+        fromZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
+            .fromZigbee.concat([tuya.fz.power_on_behavior, fzLocal.TS110E_switch_type, fzLocal.TS110E]),
+        toZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
+            .toZigbee.concat([tuya.tz.power_on_behavior, tzLocal.TS110E_options]),
+        meta: {multiEndpoint: true},
+        exposes: [e.light_brightness(), e.power_on_behavior(), tuya.exposes.switchType()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+        },
     },
     {
         fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_ngqk6jia']),

package/devices/woolley.js

@@ -14,4 +14,16 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        zigbeeModel: ['SA-030-1'],
+        model: 'SA-030',
+        vendor: 'Woolley',
+        description: 'Smart plug',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
 ];

package/lib/ota/common.js

@@ -258,7 +258,7 @@ async function isUpdateAvailable(device, logger, isNewImageAvailable, requestPay
     if (available > 0) {
         logger.warn(`Firmware on '${device.ieeeAddr}' is newer than latest firmware online.`);
     }
-    return (available < 0);
+    return {...available, available: available < 0};
 }
 
 async function isNewImageAvailable(current, logger, device, getImageMeta) {
@@ -270,7 +270,11 @@ async function isNewImageAvailable(current, logger, device, getImageMeta) {
         return -1; // Negative number means the new firmware is 'newer' than current one
     }
 
-    return Math.sign(current.fileVersion - meta.fileVersion);
+    return {
+        available: Math.sign(current.fileVersion - meta.fileVersion),
+        currentFileVersion: current.fileVersion,
+        otaFileVersion: meta.fileVersion,
+    };
 }
 
 async function updateToLatest(device, logger, onProgress, getNewImage, getImageMeta = null, downloadImage = null) {
@@ -393,7 +397,7 @@ async function updateToLatest(device, logger, onProgress, getNewImage, getImageM
                             logger.debug('Got device announce or timed out, call resolve');
                             clearInterval(timer);
                             device.removeListener('deviceAnnounce', cb);
-                            resolve();
+                            resolve(image.header.fileVersion);
                         };
                         timer = setTimeout(cb, 120 * 1000); // timeout after 2 minutes
                         device.once('deviceAnnounce', cb);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.693",
+  "version": "15.0.0",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -37,8 +37,8 @@
     "axios": "^1.2.1",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
-    "tar-stream": "^2.2.0",
-    "zigbee-herdsman": "^0.14.80"
+    "tar-stream": "^3.0.0",
+    "zigbee-herdsman": "^0.14.81"
   },
   "devDependencies": {
     "eslint": "*",