zigbee-herdsman-converters 14.0.596 → 14.0.599

package/devices/feibit.js

@@ -22,6 +22,13 @@ module.exports = [
             await reporting.bind(device.getEndpoint(17), coordinatorEndpoint, ['genOnOff']);
         },
     },
+    {
+        zigbeeModel: ['FB56+ZSW1GKJ2.3'],
+        model: 'SKY01-TS1-101',
+        vendor: 'Feibit',
+        description: 'Smart light switch - 1 gang',
+        extend: extend.switch(),
+    },
     {
         zigbeeModel: ['FNB56-SOS03FB1.5'],
         model: 'SEB01ZB',
@@ -32,7 +39,7 @@ module.exports = [
         exposes: [e.sos(), e.battery_low(), e.tamper(), e.battery()],
     },
     {
-        zigbeeModel: ['FNB56-BOT06FB2.3', 'FNB56-BOT06FB2.8', 'FB56-BOT02HM1.2'],
+        zigbeeModel: ['FNB56-BOT06FB2.3', 'FNB56-BOT06FB2.8', 'FB56-BOT02HM1.2', 'FNB56-BOT06FB2.8'],
         model: 'SBM01ZB',
         vendor: 'Feibit',
         description: 'Human body movement sensor',
@@ -47,7 +54,7 @@ module.exports = [
         exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery()],
     },
     {
-        zigbeeModel: ['FNB56-THM14FB2.4', 'FNB54-THM17ML1.1', 'FB56-THM12HM1.2'],
+        zigbeeModel: ['FNB56-THM14FB2.4', 'FNB54-THM17ML1.1', 'FB56-THM12HM1.2', 'FNB56-THM14FB2.5'],
         model: 'STH01ZB',
         vendor: 'Feibit',
         description: 'Smart temperature & humidity Sensor',
@@ -57,7 +64,7 @@ module.exports = [
         exposes: [e.temperature(), e.humidity(), e.battery()],
     },
     {
-        zigbeeModel: ['FNB56-SMF06FB1.6'],
+        zigbeeModel: ['FNB56-SMF06FB1.6', 'FNB56-SMF06FB2.0'],
         model: 'SSA01ZB',
         vendor: 'Feibit',
         description: 'Smoke detector',
@@ -72,7 +79,7 @@ module.exports = [
         exposes: [e.smoke(), e.battery_low(), e.tamper(), e.battery()],
     },
     {
-        zigbeeModel: ['FNB56-COS06FB1.7'],
+        zigbeeModel: ['FNB56-COS06FB1.7', 'FNB56-COS06FB2.1'],
         model: 'SCA01ZB',
         vendor: 'Feibit',
         description: 'Smart carbon monoxide sensor',
@@ -87,7 +94,7 @@ module.exports = [
         exposes: [e.carbon_monoxide(), e.battery_low(), e.tamper(), e.battery()],
     },
     {
-        zigbeeModel: ['FNB56-GAS05FB1.4'],
+        zigbeeModel: ['FNB56-GAS05FB1.4', 'FNB56-GAS05FB1.8'],
         model: 'SGA01ZB',
         vendor: 'Feibit',
         description: 'Combustible gas sensor',
@@ -96,7 +103,7 @@ module.exports = [
         exposes: [e.gas()],
     },
     {
-        zigbeeModel: ['FNB56-WTS05FB2.0'],
+        zigbeeModel: ['FNB56-WTS05FB2.0', 'FNB56-WTS05FB2.4'],
         model: 'SWA01ZB',
         vendor: 'Feibit',
         description: 'Water leakage sensor',
@@ -114,7 +121,7 @@ module.exports = [
         exposes: [e.contact(), e.battery_low(), e.tamper(), e.battery()],
     },
     {
-        zigbeeModel: ['FB56+SKT14AL2.1'],
+        zigbeeModel: ['FB56+SKT14AL2.1', 'FTB56+SKT1BCW1.0'],
         model: 'SFS01ZB',
         vendor: 'Feibit',
         description: 'Power plug',

package/devices/heiman.js

@@ -211,7 +211,7 @@ module.exports = [
         description: 'Smart remote controller',
         fromZigbee: [fz.battery, fz.command_arm, fz.command_emergency],
         toZigbee: [],
-        exposes: [e.battery(), e.action(['emergency', 'disarm', 'arm_partial_zones', 'arm_all_zones'])],
+        exposes: [e.battery(), e.action(['emergency', 'disarm', 'arm_day_zones', 'arm_all_zones'])],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);

package/devices/iluminize.js

@@ -162,13 +162,17 @@ module.exports = [
         exposes: [e.battery(), e.action([
             'color_move', 'color_temperature_move', 'hue_move', 'hue_stop', 'brightness_step_up', 'brightness_step_down',
             'recall_*', 'on', 'off']),
-        //    exposes.composite('action_color', 'action_color') * At the moment not shown in Frontend correctly
-        //       .withFeature(exposes.numeric('x', ea.STATE))     see: https://github.com/nurikk/zigbee2mqtt-frontend/issues/1535
-        //       .withFeature(exposes.numeric('y', ea.STATE)),
-        exposes.numeric('action_color_temperature', ea.STATE).withUnit('mired'),
-        exposes.numeric('action_group', ea.STATE),
+        exposes.composite('action_color', 'action_color')
+            .withFeature(exposes.numeric('x', ea.STATE))
+            .withFeature(exposes.numeric('y', ea.STATE))
+            .withDescription('Only shows the transmitted color in X7Y-Mode. Noch changes possible.'),
+        exposes.numeric('action_color_temperature', ea.STATE).withUnit('mired')
+            .withDescription('color temperature value. Fixed values for each key press: 145, 175, 222, 304, 480 mired'),
+        exposes.numeric('action_group', ea.STATE)
+            .withDescription('Shows the zigbee2mqtt group bound to the active data point EP(1-4).'),
         exposes.numeric('action_transition_time', ea.STATE),
-        exposes.text('action_color', ea.STATE)],
+        exposes.numeric('action_step_size', ea.STATE),
+        exposes.numeric('action_rate', ea.STATE)],
         toZigbee: [],
         meta: {multiEndpoint: true},
         endpoint: (device) => {

package/devices/namron.js

@@ -3,6 +3,7 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
+const globalStore = require('../lib/store');
 const extend = require('../lib/extend');
 const ea = exposes.access;
 const e = exposes.presets;
@@ -340,6 +341,25 @@ module.exports = [
                 .withValueMin(20).withValueMax(60)
                 .withDescription('Room temperature alarm threshold, between 20 and 60 in °C.  0 means disabled.  Default: 45.'),
         ],
+        onEvent: async (type, data, device, options) => {
+            const endpoint = device.getEndpoint(1);
+            if (type === 'stop') {
+                clearInterval(globalStore.getValue(device, 'time'));
+                globalStore.clearValue(device, 'time');
+            } else if (!globalStore.hasValue(device, 'time')) {
+                const hours24 = 1000 * 60 * 60 * 24;
+                const interval = setInterval(async () => {
+                    try {
+                        // Device does not asks for the time with binding, therefore we write the time every 24 hours
+                        const time = Math.round(((new Date()).getTime() - constants.OneJanuary2000) / 1000 + ((new Date())
+                            .getTimezoneOffset() * -1) * 60);
+                        const values = {time: time};
+                        endpoint.write('genTime', values);
+                    } catch (error) {/* Do nothing*/}
+                }, hours24);
+                globalStore.putValue(device, 'time', interval);
+            }
+        },
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = [
@@ -474,11 +494,6 @@ module.exports = [
                 reportableChange: null}],
             options);
 
-            // Device does not asks for the time with binding, we need to write time during configure
-            const time = Math.round(((new Date()).getTime() - constants.OneJanuary2000) / 1000);
-            const values = {time: time};
-            endpoint.write('genTime', values);
-
             // Trigger initial read
             await endpoint.read('hvacThermostat', ['systemMode', 'runningState', 'occupiedHeatingSetpoint']);
             await endpoint.read('hvacThermostat', [0x1000, 0x1001, 0x1002, 0x1003], options);

package/devices/osram.js

@@ -227,7 +227,7 @@ module.exports = [
         model: '4052899926110',
         vendor: 'OSRAM',
         description: 'Flex RGBW',
-        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [125, 666]}),
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [125, 666], supportsHS: true, preferHS: true}),
         ota: ota.ledvance,
     },
     {

package/devices/philips.js

@@ -966,6 +966,13 @@ module.exports = [
         description: 'Hue Outdoor Econic wall lantern',
         extend: hueExtend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['929003053001'],
+        model: '929003053001',
+        vendor: 'Philips',
+        description: 'Hue Sana wall light',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LCE001'],
         model: '929002294101',

package/devices/schneider_electric.js

@@ -213,7 +213,7 @@ module.exports = [
             fz.legacy.wiser_thermostat, fz.legacy.wiser_itrv_battery, fz.hvac_user_interface, fz.wiser_device_info],
         toZigbee: [tz.thermostat_occupied_heating_setpoint, tz.thermostat_keypad_lockout],
         exposes: [exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 1).withLocalTemperature(ea.STATE)
-            .withSystemMode(['off', 'auto', 'heat'], ea.STATE).withRunningState(['idle', 'heat'], ea.STATE).withPiHeatingDemand()],
+            .withRunningState(['idle', 'heat'], ea.STATE).withPiHeatingDemand()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['genBasic', 'genPowerCfg', 'hvacThermostat', 'haDiagnostic'];

package/devices/shinasystem.js

@@ -9,7 +9,12 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        zigbeeModel: ['CSM-300Z'],
+        fingerprint: [
+            {modelID: 'CSM-300Z', applicationVersion: 1},
+            {modelID: 'CSM-300Z', applicationVersion: 2},
+            {modelID: 'CSM-300Z', applicationVersion: 3},
+            {modelID: 'CSM-300Z', applicationVersion: 4},
+        ],
         model: 'CSM-300ZB',
         vendor: 'ShinaSystem',
         description: 'SiHAS multipurpose sensor',
@@ -24,7 +29,27 @@ module.exports = [
             const payload = reporting.payload('presentValue', 1, 600, 0);
             await endpoint.configureReporting('genAnalogInput', payload);
         },
+        exposes: [e.battery(), e.battery_voltage(),
+            exposes.enum('status', ea.STATE, ['idle', 'in', 'out']).withDescription('Currently status'),
+            exposes.numeric('people', ea.ALL).withValueMin(0).withValueMax(50).withDescription('People count')],
+    },
+    {
+        zigbeeModel: ['CSM-300Z'],
+        model: 'CSM-300ZB_V2',
+        vendor: 'ShinaSystem',
         ota: ota.zigbeeOTA,
+        description: 'SiHAS multipurpose ToF sensor',
+        meta: {battery: {voltageToPercentage: 'Add_1V_42V_CSM300z2v2'}},
+        fromZigbee: [fz.battery, fz.sihas_people_cnt],
+        toZigbee: [tz.sihas_set_people],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            const binds = ['genPowerCfg', 'genAnalogInput'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.batteryVoltage(endpoint);
+            const payload = reporting.payload('presentValue', 1, 600, 0);
+            await endpoint.configureReporting('genAnalogInput', payload);
+        },
         exposes: [e.battery(), e.battery_voltage(),
             exposes.enum('status', ea.STATE, ['idle', 'in', 'out']).withDescription('Currently status'),
             exposes.numeric('people', ea.ALL).withValueMin(0).withValueMax(50).withDescription('People count')],

package/devices/xiaomi.js

@@ -101,6 +101,7 @@ module.exports = [
             e.light_brightness_colortemp([153, 370]).removeFeature('color_temp_startup').withEndpoint('l2'),
             exposes.enum('dimmer_mode', ea.ALL, ['rgbw', 'dual_ct'])
                 .withDescription('Switch between rgbw mode or dual color temperature mode')],
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.light.aqcn02'],
@@ -1877,6 +1878,7 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.b2lc04'],
@@ -1908,6 +1910,7 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             await device.getEndpoint(1).write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.airmonitor.acn01'],

package/lib/utils.js

@@ -170,6 +170,12 @@ function batteryVoltageToPercentage(voltage, option) {
         percentage = toPercentage(voltage, 2850, 3200);
     } else if (option === '4LR6AA1_5v') {
         percentage = toPercentage(voltage, 3000, 4200);
+    } else if (option === '3V_add 1V') {
+        voltage = voltage + 1000;
+        percentage = toPercentage(voltage, 3200, 4200);
+    } else if (option === 'Add_1V_42V_CSM300z2v2') {
+        voltage = voltage + 1000;
+        percentage = toPercentage(voltage, 2900, 4100);
     } else {
         throw new Error(`Not batteryVoltageToPercentage type supported: ${option}`);
     }

package/package.json

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