zigbee-herdsman-converters 14.0.473 → 14.0.476

package/converters/fromZigbee.js

@@ -2491,7 +2491,6 @@ const converters = {
             const dpValue = tuya.firstDpValue(msg, meta, 'neo_nas_pd07');
             const dp = dpValue.dp;
             const value = tuya.getDataValue(dpValue);
-
             if (dp === 101) return {occupancy: value > 0 ? true : false};
             else if (dp === 102) {
                 return {
@@ -2504,8 +2503,19 @@ const converters = {
                 return {temperature: calibrateAndPrecisionRoundOptions(value / 10, options, 'temperature')};
             } else if (dp === 105) {
                 return {humidity: calibrateAndPrecisionRoundOptions(value, options, 'humidity')};
+            } else if (dp === tuya.dataPoints.neoMinTemp) {
+                return {temperature_min: value};
+            } else if (dp === tuya.dataPoints.neoMaxTemp) {
+                return {temperature_max: value};
+            } else if (dp === tuya.dataPoints.neoMinHumidity) {
+                return {humidity_min: value};
+            } else if (dp === tuya.dataPoints.neoMaxHumidity) {
+                return {humidity_max: value};
+            } else if (dp === 113) {
+                return {alarm: {0: 'over_temperature', 1: 'over_humidity',
+                    2: 'below_min_temperature', 3: 'below_min_humdity', 4: 'off'}[value]};
             } else {
-                meta.logger.warn(`zigbee-herdsman-converters:NEO-PD07: NOT RECOGNIZED DP #${dp} with data ${JSON.stringify(dpValue)}`);
+                meta.logger.warn(`fromZigbee.neo_nas_pd07: Unrecognized DP #${dp} with data ${JSON.stringify(dpValue)}`);
             }
         },
     },
@@ -7194,6 +7204,27 @@ const converters = {
             return {occupancy: (zoneStatus & 1) > 0, tamper: (zoneStatus & 4) > 0};
         },
     },
+    ZB006X_settings: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const dpValue = tuya.firstDpValue(msg, meta, 'ZB006X_settings');
+            const dp = dpValue.dp;
+            const value = tuya.getDataValue(dpValue);
+            if (dp === 103) {
+                meta.logger.debug(`fromZigbee.ZB006X_settings: Found DP #${dp} with data ${JSON.stringify(dpValue)}`);
+                return {ext_switch_type: {0: 'unknown', 1: 'toggle_sw', 2: 'momentary_sw', 3: 'rotary_sw', 4: 'auto_config'}[value]};
+            } else if (dp === 105) {
+                meta.logger.debug(`fromZigbee.ZB006X_settings: Found DP #${dp} with data ${JSON.stringify(dpValue)}`);
+                return {load_detection_mode: {0: 'none', 1: 'first_power_on', 2: 'every_power_on'}[value]};
+            } else if (dp === 109) {
+                meta.logger.debug(`fromZigbee.ZB006X_settings: Found DP #${dp} with data ${JSON.stringify(dpValue)}`);
+                return {control_mode: {0: 'local', 1: 'remote', 2: 'both'}[value]};
+            } else {
+                meta.logger.warn(`fromZigbee.ZB006X_settings: Unrecognized DP #${dp} with data ${JSON.stringify(dpValue)}`);
+            }
+        },
+    },
     ZM35HQ_attr: {
         cluster: 'ssIasZone',
         type: ['attributeReport', 'readResponse'],
@@ -7534,11 +7565,11 @@ const converters = {
             if (0x8000 in msg.data) {
                 const firmware = msg.data[0x8000].join('.');
                 result.current_firmware = firmware;
-                msg.device.zhDevice.softwareBuildID = firmware;
+                meta.device.softwareBuildID = firmware;
             }
 
             if (0x8020 in msg.data) {
-                msg.device.zhDevice.hardwareVersion = msg.data[0x8020].join('.');
+                meta.device.hardwareVersion = msg.data[0x8020].join('.');
             }
 
             return result;

package/converters/toZigbee.js

@@ -5332,6 +5332,27 @@ const converters = {
             await entity.read(payloads[key][0], [payloads[key][1]]);
         },
     },
+    neo_nas_pd07: {
+        key: ['temperature_max', 'temperature_min', 'humidity_max', 'humidity_min'],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'temperature_max':
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.neoMaxTemp, value);
+                break;
+            case 'temperature_min':
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.neoMinTemp, value);
+                break;
+            case 'humidity_max':
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.neoMaxHumidity, value);
+                break;
+            case 'humidity_min':
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.neoMinHumidity, value);
+                break;
+            default: // Unknown key
+                throw new Error(`toZigbee.neo_nas_pd07: Unhandled key ${key}`);
+            }
+        },
+    },
     neo_t_h_alarm: {
         key: [
             'alarm', 'melody', 'volume', 'duration',
@@ -6285,6 +6306,28 @@ const converters = {
             }
         },
     },
