zigbee-herdsman-converters 14.0.382 → 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/cleode.js

@@ -0,0 +1,20 @@
+const exposes = require('../lib/exposes');
+const reporting = require('../lib/reporting');
+const e = exposes.presets;
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['ZPLUG'],
+        model: 'ZPLUG_Boost',
+        vendor: 'CLEODE',
+        description: 'ZPlug boost',
+        extend: extend.switch(),
+        exposes: [e.switch(), e.power()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+        },
+    },
+];

package/devices/gledopto.js

@@ -508,6 +508,13 @@ module.exports = [
         description: 'Zigbee 10W Floodlight RGB+CCT',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['GL-B-003P'],
+        model: 'GL-B-003P',
+        vendor: 'Gledopto',
+        description: 'Zigbee 7W E26/E27 Bulb RGB+CCT (pro)',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [155, 495]}),
+    },
     {
         zigbeeModel: ['GL-FL-004TZS'],
         model: 'GL-FL-004TZS',

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

@@ -29,6 +29,15 @@ const hueExtend = {
 };
 
 module.exports = [
+    {
+        zigbeeModel: ['929003056901'],
+        model: '929003056901',
+        vendor: 'Philips',
+        description: 'Hue Struana 27W',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['LWA018'],
         model: '9290024693',
@@ -1534,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/tubeszb.js

@@ -0,0 +1,20 @@
+const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const reporting = require('../lib/reporting');
+
+module.exports = [
+    {
+        zigbeeModel: ['tubeszb.router'],
+        model: 'tubeszb.router',
+        vendor: 'TubesZB',
+        description: '[CC2652 Router](https://github.com/tube0013/tube_gateways/tree/main/tube_cc_router)',
+        fromZigbee: [fz.linkquality_from_basic],
+        toZigbee: [],
+        exposes: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(8);
+            const payload = [{attribute: 'zclVersion', minimumReportInterval: 0, maximumReportInterval: 3600, reportableChange: 0}];
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
+            await endpoint.configureReporting('genBasic', payload);
+        },
+    },
+];

package/devices/tuya.js

@@ -163,6 +163,7 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bicjqpg4'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_cmaky9gq'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_k1pe6ibm'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bfwvfyx1'}],
         model: 'TS0505B',
         vendor: 'TuYa',
@@ -179,7 +180,8 @@ module.exports = [
         fingerprint: [{modelID: 'TS0503B', manufacturerName: '_TZ3000_i8l0nqdu'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_a5fxguxr'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_778drfdt'},
-            {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'}],
+            {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'},
+            {modelID: 'TS0503B', manufacturerName: '_TZ3210_trm3l2aw'}],
         model: 'TS0503B',
         vendor: 'TuYa',
         description: 'Zigbee RGB light',
@@ -225,6 +227,7 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TZ3000_msl6wxk9'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_tv3wxhcz'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_hqbdru35'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_tiwq83wk'},
             {modelID: 'WHD02', manufacturerName: '_TZ3000_hktqahrq'}],
         model: 'TS0202',
         vendor: 'TuYa',
@@ -505,6 +508,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_psgq7ysz'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3000_zw7wr5uo'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_pz9zmxjj'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3000_fzwhym79'},
         ],
         model: 'TS0502B',
         vendor: 'TuYa',
@@ -841,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/xiaomi.js

@@ -81,11 +81,11 @@ module.exports = [
         model: 'ZNLDP12LM',
         vendor: 'Xiaomi',
         description: 'Aqara smart LED bulb',
-        toZigbee: xiaomiExtend.light_onoff_brightness_colortemp().toZigbee.concat([
+        toZigbee: xiaomiExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}).toZigbee.concat([
             tz.xiaomi_light_power_outage_memory]),
-        fromZigbee: xiaomiExtend.light_onoff_brightness_colortemp().fromZigbee,
+        fromZigbee: xiaomiExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}).fromZigbee,
         // power_on_behavior 'toggle' does not seem to be supported
-        exposes: xiaomiExtend.light_onoff_brightness_colortemp().exposes.concat([
+        exposes: xiaomiExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}).exposes.concat([
             e.power_outage_memory().withAccess(ea.STATE_SET)]),
         ota: ota.zigbeeOTA,
     },
@@ -1403,18 +1403,14 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara single switch module T1 (with neutral)',
         // Ignore energy metering reports, rely on aqara_opple: https://github.com/Koenkk/zigbee2mqtt/issues/10709
-        fromZigbee: [fz.on_off, fz.device_temperature, fz.aqara_opple, fz.ignore_metering, fz.ignore_electrical_measurement],
+        fromZigbee: [fz.on_off, fz.device_temperature, fz.aqara_opple, fz.ignore_metering, fz.ignore_electrical_measurement,
+            fz.xiaomi_power],
         exposes: [e.switch(), e.energy(), e.power(), e.device_temperature(), e.power_outage_memory(), e.switch_type()],
         toZigbee: [tz.xiaomi_switch_type, tz.on_off, tz.xiaomi_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering', 'genDeviceTempCfg']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genDeviceTempCfg']);
             await reporting.onOff(endpoint);
