zigbee-herdsman-converters 14.0.596 → 14.0.597

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