zigbee-herdsman-converters 14.0.658 → 14.0.660

package/devices/ikea.js

@@ -121,25 +121,21 @@ const fzLocal = {
 const tradfriExtend = {
     light_onoff_brightness: (options = {}) => ({
         ...extend.light_onoff_brightness(options),
-        exposes: extend.light_onoff_brightness(options).exposes.concat(e.power_on_behavior()),
         ota: ota.tradfri,
         onEvent: bulbOnEvent,
     }),
     light_onoff_brightness_colortemp: (options = {colorTempRange: [250, 454]}) => ({
         ...extend.light_onoff_brightness_colortemp(options),
-        exposes: extend.light_onoff_brightness_colortemp(options).exposes.concat(e.power_on_behavior()),
         ota: ota.tradfri,
         onEvent: bulbOnEvent,
     }),
     light_onoff_brightness_colortemp_color: (options = {disableColorTempStartup: true, colorTempRange: [250, 454]}) => ({
         ...extend.light_onoff_brightness_colortemp_color(options),
-        exposes: extend.light_onoff_brightness_colortemp_color(options).exposes.concat(e.power_on_behavior()),
         ota: ota.tradfri,
         onEvent: bulbOnEvent,
     }),
     light_onoff_brightness_color: (options = {}) => ({
         ...extend.light_onoff_brightness_color(options),
-        exposes: extend.light_onoff_brightness_color(options).exposes.concat(e.power_on_behavior()),
         ota: ota.tradfri,
         onEvent: bulbOnEvent,
     }),

package/devices/kurvia.js

@@ -1,20 +1,16 @@
 const tz = require('../converters/toZigbee');
-const exposes = require('../lib/exposes');
 const extend = require('../lib/extend');
-const e = exposes.presets;
 
 const extendData = extend.light_onoff_brightness_colortemp_color({colorTempRange: [250, 454]});
 
-
 module.exports = [
     {
         zigbeeModel: ['ZB-CL01'],
         model: 'ZB-CL01',
         vendor: 'KURVIA',
         description: 'GU10 GRBWC built from AliExpress',
-        exposes: extendData.exposes.concat(e.power_on_behavior()),
+        extend: extendData,
         toZigbee: [tz.on_off].concat(extendData.toZigbee),
-        fromZigbee: extendData.fromZigbee,
         meta: {applyRedFix: true, enhancedHue: false},
     },
 ];

package/devices/namron.js

@@ -609,8 +609,8 @@ module.exports = [
                 .withDescription('Enables/disables physical input on the device'),
             exposes.numeric('hysterersis', ea.ALL)
                 .withUnit('°C')
-                .withValueMin(5).withValueMax(50).withValueStep(0.1)
-                .withDescription('Hysterersis setting, range is 5-50, unit is 0.1oC,  Default: 5.'),
+                .withValueMin(0.5).withValueMax(2).withValueStep(0.1)
+                .withDescription('Hysteresis setting, default: 0.5'),
             exposes.numeric('display_brightnesss', ea.ALL)
                 .withValueMin(1).withValueMax(7).withValueStep(1)
                 .withDescription('Adjust brightness of display values 1(Low)-7(High)'),

package/devices/osram.js

@@ -302,15 +302,17 @@ module.exports = [
         model: 'AC01353010G',
         vendor: 'OSRAM',
         description: 'SMART+ Motion Sensor',
-        fromZigbee: [fz.temperature, fz.ias_occupancy_only_alarm_2, fz.ignore_basic_report],
+        fromZigbee: [fz.temperature, fz.ias_occupancy_only_alarm_2, fz.ignore_basic_report, fz.battery],
         toZigbee: [],
+        meta: {battery: {voltageToPercentage: {min: 1900, max: 3000}}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
             await reporting.temperature(endpoint);
             await reporting.batteryVoltage(endpoint);
+            await reporting.batteryAlarmState(endpoint);
         },
-        exposes: [e.temperature(), e.occupancy()],
+        exposes: [e.temperature(), e.occupancy(), e.battery(), e.battery_voltage(), e.battery_low()],
     },
     {
         zigbeeModel: ['MR16 TW OSRAM'],

package/devices/philips.js

@@ -2729,6 +2729,13 @@ module.exports = [
         description: 'Hue white and color ambiance 5/6" retrofit recessed downlight',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['LCD007'],
+        model: '579573',
+        vendor: 'Philips',
+        description: 'Hue White and Color Ambiance Slim Downlight 6"',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LWE004'],
         model: '8719514302235',
@@ -2876,4 +2883,11 @@ module.exports = [
         description: 'Hue white ambiance Garnea downlight',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['LTE005'],
+        model: '9290031452',
+        vendor: 'Philips',
+        description: 'Hue white ambiance filament E14 (with Bluetooth)',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [222, 454]}),
+    },
 ];

package/devices/sonoff.js

@@ -195,6 +195,7 @@ module.exports = [
         description: '15A Zigbee smart plug',
         extend: extend.switch(),
         fromZigbee: [fz.on_off_skip_duplicate_transaction],
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);

package/devices/tuya.js

@@ -759,7 +759,7 @@ module.exports = [
         description: 'Smart air house keeper',
         fromZigbee: [fz.tuya_air_quality],
         toZigbee: [],
-        exposes: [e.temperature(), e.humidity(), e.co2(), e.voc(), e.formaldehyd().withUnit('ppm'),
+        exposes: [e.temperature(), e.humidity(), e.co2(), e.voc().withUnit('ppm'), e.formaldehyd().withUnit('µg/m³'),
             e.pm25().withValueMin(0).withValueMax(999).withValueStep(1)],
     },
     {

package/lib/legacy.js

@@ -114,7 +114,8 @@ const postfixWithEndpointName = (name, msg, definition) => {
 };
 
 const transactionStore = {};
-const hasAlreadyProcessedMessage = (msg, transaction=null, key=null) => {
+const hasAlreadyProcessedMessage = (msg, model, transaction=null, key=null) => {
+    if (model.meta && model.meta.publishDuplicateTransaction) return false;
     const current = transaction !== null ? transaction : msg.meta.zclTransactionSequenceNumber;
     key = key || msg.device.ieeeAddr;
     if (transactionStore[key] === current) return true;

package/lib/utils.js

@@ -179,6 +179,10 @@ function batteryVoltageToPercentage(voltage, option) {
     } else if (option === 'Add_1V_42V_CSM300z2v2') {
         voltage = voltage + 1000;
         percentage = toPercentage(voltage, 2900, 4100);
+    // Generic converter that expects an option object with min and max values
+    // I.E. meta: {battery: {voltageToPercentage: {min: 1900, max: 3000}}}
+    } else if (typeof option === 'object') {
+        percentage = toPercentage(voltage, option.min, option.max);
     } else {
         throw new Error(`Not batteryVoltageToPercentage type supported: ${option}`);
     }

package/package.json

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