zigbee-herdsman-converters 14.0.385 → 14.0.386

package/converters/fromZigbee.js

@@ -7956,6 +7956,81 @@ const converters = {
             return {action};
         },
     },
+    ZMAM02: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport', 'commandSetDataresponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            // let value = tuya.getDataValue(dpValue);
+            // let result = null;
+            for (const dpValue of msg.data.dpValues) {
+                const value = tuya.getDataValue(dpValue);
+                switch (dpValue.dp) {
+                case tuya.dataPoints.AM02Control:
+                    result.control = tuya.ZMAM02.AM02Control[value];
+                    break;
+                case tuya.dataPoints.AM02PercentControl:
+                    result.percent_control = value;
+                    break;
+                case tuya.dataPoints.AM02ControlBackMode:
+                    result.control_back_mode = tuya.ZMAM02.AM02Direction[value];
+                    break;
+                case tuya.dataPoints.AM02MotorWorkingMode:
+                    switch (value) {
+                    case 0: // continuous 1
+                        result.motor_working_mode = 'continuous';
+                        break;
+                    case 1: // intermittently
+                        result.motor_working_mode = 'intermittently';
+                        break;
+                    default:
+                        meta.logger.warn('zigbee-herdsman-converters:ZM_AM_02: ' +
+                        `Mode ${value} is not recognized.`);
+                        break;
+                    }
+                    break;
+                case tuya.dataPoints.AM02Border:
+                    switch (value) {
+                    case 0: // up
+                        result.border = 'up';
+                        break;
+                    case 1: // down
+                        result.border = 'down';
+                        break;
+                    case 2: // down_delete
+                        result.border = 'down_delete';
+                        break;
+                    default:
+                        meta.logger.warn('zigbee-herdsman-converters:ZM_AM_02: ' +
+                        `Mode ${value} is not recognized.`);
+                        break;
+                    }
+                    break;
+                case tuya.dataPoints.AM02PercentState:
+                    result.percent_state = value;
+                    break;
+                case tuya.dataPoints.AM02Mode:
+                    switch (value) {
+                    case 0: // morning
+                        result.mode = 'morning';
+                        break;
+                    case 1: // night
+                        result.mode = 'night';
+                        break;
+                    default:
+                        meta.logger.warn('zigbee-herdsman-converters:ZM_AM_02: ' +
+                          `Mode ${value} is not recognized.`);
+                        break;
+                    }
+                    break;
+                default:
+                    meta.logger.warn(`fromZigbee.Zemismart Shader Konverter (Zm_AM02): NOT RECOGNIZED ` +
+                      `DP #${dpValue.dp} with data ${JSON.stringify(dpValue)}`);
+                }
+            }
+            return result;
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).

package/converters/toZigbee.js

@@ -6592,6 +6592,33 @@ const converters = {
             }
         },
     },
+    ZMAM02: {
+        key: ['control', 'percent_control', 'mode', 'control_back_mode', 'border', 'motor_working_mode'],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'control':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.AM02Control, utils.getKey(tuya.ZMAM02.AM02Control, value));
+                break;
+            case 'percent_control':
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.AM02PercentState, value);
+                break;
+            case 'mode':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.AM02Mode, utils.getKey(tuya.ZMAM02.AM02Mode, value));
+                break;
+            case 'control_back_mode':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.AM02ControlBackMode, utils.getKey(tuya.ZMAM02.AM02Direction, value));
+                break;
+            case 'border':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.AM02Border, utils.getKey(tuya.ZMAM02.AM02Border, value));
+                break;
+            case 'motor_working_mode':
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.AM02MotorWorkingMode, utils.getKey(tuya.ZMAM02.AM02MotorMode, value));
+                break;
+            default: // Unknown Key
+                meta.logger.warn(`toZigbee.ZMAM02: Unhandled Key ${key}`);
+            }
+        },
+    },
     // #endregion
 
     // #region Ignore converters

package/devices/ikea.js

