zigbee-herdsman-converters 14.0.321 → 14.0.322

package/converters/fromZigbee.js

@@ -4293,79 +4293,6 @@ const converters = {
             }
         },
     },
-    ikea_air_purifier: {
-        cluster: 'manuSpecificIkeaAirPurifier',
-        type: ['attributeReport', 'readResponse'],
-        options: [exposes.options.precision('pm25'), exposes.options.calibration('pm25')],
-        convert: (model, msg, publish, options, meta) => {
-            const state = {};
-
-            if (msg.data.hasOwnProperty('particulateMatter25Measurement')) {
-                const pm25Property = postfixWithEndpointName('pm25', msg, model);
-                let pm25 = parseFloat(msg.data['particulateMatter25Measurement']);
-
-                // Air Quality Scale (ikea app):
-                // 0-35=Good, 35-80=OK, 80+=Not Good
-                let airQuality;
-                const airQualityProperty = postfixWithEndpointName('air_quality', msg, model);
-                if (pm25 <= 35) {
-                    airQuality = 'good';
-                } else if (pm25 <= 80) {
-                    airQuality = 'ok';
-                } else if (pm25 < 65535) {
-                    airQuality = 'not_good';
-                } else {
-                    airQuality = 'unknown';
-                }
-
-                // calibrate and round pm25 unless invalid
-                pm25 = (pm25 == 65535) ? -1 : calibrateAndPrecisionRoundOptions(pm25, options, 'pm25');
-
-                state[pm25Property] = calibrateAndPrecisionRoundOptions(pm25, options, 'pm25');
-                state[airQualityProperty] = airQuality;
-            }
-
-            if (msg.data.hasOwnProperty('filterRunTime')) {
-                // Filter needs to be replaced after 6 months
-                state['replace_filter'] = (parseInt(msg.data['filterRunTime']) >= 259200);
-            }
-
-            if (msg.data.hasOwnProperty('controlPanelLight')) {
-                state['led_enable'] = (msg.data['controlPanelLight'] == 0);
-            }
-
-            if (msg.data.hasOwnProperty('childLock')) {
-                state['child_lock'] = (msg.data['childLock'] > 0 ? 'LOCK' : 'UNLOCK');
-            }
-
-            if (msg.data.hasOwnProperty('fanSpeed')) {
-                let fanSpeed = msg.data['fanSpeed'];
-                if (fanSpeed >= 10) {
-                    fanSpeed = (((fanSpeed - 5) * 2) / 10);
-                } else {
-                    fanSpeed = 0;
-                }
-
-                state['fan_speed'] = fanSpeed;
-            }
-
-            if (msg.data.hasOwnProperty('fanMode')) {
-                let fanMode = msg.data['fanMode'];
-                if (fanMode >= 10) {
-                    fanMode = (((fanMode - 5) * 2) / 10).toString();
-                } else if (fanMode == 1) {
-                    fanMode = 'auto';
-                } else {
-                    fanMode = 'off';
-                }
-
-                state['fan_mode'] = fanMode;
-                state['fan_state'] = (fanMode === 'off' ? 'OFF' : 'ON');
-            }
-
-            return state;
-        },
-    },
     E1524_E1810_levelctrl: {
         cluster: 'genLevelCtrl',
         type: [

package/converters/toZigbee.js

@@ -1922,71 +1922,6 @@ const converters = {
             await entity.read('genBasic', [0x0033], manufacturerOptions.hue);
         },
     },
-    ikea_air_purifier_fan_mode: {
-        key: ['fan_mode', 'fan_state'],
-        convertSet: async (entity, key, value, meta) => {
-            if (key == 'fan_state' && value.toLowerCase() == 'on') {
-                value = utils.getMetaValue(entity, meta.mapped, 'fanStateOn', 'allEqual', 'on');
-            }
-
-            let fanMode;
-            switch (value.toLowerCase()) {
-            case 'off':
-                fanMode = 0;
-                break;
-            case 'auto':
-                fanMode = 1;
-                break;
-            default:
-                fanMode = parseInt(((parseInt(value) / 2.0) * 10) + 5);
-            }
-
-            await entity.write('manuSpecificIkeaAirPurifier', {'fanMode': fanMode}, manufacturerOptions.ikea);
-            return {state: {fan_mode: value.toLowerCase(), fan_state: value.toLowerCase() === 'off' ? 'OFF' : 'ON'}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificIkeaAirPurifier', ['fanMode']);
-        },
-    },
-    ikea_air_purifier_fan_speed: {
-        key: ['fan_speed'],
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificIkeaAirPurifier', ['fanSpeed']);
-        },
-    },
-    ikea_air_purifier_pm25: {
-        key: ['pm25', 'air_quality'],
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificIkeaAirPurifier', ['particulateMatter25Measurement']);
-        },
-    },
-    ikea_air_purifier_replace_filter: {
-        key: ['replace_filter'],
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificIkeaAirPurifier', ['filterRunTime']);
-        },
-    },
-    ikea_air_purifier_child_lock: {
-        key: ['child_lock'],
-        convertSet: async (entity, key, value, meta) => {
-            await entity.write('manuSpecificIkeaAirPurifier', {'childLock': ((value.toLowerCase() === 'lock') ? 1 : 0)},
-                manufacturerOptions.ikea);
-            return {state: {child_lock: ((value.toLowerCase() === 'lock') ? 'LOCK' : 'UNLOCK')}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificIkeaAirPurifier', ['childLock']);
-        },
-    },
-    ikea_air_purifier_led_enable: {
-        key: ['led_enable'],
-        convertSet: async (entity, key, value, meta) => {
-            await entity.write('manuSpecificIkeaAirPurifier', {'controlPanelLight': ((value) ? 0 : 1)}, manufacturerOptions.ikea);
-            return {state: {led_enable: ((value) ? true : false)}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificIkeaAirPurifier', ['controlPanelLight']);
-        },
-    },
     RTCGQ13LM_motion_sensitivity: {
         key: ['motion_sensitivity'],
         convertSet: async (entity, key, value, meta) => {

package/devices/ikea.js

@@ -8,6 +8,10 @@ const {repInterval} = require('../lib/constants');
 const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
+const herdsman = require('zigbee-herdsman');
+const {
+    calibrateAndPrecisionRoundOptions, postfixWithEndpointName, getMetaValue,
+} = require('../lib/utils');
 
 const bulbOnEvent = async (type, data, device) => {
     /**
@@ -49,6 +53,161 @@ const tradfriExtend = {
     }),
 };
 
+const manufacturerOptions = {manufacturerCode: herdsman.Zcl.ManufacturerCode.IKEA_OF_SWEDEN};
+
+const ikea = {
+    fz: {
+        air_purifier: {
+            cluster: 'manuSpecificIkeaAirPurifier',
+            type: ['attributeReport', 'readResponse'],
+            options: [exposes.options.precision('pm25'), exposes.options.calibration('pm25')],
+            convert: (model, msg, publish, options, meta) => {
+                const state = {};
+
+                if (msg.data.hasOwnProperty('particulateMatter25Measurement')) {
+                    const pm25Property = postfixWithEndpointName('pm25', msg, model);
+                    let pm25 = parseFloat(msg.data['particulateMatter25Measurement']);
+
+                    // Air Quality
+                    // Scale based on EU AQI (https://www.eea.europa.eu/themes/air/air-quality-index)
+                    // Using German IAQ labels to match the Develco Air Quality Sensor
+                    let airQuality;
+                    const airQualityProperty = postfixWithEndpointName('air_quality', msg, model);
+                    if (pm25 <= 10) {
+                        airQuality = 'excellent';
+                    } else if (pm25 <= 20) {
+                        airQuality = 'good';
+                    } else if (pm25 <= 25) {
+                        airQuality = 'moderate';
+                    } else if (pm25 <= 50) {
+                        airQuality = 'poor';
+                    } else if (pm25 <= 75) {
+                        airQuality = 'unhealthy';
+                    } else if (pm25 <= 800) {
+                        airQuality = 'hazardous';
+                    } else if (pm25 < 65535) {
+                        airQuality = 'out_of_range';
+                    } else {
+                        airQuality = 'unknown';
+                    }
+
+                    // calibrate and round pm25 unless invalid
+                    pm25 = (pm25 == 65535) ? -1 : calibrateAndPrecisionRoundOptions(pm25, options, 'pm25');
+
+                    state[pm25Property] = calibrateAndPrecisionRoundOptions(pm25, options, 'pm25');
+                    state[airQualityProperty] = airQuality;
+                }
+
+                if (msg.data.hasOwnProperty('filterRunTime')) {
+                // Filter needs to be replaced after 6 months
+                    state['replace_filter'] = (parseInt(msg.data['filterRunTime']) >= 259200);
+                }
+
+                if (msg.data.hasOwnProperty('controlPanelLight')) {
+                    state['led_enable'] = (msg.data['controlPanelLight'] == 0);
+                }
+
+                if (msg.data.hasOwnProperty('childLock')) {
+                    state['child_lock'] = (msg.data['childLock'] > 0 ? 'LOCK' : 'UNLOCK');
+                }
+
+                if (msg.data.hasOwnProperty('fanSpeed')) {
+                    let fanSpeed = msg.data['fanSpeed'];
+                    if (fanSpeed >= 10) {
+                        fanSpeed = (((fanSpeed - 5) * 2) / 10);
+                    } else {
+                        fanSpeed = 0;
+                    }
+
+                    state['fan_speed'] = fanSpeed;
+                }
+
+                if (msg.data.hasOwnProperty('fanMode')) {
+                    let fanMode = msg.data['fanMode'];
+                    if (fanMode >= 10) {
+                        fanMode = (((fanMode - 5) * 2) / 10).toString();
+                    } else if (fanMode == 1) {
+                        fanMode = 'auto';
+                    } else {
+                        fanMode = 'off';
+                    }
+
+                    state['fan_mode'] = fanMode;
+                    state['fan_state'] = (fanMode === 'off' ? 'OFF' : 'ON');
+                }
+
+                return state;
+            },
+        },
+    },
+    tz: {
+        air_purifier_fan_mode: {
+            key: ['fan_mode', 'fan_state'],
+            convertSet: async (entity, key, value, meta) => {
+                if (key == 'fan_state' && value.toLowerCase() == 'on') {
+                    value = getMetaValue(entity, meta.mapped, 'fanStateOn', 'allEqual', 'on');
+                }
+
+                let fanMode;
+                switch (value.toLowerCase()) {
+                case 'off':
+                    fanMode = 0;
+                    break;
+                case 'auto':
+                    fanMode = 1;
+                    break;
+                default:
+                    fanMode = parseInt(((parseInt(value) / 2.0) * 10) + 5);
+                }
+
+                await entity.write('manuSpecificIkeaAirPurifier', {'fanMode': fanMode}, manufacturerOptions.ikea);
+                return {state: {fan_mode: value.toLowerCase(), fan_state: value.toLowerCase() === 'off' ? 'OFF' : 'ON'}};
+            },
+            convertGet: async (entity, key, meta) => {
+                await entity.read('manuSpecificIkeaAirPurifier', ['fanMode']);
+            },
+        },
+        air_purifier_fan_speed: {
+            key: ['fan_speed'],
+            convertGet: async (entity, key, meta) => {
+                await entity.read('manuSpecificIkeaAirPurifier', ['fanSpeed']);
+            },
+        },
+        air_purifier_pm25: {
+            key: ['pm25', 'air_quality'],
+            convertGet: async (entity, key, meta) => {
+                await entity.read('manuSpecificIkeaAirPurifier', ['particulateMatter25Measurement']);
+            },
+        },
+        air_purifier_replace_filter: {
+            key: ['replace_filter'],
+            convertGet: async (entity, key, meta) => {
+                await entity.read('manuSpecificIkeaAirPurifier', ['filterRunTime']);
+            },
+        },
+        air_purifier_child_lock: {
+            key: ['child_lock'],
+            convertSet: async (entity, key, value, meta) => {
+                await entity.write('manuSpecificIkeaAirPurifier', {'childLock': ((value.toLowerCase() === 'lock') ? 1 : 0)},
+                    manufacturerOptions);
+                return {state: {child_lock: ((value.toLowerCase() === 'lock') ? 'LOCK' : 'UNLOCK')}};
+            },
+            convertGet: async (entity, key, meta) => {
+                await entity.read('manuSpecificIkeaAirPurifier', ['childLock']);
+            },
+        },
+        air_purifier_led_enable: {
+            key: ['led_enable'],
+            convertSet: async (entity, key, value, meta) => {
+                await entity.write('manuSpecificIkeaAirPurifier', {'controlPanelLight': ((value) ? 0 : 1)}, manufacturerOptions);
+                return {state: {led_enable: ((value) ? true : false)}};
+            },
+            convertGet: async (entity, key, meta) => {
+                await entity.read('manuSpecificIkeaAirPurifier', ['controlPanelLight']);
+            },
+        },
+    },
+};
 
 module.exports = [
     {
@@ -632,7 +791,9 @@ module.exports = [
                 .withDescription('Current fan speed'),
             e.pm25().withAccess(ea.STATE_GET),
             exposes.enum('air_quality', ea.STATE_GET, [
-                'good', 'ok', 'not_good', 'unknown',
+                'excellent', 'good', 'moderate', 'poor',
+                'unhealthy', 'hazardous', 'out_of_range',
+                'unknown',
             ]).withDescription('Measured air quality'),
             exposes.binary('led_enable', ea.ALL, true, false).withDescription('Enabled LED'),
             exposes.binary('child_lock', ea.ALL, 'LOCK', 'UNLOCK').withDescription('Enables/disables physical input on the device'),
@@ -640,29 +801,28 @@ module.exports = [
                 .withDescription('Filter is older than 6 months and needs replacing'),
         ],
         meta: {fanStateOn: 'auto'},
-        fromZigbee: [fz.ikea_air_purifier],
+        fromZigbee: [ikea.fz.air_purifier],
         toZigbee: [
-            tz.ikea_air_purifier_fan_mode, tz.ikea_air_purifier_fan_speed,
-            tz.ikea_air_purifier_pm25, tz.ikea_air_purifier_child_lock, tz.ikea_air_purifier_led_enable,
-            tz.ikea_air_purifier_replace_filter,
+            ikea.tz.air_purifier_fan_mode, ikea.tz.air_purifier_fan_speed,
+            ikea.tz.air_purifier_pm25, ikea.tz.air_purifier_child_lock, ikea.tz.air_purifier_led_enable,
+            ikea.tz.air_purifier_replace_filter,
         ],
         configure: async (device, coordinatorEndpoint, logger) => {
-            const options = {manufacturerCode: 0x117c};
             const endpoint = device.getEndpoint(1);
 
             await reporting.bind(endpoint, coordinatorEndpoint, ['manuSpecificIkeaAirPurifier']);
             await endpoint.configureReporting('manuSpecificIkeaAirPurifier', [{attribute: 'particulateMatter25Measurement',
                 minimumReportInterval: repInterval.MINUTE, maximumReportInterval: repInterval.HOUR, reportableChange: 1}],
-            options);
+            manufacturerOptions);
             await endpoint.configureReporting('manuSpecificIkeaAirPurifier', [{attribute: 'filterRunTime',
                 minimumReportInterval: repInterval.HOUR, maximumReportInterval: repInterval.HOUR, reportableChange: 0}],
-            options);
+            manufacturerOptions);
             await endpoint.configureReporting('manuSpecificIkeaAirPurifier', [{attribute: 'fanMode',
                 minimumReportInterval: 0, maximumReportInterval: repInterval.HOUR, reportableChange: 1}],
-            options);
+            manufacturerOptions);
             await endpoint.configureReporting('manuSpecificIkeaAirPurifier', [{attribute: 'fanSpeed',
                 minimumReportInterval: 0, maximumReportInterval: repInterval.HOUR, reportableChange: 1}],
-            options);
+            manufacturerOptions);
 
             await endpoint.read('manuSpecificIkeaAirPurifier', ['controlPanelLight', 'childLock', 'filterRunTime']);
         },

package/devices/philips.js

@@ -735,6 +735,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['LCA009'],
+        model: '9290024717',
+        vendor: 'Philips',
+        description: 'Hue white and color ambiance E26/A19 1600lm',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['LCT001', 'LCT007', 'LCT010', 'LCT012', 'LCT014', 'LCT015', 'LCT016', 'LCT021'],
         model: '9290012573A',
@@ -1306,7 +1315,7 @@ module.exports = [
         vendor: 'Philips',
         description: 'Hue Iris (generation 2, black)',
         meta: {turnsOffAtBrightness1: true},
-        extend: hueExtend.light_onoff_brightness_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {

package/lib/exposes.js

@@ -503,7 +503,7 @@ module.exports = {
         battery: () => new Numeric('battery', access.STATE).withUnit('%').withDescription('Remaining battery in %').withValueMin(0).withValueMax(100),
         battery_low: () => new Binary('battery_low', access.STATE, true, false).withDescription('Indicates if the battery of this device is almost empty'),
         battery_voltage: () => new Numeric('voltage', access.STATE).withUnit('mV').withDescription('Voltage of the battery in millivolts'),
-        boost_time: () => new Numeric('boost_time', access.STATE_SET).withUnit('s').withDescription('Boost time'),
+        boost_time: () => new Numeric('boost_time', access.STATE_SET).withUnit('s').withDescription('Boost time').withValueMin(0).withValueMax(600),
         button_lock: () => new Binary('button_lock', access.ALL, 'ON', 'OFF').withDescription('Disables the physical switch button'),
         carbon_monoxide: () => new Binary('carbon_monoxide', access.STATE, true, false).withDescription('Indicates if CO (carbon monoxide) is detected'),
         child_lock: () => new Lock().withState('child_lock', 'LOCK', 'UNLOCK', 'Enables/disables physical input on the device', access.STATE_SET),

package/lib/utils.js

@@ -72,7 +72,7 @@ function hasAlreadyProcessedMessage(msg, ID=null, key=null) {
     return false;
 }
 
-const defaultPrecision = {temperature: 2, humidity: 2, pressure: 1, pm25: 2};
+const defaultPrecision = {temperature: 2, humidity: 2, pressure: 1, pm25: 0};
 function calibrateAndPrecisionRoundOptions(number, options, type) {
     // Calibrate
     const calibrateKey = `${type}_calibration`;

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.321",
+  "version": "14.0.322",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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