+    ZB006X_settings: {
+        key: ['ext_switch_type', 'load_detection_mode', 'control_mode'],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'ext_switch_type':
+                meta.logger.debug(`toZigbee.ZB006X_settings: Send key/value [${key}|${value}]`);
+                await tuya.sendDataPointEnum(entity, 103, {'unknown': 0, 'toggle_sw': 1,
+                    'momentary_sw': 2, 'rotary_sw': 3, 'auto_config': 4}[value]);
+                break;
+            case 'load_detection_mode':
+                meta.logger.debug(`toZigbee.ZB006X_settings: Send key/value [${key}|${value}]`);
+                await tuya.sendDataPointEnum(entity, 105, {'none': 0, 'first_power_on': 1, 'every_power_on': 2}[value]);
+                break;
+            case 'control_mode':
+                meta.logger.debug(`toZigbee.ZB006X_settings: Send key/value [${key}|${value}]`);
+                await tuya.sendDataPointEnum(entity, 109, {'local': 0, 'remote': 1, 'both': 2}[value]);
+                break;
+            default: // Unknown key
+                throw new Error(`toZigbee.ZB006X_settings: Unhandled key ${key}`);
+            }
+        },
+    },
     ZM35HQ_attr: {
         key: [
             'sensitivity', 'keep_time',

package/devices/adeo.js

@@ -8,7 +8,7 @@ const e = exposes.presets;
 module.exports = [
     {
         zigbeeModel: ['ZBEK-4'],
-        model: 'IM-CDZDGAAA0005KA8MAN',
+        model: 'IM-CDZDGAAA0005KA_MAN',
         vendor: 'ADEO',
         description: 'ENKI LEXMAN RGBTW GU10 Bulb',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
@@ -27,6 +27,13 @@ module.exports = [
         description: 'ENKI LEXMAN E27 LED white',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['ZBEK-5'],
+        model: 'IST-CDZFB2AS007NA-MZN-01',
+        vendor: 'ADEO',
+        description: 'ENKI LEXMAN E27 LED white',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['ZBEK-3'],
         model: 'IP-CDZOTAAP005JA-MAN',

package/devices/develco.js

@@ -46,7 +46,8 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering', 'genDeviceTempCfg']);
             await reporting.onOff(endpoint);
             await reporting.deviceTemperature(endpoint);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            // Set to true, to access the acFrequencyDivisor and acFrequencyMultiplier attribute. Not all devices support this.
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint, true);
             await reporting.activePower(endpoint, {change: 10}); // Power reports with every 10W change
             await reporting.rmsCurrent(endpoint, {change: 20}); // Current reports with every 20mA change
             await reporting.rmsVoltage(endpoint, {min: constants.repInterval.MINUTES_5, change: 400}); // Limit reports to every 5m, or 4V

package/devices/dnake.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['CS-Z-CZ-2402'],
+        model: 'CS-Z-CZ-2402',
+        vendor: 'DNAKE',
+        description: 'Smart socket',
+        extend: extend.switch(),
+    },
+];

package/devices/fantem.js

@@ -13,7 +13,15 @@ module.exports = [
         vendor: 'Fantem',
         description: 'Smart dimmer module without neutral',
         extend: extend.light_onoff_brightness({noConfigure: true}),
-        exposes: [e.light_brightness()],
+        fromZigbee: [...extend.light_onoff_brightness({noConfigure: true}).fromZigbee, fz.ZB006X_settings],
+        toZigbee: [...extend.light_onoff_brightness({noConfigure: true}).toZigbee, tz.ZB006X_settings],
+        exposes: [e.light_brightness(),
+            exposes.enum('ext_switch_type', ea.STATE_SET, ['unknown', 'toggle_sw', 'momentary_sw', 'rotary_sw', 'auto_config'])
+                .withDescription('External switch type'),
+            exposes.enum('load_detection_mode', ea.STATE_SET, ['none', 'first_power_on', 'every_power_on'])
+                .withDescription('Load detection mode'),
+            exposes.enum('control_mode', ea.STATE_SET, ['local', 'remote', 'both']).withDescription('Control mode'),
+        ],
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
             const endpoint = device.getEndpoint(1);

package/devices/feibit.js

@@ -93,7 +93,7 @@ module.exports = [
         description: 'Combustible gas sensor',
         fromZigbee: [fz.ias_gas_alarm_2],
         toZigbee: [],
-        exposes: [e.gas(), e.battery_low(), e.tamper()],
+        exposes: [e.gas()],
     },
     {
         zigbeeModel: ['FNB56-WTS05FB2.0'],

package/devices/heiman.js

@@ -287,7 +287,7 @@ module.exports = [
         description: 'Smart motion sensor',
         fromZigbee: [fz.ias_occupancy_alarm_1],
         toZigbee: [],
-        exposes: [e.occupancy(), e.battery_low(), e.tamper()],
+        exposes: [e.occupancy(), e.battery_low()],
     },
     {
         zigbeeModel: ['HT-EM', 'TH-EM', 'TH-T_V14'],

package/devices/neo.js

@@ -63,9 +63,15 @@ module.exports = [
         vendor: 'Neo',
         description: 'Motion, temperature & humidity sensor',
         fromZigbee: [fz.neo_nas_pd07],
-        toZigbee: [],
+        toZigbee: [tz.neo_nas_pd07],
         onEvent: tuya.onEventSetTime,
         exposes: [e.occupancy(), e.humidity(), e.temperature(), e.tamper(), e.battery_low(),
-            exposes.enum('power_type', ea.STATE, ['battery_full', 'battery_high', 'battery_medium', 'battery_low', 'usb'])],
+            exposes.enum('power_type', ea.STATE, ['battery_full', 'battery_high', 'battery_medium', 'battery_low', 'usb']),
+            exposes.enum('alarm', ea.STATE, ['over_temperature', 'over_humidity', 'below_min_temperature', 'below_min_humdity', 'off'])
+                .withDescription('Temperature/humidity alarm status'),
+            exposes.numeric('temperature_min', ea.STATE_SET).withUnit('°C').withValueMin(-40).withValueMax(40),
+            exposes.numeric('temperature_max', ea.STATE_SET).withUnit('°C').withValueMin(-40).withValueMax(40),
+            exposes.numeric('humidity_min', ea.STATE_SET).withUnit('%').withValueMin(0).withValueMax(100),
+            exposes.numeric('humidity_max', ea.STATE_SET).withUnit('%').withValueMin(0).withValueMax(100)],
     },
 ];

package/devices/orvibo.js

@@ -7,7 +7,7 @@ const e = exposes.presets;
 
 module.exports = [
     {
-        zigbeeModel: ['ORVIBO Socket'],
+        zigbeeModel: ['ORVIBO Socket', '93e29b89b2ee45bea5bdbb7679d75d24'],
         model: 'OR-ZB-S010-3C',
         vendor: 'ORVIBO',
         description: 'Smart socket',

package/devices/smartthings.js

@@ -73,17 +73,30 @@ module.exports = [
         model: '3321-S',
         vendor: 'SmartThings',
         description: 'Multi Sensor (2015 model)',
-        fromZigbee: [fz.temperature, fz.ias_contact_alarm_1_report, fz.ias_contact_alarm_1, fz.battery],
+        fromZigbee: [fz.temperature, fz.ias_contact_alarm_1_report, fz.ias_contact_alarm_1, fz.battery, fz.smartthings_acceleration],
         toZigbee: [],
         meta: {battery: {voltageToPercentage: '3V_2100'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement']);
-            await endpoint.read('genPowerCfg', ['batteryVoltage']);
+            const options = {manufacturerCode: 0x104E};
+            await reporting.bind(endpoint, coordinatorEndpoint,
+                ['msTemperatureMeasurement', 'genPowerCfg', 'manuSpecificSamsungAccelerometer']);
             await reporting.temperature(endpoint);
             await reporting.batteryVoltage(endpoint);
+            const payloadA = reporting.payload('acceleration', 10, constants.repInterval.MINUTE, 1);
+            await endpoint.configureReporting('manuSpecificSamsungAccelerometer', payloadA, options);
+            const payloadX = reporting.payload('x_axis', 10, constants.repInterval.MINUTE, 1);
+            await endpoint.configureReporting('manuSpecificSamsungAccelerometer', payloadX, options);
+            const payloadY = reporting.payload('y_axis', 10, constants.repInterval.MINUTE, 1);
+            await endpoint.configureReporting('manuSpecificSamsungAccelerometer', payloadY, options);
+            const payloadZ = reporting.payload('z_axis', 10, constants.repInterval.MINUTE, 1);
+            await endpoint.configureReporting('manuSpecificSamsungAccelerometer', payloadZ, options);
+            // Has Unknown power source, force it.
+            device.powerSource = 'Battery';
+            device.save();
         },
-        exposes: [e.temperature(), e.contact(), e.battery_low(), e.tamper(), e.battery()],
+        exposes: [e.temperature(), e.contact(), e.battery_low(), e.tamper(), e.battery(),
+            e.moving(), e.x_axis(), e.y_axis(), e.z_axis()],
     },
     {
         zigbeeModel: ['3200-Sgb'],

package/devices/tuya.js

@@ -215,7 +215,7 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_mvn6jl7x'},
             {modelID: 'TS011F', manufacturerName: '_TZ3000_raviyuvk'}, {modelID: 'TS011F', manufacturerName: '_TYZB01_hlla45kx'},
-            {modelID: 'TS011F', manufacturerName: '_TZ3000_92qd4sqa'}],
+            {modelID: 'TS011F', manufacturerName: '_TZ3000_92qd4sqa'}, {modelID: 'TS011F', manufacturerName: '_TZ3000_zwaadvus'}],
         model: 'TS011F_2_gang_wall',
         vendor: 'TuYa',
         description: '2 gang wall outlet',
@@ -682,6 +682,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_rm0hthdo'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_zwqnazkb'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_ijsj2evj'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3210_pgq2qvyv'},
         ],
         model: 'TS0502B',
         vendor: 'TuYa',

package/lib/reporting.js

@@ -18,11 +18,17 @@ function payload(attribute, min, max, change, overrides) {
     return [payload];
 }
 
-async function readEletricalMeasurementMultiplierDivisors(endpoint) {
+// Fix the problem that commit #3839 introduced.
+// You can set readFrequencyAttrs = true if the device support acFrequencyDivisor and acFrequencyMultiplier
+// See Develco.js SPLZB-132 for example
+async function readEletricalMeasurementMultiplierDivisors(endpoint, readFrequencyAttrs = false) {
     // Split into three chunks, some devices fail to respond when reading too much attributes at once.
     await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor', 'acCurrentMultiplier']);
     await endpoint.read('haElectricalMeasurement', ['acCurrentDivisor', 'acPowerMultiplier', 'acPowerDivisor']);
-    await endpoint.read('haElectricalMeasurement', ['acFrequencyDivisor', 'acFrequencyMultiplier']);
+    // Only read frequency multiplier/devisor when enabled as not all devices support this.
+    if (readFrequencyAttrs) {
+        await endpoint.read('haElectricalMeasurement', ['acFrequencyDivisor', 'acFrequencyMultiplier']);
+    }
 }
 
 async function readMeteringMultiplierDivisor(endpoint) {

package/package.json

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