zigbee-herdsman-converters 14.0.474 → 14.0.477

package/converters/fromZigbee.js

@@ -7565,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/devices/adeo.js

@@ -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/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/innr.js

@@ -47,6 +47,14 @@ module.exports = [
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
     },
+    {
+        zigbeeModel: ['OGL 130 C'],
+        model: 'OGL 130 C',
+        vendor: 'Innr',
+        description: 'Outdoor smart globe lights',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [100, 1000], supportsHS: true}),
+        meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+    },
     {
         zigbeeModel: ['OPL 130 C'],
         model: 'OPL 130 C',

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

@@ -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',
@@ -728,7 +729,10 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0201', manufacturerName: '_TZ3000_bguser20'}],
+        fingerprint: [
+            {modelID: 'TS0201', manufacturerName: '_TZ3000_bguser20'},
+            {modelID: 'TS0201', manufacturerName: '_TZ3000_fllyghyj'},
+        ],
         model: 'WSD500A',
         vendor: 'TuYa',
         description: 'Temperature & humidity sensor',

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.474",
+  "version": "14.0.477",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [