zigbee-herdsman-converters 15.0.36 → 15.0.38

package/converters/fromZigbee.js

@@ -5387,19 +5387,19 @@ const converters = {
         cluster: 'genBasic',
         type: ['attributeReport', 'readResponse'],
         options: xiaomi.numericAttributes2Options,
-        convert: (model, msg, publish, options, meta) => {
-            return xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
+        convert: async (model, msg, publish, options, meta) => {
+            return await xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
         },
     },
     xiaomi_basic_raw: {
         cluster: 'genBasic',
         type: ['raw'],
         options: xiaomi.numericAttributes2Options,
-        convert: (model, msg, publish, options, meta) => {
+        convert: async (model, msg, publish, options, meta) => {
             let payload = {};
             if (Buffer.isBuffer(msg.data)) {
                 const dataObject = xiaomi.buffer2DataObject(meta, model, msg.data);
-                payload = xiaomi.numericAttributes2Payload(msg, meta, model, options, dataObject);
+                payload = await xiaomi.numericAttributes2Payload(msg, meta, model, options, dataObject);
             }
             return payload;
         },
@@ -5408,8 +5408,8 @@ const converters = {
         cluster: 'aqaraOpple',
         type: ['attributeReport', 'readResponse'],
         options: xiaomi.numericAttributes2Options,
-        convert: (model, msg, publish, options, meta) => {
-            return xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
+        convert: async (model, msg, publish, options, meta) => {
+            return await xiaomi.numericAttributes2Payload(msg, meta, model, options, msg.data);
         },
     },
     xiaomi_on_off_action: {
@@ -6862,7 +6862,9 @@ const converters = {
         cluster: 'msOccupancySensing',
         type: ['raw'],
         convert: (model, msg, publish, options, meta) => {
-            return {occupancy: msg.data[7] === 0};
+            if (msg.data[7] === 1) {
+                return {action: 'motion'};
+            }
         },
     },
     DNCKAT_S00X_buttons: {

package/devices/ajax_online.js

@@ -16,7 +16,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495], disableEffect: true}),
     },
     {
-        zigbeeModel: ['AJ_ZBPROA60'],
+        zigbeeModel: ['AJ_ZBPROA60', 'AJ_ZBPROA6'],
         model: 'AJ_ZIGPROA60',
         vendor: 'Ajax Online',
         description: 'Smart Zigbee pro 12W A60 bulb',

package/devices/kami.js

@@ -7,9 +7,9 @@ module.exports = [
         zigbeeModel: ['Z3ContactSensor'],
         model: 'N20',
         vendor: 'KAMI',
-        description: 'Entry sensor',
+        description: 'Contact sensor or motion sensor',
         fromZigbee: [fz.KAMI_contact, fz.KAMI_occupancy],
         toZigbee: [],
-        exposes: [e.contact(), e.occupancy()],
+        exposes: [e.contact(), e.action(['motion'])],
     },
 ];

package/devices/philips.js

@@ -2383,7 +2383,7 @@ module.exports = [
         model: '929002422702',
         vendor: 'Philips',
         description: 'Hue Play gradient lightstrip 55',
-        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCX002'],

package/devices/schneider_electric.js

@@ -682,6 +682,26 @@ module.exports = [
             await reporting.instantaneousDemand(endpoint);
         },
     },
+    {
+        zigbeeModel: ['2GANG/SWITCH/2'],
+        model: 'MEG5126-0300',
+        vendor: 'Schneider Electric',
+        description: 'Merten MEG5165 PlusLink shutter insert with Merten Wiser System M push button (2fold)',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint1);
+            const endpoint2 = device.getEndpoint(2);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint2);
+        },
+        endpoint: (device) => {
+            return {l1: 1, l2: 2};
+        },
+    },
     {
         zigbeeModel: ['EH-ZB-VACT'],
         model: 'EER53000',

package/devices/sinope.js

@@ -12,6 +12,18 @@ const {precisionRound} = require('../lib/utils');
 const manuSinope = {manufacturerCode: 0x119C};
 
 const fzLocal = {
+    ias_water_leak_alarm: {
+        // RM3500ZB specific
+        cluster: 'ssIasZone',
+        type: ['commandStatusChangeNotification', 'attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const zoneStatus = msg.data.zoneStatus;
+            return {
+                water_leak: (zoneStatus & 1) > 0,
+                tamper: (zoneStatus & 1<<2) > 0,
+            };
+        },
+    },
     thermostat: {
         cluster: 'hvacThermostat',
         type: ['attributeReport', 'readResponse'],
@@ -1179,21 +1191,26 @@ module.exports = [
         model: 'RM3500ZB',
         vendor: 'Sinopé',
         description: 'Calypso smart water heater controller',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ias_water_leak_alarm_1, fz.temperature],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fzLocal.ias_water_leak_alarm,
+            fzLocal.sinope, fz.temperature],
         toZigbee: [tz.on_off],
         exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.water_leak(), e.temperature()],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
-            const binds = ['genOnOff', 'haElectricalMeasurement', 'seMetering', 'Temperature'];
+            const binds = ['genOnOff', 'haElectricalMeasurement', 'seMetering', 'msTemperatureMeasurement', 'ssIasZone',
+                'manuSpecificSinope'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.onOff(endpoint);
+            await reporting.temperature(endpoint, {min: 10, max: 301, change: 10}); // divider 100: 0.1C
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.activePower(endpoint);
-            await reporting.rmsCurrent(endpoint);
-            await reporting.rmsVoltage(endpoint);
+            await reporting.activePower(endpoint, {min: 10, max: 305, change: 2}); // divider 1 : 2W
+            await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 10}); // divider 1000: 0.01Arms
+            await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 1}); // divider 1: 1Vrms
             await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint);