@@ -252,7 +252,7 @@ module.exports = [
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['TRADFRI bulb E27 WS clear 950lm', 'TRADFRI bulb E26 WS clear 950lm'],
+        zigbeeModel: ['TRADFRI bulb E27 WS clear 950lm', 'TRADFRI bulb E26 WS clear 950lm', 'TRADFRI bulb E27 WS\uFFFDclear 950lm'],
         model: 'LED1546G12',
         vendor: 'IKEA',
         description: 'TRADFRI LED bulb E26/E27 950 lumen, dimmable, white spectrum, clear',

package/devices/miboxer.js

@@ -4,6 +4,7 @@ const tz = require('../converters/toZigbee');
 const e = exposes.presets;
 const ea = exposes.access;
 const extend = require('../lib/extend');
+const tuya = require('../lib/tuya');
 
 module.exports = [
     {
@@ -21,11 +22,13 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS0501B', manufacturerName: '_TZ3210_dxroobu3'}],
+        fingerprint: [{modelID: 'TS0501B', manufacturerName: '_TZ3210_dxroobu3'},
+            {modelID: 'TS0501B', manufacturerName: '_TZ3210_dbilpfqk'}],
         model: 'FUT036Z',
         description: 'Single color LED controller',
         vendor: 'Miboxer',
         extend: extend.light_onoff_brightness(),
+        onEvent: tuya.onEventSetTime,
     },
     {
         fingerprint: [{modelID: 'TS0502B', manufacturerName: '_TZ3210_frm6149r'}],

package/devices/philips.js

@@ -1543,6 +1543,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color(),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['LCF003', '4080248P7'],
+        model: '4080248P7',
+        vendor: 'Philips',
+        description: 'Hue Signe floor light',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['4080248U9'],
         model: '4080248U9',

package/devices/tuya.js

@@ -845,7 +845,6 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_fzo2pocs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_5sbebbzs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zuz7f94z'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_iossyxra'},
         ],
         model: 'TS0601_cover',
         vendor: 'TuYa',

package/devices/zemismart.js

@@ -124,4 +124,26 @@ module.exports = [
             await reporting.onOff(device.getEndpoint(2));
         },
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_iossyxra'}],
+        model: 'ZM-AM02',
+        vendor: 'Zemismart',
+        description: 'Zigbee/RF curtain converter',
+        fromZigbee: [fz.ZMAM02],
+        toZigbee: [tz.ZMAM02],
+        exposes: [exposes.enum('motor_working_mode', ea.STATE_SET, Object.values(tuya.ZMAM02.AM02MotorMode)),
+            exposes.enum('control', ea.STATE_SET, Object.values(tuya.ZMAM02.AM02Control)),
+            exposes.numeric('percent_state', ea.STATE).withValueMin(0).withValueMax(100).withValueStep(1).withUnit('%'),
+            exposes.enum('mode', ea.STATE_SET, Object.values(tuya.ZMAM02.AM02Mode)),
+            exposes.enum('control_back_mode', ea.STATE_SET, Object.values(tuya.ZMAM02.AM02Direction)),
+            exposes.enum('border', ea.STATE_SET, Object.values(tuya.ZMAM02.AM02Border)),
+        // ---------------------------------------------------------------------------------
+        // DP exists, but not used at the moment
+        // exposes.numeric('percent_control', ea.STATE_SET).withValueMin(0).withValueMax(100).withValueStep(1).withUnit('%'),
+        // exposes.enum('work_state', ea.STATE, Object.values(tuya.ZMAM02.AM02WorkState)),
+        // exposes.numeric('countdown_left', ea.STATE).withUnit('s'),
+        // exposes.numeric('time_total', ea.STATE).withUnit('ms'),
+        // exposes.enum('situation_set', ea.STATE, Object.values(tuya.ZMAM02.AM02Situation)),
+        ],
+    },
 ];

package/lib/tuya.js

@@ -537,6 +537,20 @@ const dataPoints = {
     evanellLocalTemp: 5,
     evanellBattery: 6,
     evanellChildLock: 8,
+    // ZMAM02 Zemismart RF Courtain Converter
+    AM02Control: 1,
+    AM02PercentControl: 2,
+    AM02PercentState: 3,
+    AM02Mode: 4,
+    AM02ControlBackMode: 5,
+    AM02WorkState: 7,
+    AM02CountdownLeft: 9,
+    AM02TimeTotal: 10,
+    AM02SituationSet: 11,
+    AM02Fault: 12,
+    AM02Border: 16,
+    AM02MotorWorkingMode: 20,
+    AM02AddRemoter: 101,
 };
 
 const thermostatWeekFormat = {
@@ -650,6 +664,40 @@ const tvThermostatPreset = {
     1: 'manual',
     3: 'holiday',
 };
+// Zemismart ZM_AM02 Roller Shade Converter
+const ZMAM02 = {
+    AM02Mode: {
+        0: 'morning',
+        1: 'night',
+    },
+    AM02Control: {
+        0: 'open',
+        1: 'stop',
+        2: 'close',
+        3: 'continue',
+    },
+    AM02Direction: {
+        0: 'forward',
+        1: 'back',
+    },
+    AM02WorkState: {
+        0: 'opening',
+        1: 'closing',
+    },
+    AM02Border: {
+        0: 'up',
+        1: 'down',
+        2: 'down_delete',
+    },
+    AM02Situation: {
+        0: 'fully_open',
+        1: 'fully_close',
+    },
+    AM02MotorMode: {
+        0: 'continuous',
+        1: 'intermittently',
+    },
+};
 
 // Return `seq` - transaction ID for handling concrete response
 async function sendDataPoints(entity, dpValues, cmd, seq=undefined) {
@@ -800,4 +848,5 @@ module.exports = {
     tvThermostatMode,
     tvThermostatPreset,
     tuyaRadar,
+    ZMAM02,
 };