-            // Gives UNSUPPORTED_ATTRIBUTE on reporting.readEletricalMeasurementMultiplierDivisors.
-            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint);
-            await reporting.activePower(endpoint, {min: 5, max: 600, change: 10});
             await reporting.deviceTemperature(endpoint);
             device.powerSource = 'Mains (single phase)';
             device.save();

package/devices/zemismart.js

@@ -5,6 +5,7 @@ const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
 const tuya = require('../lib/tuya');
+const ea = exposes.access;
 
 const fzLocal = {
     ZMRM02: {
@@ -102,4 +103,47 @@ module.exports = [
             'button_5_hold', 'button_5_single', 'button_5_double',
             'button_6_hold', 'button_6_single', 'button_6_double'])],
     },
+    {
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_zigisuyh'}],
+        model: 'ZIGBEE-B09-UK',
+        vendor: 'Zemismart',
+        description: 'Zigbee smart outlet universal socket with USB port',
+        fromZigbee: [fz.on_off, fz.tuya_switch_power_outage_memory],
+        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'),
+            exposes.enum('power_outage_memory', ea.STATE_SET, ['on', 'off', 'restore'])
+                .withDescription('Recover state after power outage')],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(device.getEndpoint(1));
+            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/ota/zigbeeOTA.js

@@ -32,8 +32,18 @@ async function getIndexFile(urlOrName) {
     return JSON.parse(fs.readFileSync(urlOrName));
 }
 
+function readLocalFile(fileName, logger) {
+    // If the file name is not a full path, then treat it as a relative to the data directory
+    if (!path.isAbsolute(fileName) && dataDir) {
+        fileName = path.join(dataDir, fileName);
+    }
+
+    logger.debug(`ZigbeeOTA: getting local firmware file ${fileName}`);
+    return fs.readFileSync(fileName);
+}
+
 async function getFirmwareFile(image, logger) {
-    let urlOrName = image.url;
+    const urlOrName = image.url;
 
     // First try to download firmware file with the URL provided
     if (isValidUrl(urlOrName)) {
@@ -41,15 +51,33 @@ async function getFirmwareFile(image, logger) {
         return await axios.get(urlOrName, {responseType: 'arraybuffer'});
     }
 
-    // If the file name is not a full path, then treat it as a relative to the data directory
-    if (!path.isAbsolute(urlOrName) && dataDir) {
-        urlOrName = path.join(dataDir, urlOrName);
+    return {data: readLocalFile(urlOrName, logger)};
+}
+
+function fillImageInfo(meta, logger) {
+    // Web-hosted images must come with all fields filled already
+    if (isValidUrl(meta.url)) {
+        return meta;
     }
 
-    logger.debug(`ZigbeeOTA: getting local firmware file ${urlOrName}`);
-    return {data: fs.readFileSync(urlOrName)};
-}
+    // Nothing to do if needed fields were filled already
+    if (meta.hasOwnProperty('imageType') &&
+        meta.hasOwnProperty('manufacturerCode') &&
+        meta.hasOwnProperty('fileVersion')) {
+        return meta;
+    }
+
+    // If no fields provided - get them from the image file
+    const buffer = readLocalFile(meta.url, logger);
+    const start = buffer.indexOf(common.upgradeFileIdentifier);
+    const image = common.parseImage(buffer.slice(start));
 
+    // Will fill only those fields that were absent
+    if (!meta.hasOwnProperty('imageType')) meta.imageType = image.header.imageType;
+    if (!meta.hasOwnProperty('manufacturerCode')) meta.manufacturerCode = image.header.manufacturerCode;
+    if (!meta.hasOwnProperty('fileVersion')) meta.fileVersion = image.header.fileVersion;
+    return meta;
+}
 
 async function getIndex(logger) {
     const index = (await axios.get(url)).data;
@@ -61,7 +89,7 @@ async function getIndex(logger) {
         const localIndex = await getIndexFile(overrideIndexFileName);
 
         // Resulting index will have overriden items first
-        return localIndex.concat(index);
+        return localIndex.concat(index).map((item) => isValidUrl(item.url) ? item : fillImageInfo(item, logger));
     }
 
     return index;

package/lib/reporting.js

@@ -84,7 +84,7 @@ module.exports = {
         await endpoint.configureReporting('msTemperatureMeasurement', p);
     },
     deviceTemperature: async (endpoint, overrides) => {
-        const p = payload('currentTemperature', 10, repInterval.HOUR, 1, overrides);
+        const p = payload('currentTemperature', 300, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('genDeviceTempCfg', p);
     },
     pressure: async (endpoint, overrides) => {

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,
 };