-            await reporting.temperature(endpoint, {min: 60, max: 3600, change: 1});
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [10, 10]}); // divider 1000: 0,01kWh
+
+            await endpoint.configureReporting('ssIasZone', [{attribute: 'zoneStatus', minimumReportInterval: 1,
+                maximumReportInterval: constants.repInterval.HOUR, reportableChange: 1}]);
         },
     },
 ];

package/devices/tuya.js

@@ -2118,7 +2118,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_3ylew7b4'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_llm0epxg'},
         ],
-        model: 'TS0601_cover',
+        model: 'TS0601_cover_1',
         vendor: 'TuYa',
         description: 'Curtain motor/roller blind motor/window pusher/tubular motor',
         whiteLabel: [
@@ -2150,6 +2150,21 @@ module.exports = [
                     .withValueMax(255)
                     .withDescription('Motor speed'))],
     },
+    {
+        fingerprint: [
+            // Curtain motors:
+            {modelID: 'TS0601', manufacturerName: '_TZE200_eegnwoyw'},
+        ],
+        model: 'TS0601_cover_2',
+        vendor: 'TuYa',
+        description: 'Curtain motor fixed speed',
+        whiteLabel: [
+            {vendor: 'Zemismart', model: 'BCM100DB'},
+        ],
+        fromZigbee: [fz.tuya_cover, fz.ignore_basic_report],
+        toZigbee: [tz.tuya_cover_control],
+        exposes: [e.cover_position().setAccess('position', ea.STATE_SET)],
+    },
     {
         zigbeeModel: ['kud7u2l'],
         fingerprint: [

package/devices/xiaomi.js

@@ -297,6 +297,49 @@ const fzLocal = {
             return payload;
         },
     },
+    CTPR01_action_multistate: {
+        cluster: 'genMultistateInput',
+        type: ['attributeReport', 'readResponse'],
+        options: [],
+        convert: (model, msg, publish, options, meta) => {
+            const value = msg.data['presentValue'];
+            let payload;
+
+            if (value === 0) payload = {action: 'shake'};
+            else if (value === 1) payload = {action: 'throw'};
+            else if (value === 2) payload = {action: '1_min_inactivity'};
+            else if (value === 4) payload = {action: 'hold'};
+            else if (value >= 1024) payload = {action: 'flip_to_side', side: value - 1023};
+            else if (value >= 512) payload = {action: 'tap', side: value - 511};
+            else if (value >= 256) payload = {action: 'slide', side: value - 255};
+            else if (value >= 128) {
+                payload = {
+                    action: 'flip180', side: value - 127,
+                    action_from_side: 7 - value + 127,
+                };
+            } else if (value >= 64) {
+                payload = {
+                    action: 'flip90', side: value % 8 + 1,
+                    action_from_side: Math.floor((value - 64) / 8) + 1,
+                };
+            } else {
+                meta.logger.debug(`${model.zigbeeModel}: unknown action with value ${value}`);
+            }
+            return payload;
+        },
+    },
+    CTPR01_action_analog: {
+        cluster: 'genAnalogInput',
+        type: ['attributeReport', 'readResponse'],
+        options: [],
+        convert: (model, msg, publish, options, meta) => {
+            const value = msg.data['presentValue'];
+            return {
+                action: value < 0 ? 'rotate_left' : 'rotate_right',
+                action_angle: Math.floor(value * 100) / 100,
+            };
+        },
+    },
 };
 
 const tzLocal = {
@@ -608,6 +651,25 @@ const tzLocal = {
             await entity.write('aqaraOpple', payload, {manufacturerCode});
         },
     },
+    CTPR01_operation_mode: {
+        key: ['operation_mode'],
+        convertSet: async (entity, key, value, meta) => {
+            const lookup = {action_mode: 0, scene_mode: 1};
+            /**
+             * schedule the callback to run when the configuration window comes
+             */
+            const callback = async () => {
+                await entity.write(
+                    'aqaraOpple',
+                    {0x0148: {value: lookup[value], type: 0x20}},
+                    {manufacturerCode: 0x115f, disableDefaultResponse: true},
+                );
+                meta.logger.info('operation_mode switch success!');
+            };
+            globalStore.putValue(meta.device, 'opModeSwitchTask', {callback, newMode: value});
+            meta.logger.info('Now give your cube a forceful throw motion (Careful not to drop it)!');
+        },
+    },
 };
 
 module.exports = [
@@ -2991,4 +3053,43 @@ module.exports = [
         exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'hold', 'release']),
             e.device_temperature(), e.power_outage_count()],
     },
+    {
+        zigbeeModel: ['lumi.remote.cagl02'],
+        model: 'CTP-R01',
+        vendor: 'Xiaomi',
+        description: 'Aqara magic cube T1 Pro',
+        meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
+        ota: ota.zigbeeOTA,
+        fromZigbee: [fz.aqara_opple, fzLocal.CTPR01_action_multistate, fzLocal.CTPR01_action_analog, fz.ignore_onoff_report],
+        toZigbee: [tzLocal.CTPR01_operation_mode],
+        exposes: [
+            e.battery(),
+            e.battery_voltage(),
+            e.device_temperature(),
+            e.power_outage_count(false),
+            exposes
+                .enum('operation_mode', ea.SET, ['action_mode', 'scene_mode'])
+                .withDescription('[Soft Switch]: There is a configuration window, opens once an hour on itself, ' +
+                    'only during which the cube will respond to mode switch. ' +
+                    'Mode switch will be scheduled to take effect when the window becomes available. ' +
+                    'You can also give it a throw action (no backward motion) to force a respond! ' +
+                    'Otherwise, you may open lid and click LINK once to make the cube respond immediately. ' +
+                    '[Hard Switch]: Open lid and click LINK button 5 times.'),
+            e.cube_side('side'),
+            e.action([
+                'shake', 'throw', 'tap', 'slide', 'flip180', 'flip90', 'hold', 'side_up',
+                'rotate_left', 'rotate_right', '1_min_inactivity', 'flip_to_side',
+            ]).withDescription('Triggered action'),
+            e.cube_side('action_from_side'),
+            e.angle('action_angle'),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.softwareBuildID = `0.0.0_00${device.applicationVersion}`;
+            device.save();
+
+            const endpoint = device.getEndpoint(1);
+            await endpoint.write('aqaraOpple', {mode: 1}, {manufacturerCode: 0x115f, disableDefaultResponse: true, disableResponse: true});
+            await endpoint.read('aqaraOpple', [0x148], {manufacturerCode: 0x115f, disableDefaultResponse: true, disableResponse: true});
+        },
+    },
 ];

package/devices/yale.js

