zigbee-herdsman-converters 14.0.587 → 14.0.588

package/converters/fromZigbee.js

@@ -8445,6 +8445,9 @@ const converters = {
                     break;
                 }
                 break;
+            case tuya.dataPoints.AM02AddRemoter: // DP 101: Ignore until need is defined
+            case tuya.dataPoints.AM02TimeTotal: // DP 10: Ignore until need is defined
+                break;
             default: // Unknown code
                 meta.logger.warn(`ZMAM02_cover: Unhandled DP #${dp} for ${meta.device.manufacturerName}:
                     ${JSON.stringify(dpValue)}`);

package/devices/blitzwolf.js

@@ -7,7 +7,7 @@ const e = exposes.presets;
 
 module.exports = [
     {
-        zigbeeModel: ['5j6ifxj'],
+        zigbeeModel: ['5j6ifxj', '5j6ifxj\u0000'],
         model: 'BW-IS3',
         vendor: 'BlitzWolf',
         description: 'Rechargeable Zigbee PIR motion sensor',

package/devices/ikea.js

@@ -5,7 +5,9 @@ const ota = require('../lib/ota');
 const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const {repInterval} = require('../lib/constants');
+const utils = require('../lib/utils');
 const extend = require('../lib/extend');
+const globalStore = require('../lib/store');
 const e = exposes.presets;
 const ea = exposes.access;
 const herdsman = require('zigbee-herdsman');
@@ -58,6 +60,39 @@ const configureRemote = async (device, coordinatorEndpoint, logger) => {
     await reporting.batteryPercentageRemaining(endpoint);
 };
 
+const fzLocal = {
+    // The STYRBAR sends an on +- 500ms after the arrow release. We don't want to send the ON action in this case.
+    // https://github.com/Koenkk/zigbee2mqtt/issues/13335
+    STYRBAR_on: {
+        cluster: 'genOnOff',
+        type: 'commandOn',
+        convert: (model, msg, publish, options, meta) => {
+            if (utils.hasAlreadyProcessedMessage(msg)) return;
+            const arrowReleaseAgo = Date.now() - globalStore.getValue(msg.endpoint, 'arrow_release', 0);
+            if (arrowReleaseAgo > 700) {
+                return {action: 'on'};
+            }
+        },
+    },
+    STYRBAR_arrow_release: {
+        cluster: 'genScenes',
+        type: 'commandTradfriArrowRelease',
+        options: [exposes.options.legacy()],
+        convert: (model, msg, publish, options, meta) => {
+            if (utils.hasAlreadyProcessedMessage(msg)) return;
+            globalStore.putValue(msg.endpoint, 'arrow_release', Date.now());
+            const direction = globalStore.getValue(msg.endpoint, 'direction');
+            if (direction) {
+                globalStore.clearValue(msg.endpoint, 'direction');
+                const duration = msg.data.value / 1000;
+                const result = {action: `arrow_${direction}_release`, duration, action_duration: duration};
+                if (!utils.isLegacyEnabled(options)) delete result.duration;
+                return result;
+            }
+        },
+    },
+};
+
 const tradfriExtend = {
     light_onoff_brightness: (options = {}) => ({
         ...extend.light_onoff_brightness(options),
@@ -571,9 +606,9 @@ module.exports = [
         zigbeeModel: ['Remote Control N2'],
         model: 'E2001/E2002',
         vendor: 'IKEA',
-        description: 'STYRBAR remote control N2',
-        fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.ikea_arrow_click,
-            fz.ikea_arrow_hold, fz.ikea_arrow_release],
+        description: 'STYRBAR remote control',
+        fromZigbee: [fz.battery, fzLocal.STYRBAR_on, fz.command_off, fz.command_move, fz.command_stop, fz.ikea_arrow_click,
+            fz.ikea_arrow_hold, fzLocal.STYRBAR_arrow_release],
         exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down',
             'brightness_stop', 'arrow_left_click', 'arrow_right_click', 'arrow_left_hold',
             'arrow_right_hold', 'arrow_left_release', 'arrow_right_release'])],

package/devices/namron.js

@@ -8,6 +8,13 @@ const ea = exposes.access;
 const e = exposes.presets;
 
 module.exports = [
+    {
+        zigbeeModel: ['3308431'],
+        model: '3308431',
+        vendor: 'Namron',
+        description: 'Luna ceiling light',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+    },
     {
         zigbeeModel: ['3802967'],
         model: '3802967',

package/devices/zemismart.js

@@ -154,10 +154,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [
-            {modelID: 'TS0601', manufacturerName: '_TZE200_iossyxra'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_gubdgai2'},
-        ],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_iossyxra'}],
         model: 'ZM-AM02_cover',
         vendor: 'Zemismart',
         description: 'Zigbee/RF curtain converter',
@@ -183,6 +180,18 @@ module.exports = [
         // exposes.enum('situation_set', ea.STATE, Object.values(tuya.ZMAM02.AM02Situation)),
         ],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_gubdgai2'}],
+        model: 'M515EGBZTN',
+        vendor: 'Zemismart',
+        description: 'Roller shade driver',
+        fromZigbee: [fz.ZMAM02_cover],
+        toZigbee: [tz.ZMAM02_cover],
+        exposes: [e.cover_position().setAccess('position', ea.STATE_SET),
+            exposes.enum('motor_direction', ea.STATE_SET, Object.values(tuya.ZMLookups.AM02Direction)),
+            exposes.enum('border', ea.STATE_SET, Object.values(tuya.ZMLookups.AM02Border)),
+        ],
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_fzo2pocs'}],
         model: 'ZM25TQ',

package/package.json

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