@@ -8,14 +8,16 @@ const lockExtend = (meta, lockStateOptions=null, binds=['closuresDoorLock', 'gen
     return {
         fromZigbee: [fz.lock, fz.battery, fz.lock_operation_event, fz.lock_programming_event, fz.lock_pin_code_response,
             fz.lock_user_status_response],
-        toZigbee: [tz.lock, tz.pincode_lock, tz.lock_userstatus],
+        toZigbee: [tz.lock, tz.pincode_lock, tz.lock_userstatus, tz.lock_auto_relock_time, tz.lock_sound_volume],
         meta: {pinCodeCount: 250, ...meta},
-        exposes: [e.lock(), e.battery(), e.pincode(), e.lock_action(), e.lock_action_source_name(), e.lock_action_user()],
+        exposes: [e.lock(), e.battery(), e.pincode(), e.lock_action(), e.lock_action_source_name(), e.lock_action_user(),
+            e.auto_relock_time().withValueMin(0).withValueMax(3600), e.sound_volume(), e.battery_low()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.lockState(endpoint, lockStateOptions);
             await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.batteryAlarmState(endpoint);
         },
     };
 };

package/lib/reporting.js

@@ -69,6 +69,7 @@ module.exports = {
     batteryAlarmState: async (endpoint, overrides) => {
         const p = payload('batteryAlarmState', repInterval.HOUR, repInterval.MAX, 0, overrides);
         await endpoint.configureReporting('genPowerCfg', p);
+        await endpoint.read('genPowerCfg', ['batteryAlarmState']);
     },
     onOff: async (endpoint, overrides) => {
         const p = payload('onOff', 0, repInterval.HOUR, 0, overrides);

package/lib/xiaomi.js

@@ -10,6 +10,7 @@ const {
 } = require('./utils');
 
 const exposes = require('../lib/exposes');
+const globalStore = require('../lib/store');
 
 const buffer2DataObject = (meta, model, buffer) => {
     const dataObject = {};
@@ -142,10 +143,10 @@ const buffer2DataObject = (meta, model, buffer) => {
     return dataObject;
 };
 
-const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
+const numericAttributes2Payload = async (msg, meta, model, options, dataObject) => {
     let payload = {};
 
-    Object.entries(dataObject).forEach(([key, value]) => {
+    for (const [key, value] of Object.entries(dataObject)) {
         switch (key) {
         case '0':
             payload.detection_period = value;
@@ -188,7 +189,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             }
             break;
         case '10':
-            if (['ZNLDP13LM'].includes(model.model)) {
+            if (['ZNLDP13LM', 'CTP-R01'].includes(model.model)) {
                 // We don't know what the value means for these devices.
             } else {
                 payload.switch_type = {1: 'toggle', 2: 'momentary'}[value];
@@ -422,7 +423,23 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
         case '247':
             {
                 const dataObject247 = buffer2DataObject(meta, model, value);
-                const payload247 = numericAttributes2Payload(msg, meta, model, options, dataObject247);
+                if (['CTP-R01'].includes(model.model)) {
+                    // execute pending soft switch of operation_mode, if exists
+                    const opModeSwitchTask = globalStore.getValue(meta.device, 'opModeSwitchTask');
+                    if (opModeSwitchTask) {
+                        const {callback, newMode} = opModeSwitchTask;
+                        try {
+                            await callback();
+                            payload.operation_mode = newMode;
+                            globalStore.putValue(meta.device, 'opModeSwitchTask', null);
+                        } catch (error) {
+                            // do nothing when callback fails
+                        }
+                    } else {
+                        payload.operation_mode = {0: 'action_mode', 1: 'scene_mode'}[dataObject247[155]];
+                    }
+                }
+                const payload247 = await numericAttributes2Payload(msg, meta, model, options, dataObject247);
                 payload = {...payload, ...payload247};
             }
             break;
@@ -506,6 +523,19 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload.approach_distance = {0: 'far', 1: 'medium', 2: 'near'}[value];
             }
             break;
+        case '328':
+            if (['CTP-R01'].includes(model.model)) {
+                // detected hard switch of operation_mode (attribute 0x148[328])
+                payload.operation_mode = {0: 'action_mode', 1: 'scene_mode'}[msg.data[328]];
+            }
+            break;
+        case '329':
+            if (['CTP-R01'].includes(model.model)) {
+                // side_up attribute report (attribute 0x149[329])
+                payload.action = 'side_up';
+                payload.side = msg.data[329] + 1;
+            }
+            break;
         case '331':
             if (['JT-BZ-01AQ/A', 'JY-GZ-01AQ'].includes(model.model)) {
                 payload.linkage_alarm = value === 1;
@@ -621,7 +651,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             break;
         case '65281':
             {
-                const payload65281 = numericAttributes2Payload(msg, meta, model, options, value);
+                const payload65281 = await numericAttributes2Payload(msg, meta, model, options, value);
                 payload = {...payload, ...payload65281};
             }
             break;
@@ -650,7 +680,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
         default:
             if (meta.logger) meta.logger.debug(`${model.zigbeeModel}: unknown key ${key} with value ${value}`);
         }
-    });
+    }
 
     if (meta.logger) meta.logger.debug(`${model.zigbeeModel}: Processed data into payload ${JSON.stringify(payload)}`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.36",
+  "version": "15.0.38",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,11 +34,11 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.2.6",
+    "axios": "^1.3.0",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",
-    "zigbee-herdsman": "^0.14.88"
+    "zigbee-herdsman": "^0.14.89"
   },
   "devDependencies": {
     "eslint": "*",