zigbee-herdsman-converters 19.44.0 → 19.45.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [19.45.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v19.44.0...v19.45.0) (2024-05-28)
+
+
+### Features
+
+* Enable OTA for some Develco devices ([#7561](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7561)) ([90d336e](https://github.com/Koenkk/zigbee-herdsman-converters/commit/90d336e22dcfaf56a08b5f3bec17d05494b554ca))
+
+
+### Bug Fixes
+
+* **detect:** Detect `_TZ3000_zrm3oxsh` as EARU EAYCB-Z-2P ([#7568](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7568)) ([8c41f14](https://github.com/Koenkk/zigbee-herdsman-converters/commit/8c41f1406eee4053087ab79e61937c4da25aa2b7))
+* **detect:** Detect `_TZ3000_zrm3oxsh` as TuYa TS011F_with_threshold ([#7571](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7571)) ([51191e1](https://github.com/Koenkk/zigbee-herdsman-converters/commit/51191e1f7e0cb328f24423635d38d50746c5434b))
+* **detect:** Detect `_TZE200_2odrmqwq` as TuYa TS0601_cover_1 [@mrespin](https://github.com/mrespin) https://github.com/Koenkk/zigbee2mqtt/issues/22795 ([b41636e](https://github.com/Koenkk/zigbee-herdsman-converters/commit/b41636e651279459883ed9204ffedcdf8dca021b))
+* Partly convert Bosch BMCT-SLZ to `modernExtend` ([#7569](https://github.com/Koenkk/zigbee-herdsman-converters/issues/7569)) ([8242bb7](https://github.com/Koenkk/zigbee-herdsman-converters/commit/8242bb7b23ded4e1cdfddb1f87f991601e3aceef))
+
 ## [19.44.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v19.43.0...v19.44.0) (2024-05-27)
 
 

package/devices/bosch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bosch.d.ts","sourceRoot":"","sources":["../src/devices/bosch.ts"],"names":[],"mappings":"AAcA,OAAO,EACK,UAAU,EACrB,MAAM,cAAc,CAAC;AA+9BtB,QAAA,MAAM,WAAW,EAAE,UAAU,EA6yB5B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"bosch.d.ts","sourceRoot":"","sources":["../src/devices/bosch.ts"],"names":[],"mappings":"AAcA,OAAO,EACK,UAAU,EACrB,MAAM,cAAc,CAAC;AAy+BtB,QAAA,MAAM,WAAW,EAAE,UAAU,EA+0B5B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/bosch.js

@@ -60,25 +60,6 @@ const sirenPowerSupply = {
     'ac_power_supply': 0x02,
     'dc_power_supply': 0x03,
 };
-// BMCT
-const stateDeviceMode = {
-    'light': 0x04,
-    'shutter': 0x01,
-    'disabled': 0x00,
-};
-// BMCT
-const stateMotor = {
-    'stopped': 0x00,
-    'opening': 0x01,
-    'closing': 0x02,
-};
-// BMCT
-const stateSwitchType = {
-    'button': 0x01,
-    'button_key_change': 0x02,
-    'rocker_switch': 0x03,
-    'rocker_switch_key_change': 0x04,
-};
 // Radiator Thermostat II
 const stateOffOn = {
     'OFF': 0,
@@ -518,9 +499,9 @@ const boschExtend = {
                 .withUnit('°C').withDescription('Measured temperature value'),
             e.numeric('humidity', ea.STATE).withValueMin(0).withValueMax(100).withValueStep(0.1)
                 .withUnit('%').withDescription('Measured relative humidity'),
-            e.numeric('voc', ea.STATE).withValueMin(0).withValueMax(35610).withValueStep(1)
+            e.numeric('voc', ea.STATE).withValueMin(0).withValueMax(50000).withValueStep(1)
                 .withLabel('VOC').withUnit('µg/m³').withDescription('Measured VOC value'),
-            e.numeric('co2', ea.STATE).withValueMin(500).withValueMax(5500).withValueStep(1)
+            e.numeric('co2', ea.STATE).withValueMin(400).withValueMax(2400).withValueStep(1)
                 .withLabel('CO2').withUnit('ppm').withDescription('The measured CO2 (carbon dioxide) value'),
             e.numeric('aqi', ea.STATE).withValueMin(0).withValueMax(500).withValueStep(1)
                 .withLabel('AQI').withDescription('Air Quality Index'),
@@ -731,6 +712,153 @@ const boschExtend = {
             isModernExtend: true,
         };
     },
+    bmct: () => {
+        const stateDeviceMode = {
+            'light': 0x04,
+            'shutter': 0x01,
+            'disabled': 0x00,
+        };
+        const stateMotor = {
+            'stopped': 0x00,
+            'opening': 0x01,
+            'closing': 0x02,
+        };
+        const stateSwitchType = {
+            'button': 0x01,
+            'button_key_change': 0x02,
+            'rocker_switch': 0x03,
+            'rocker_switch_key_change': 0x04,
+        };
+        const fromZigbee = [{
+                cluster: 'boschSpecific',
+                type: ['attributeReport', 'readResponse'],
+                convert: (model, msg, publish, options, meta) => {
+                    const result = {};
+                    const data = msg.data;
+                    if (data.hasOwnProperty('deviceMode')) {
+                        result.device_mode = Object.keys(stateDeviceMode).find((key) => stateDeviceMode[key] === msg.data['deviceMode']);
+                        const deviceMode = msg.data['deviceMode'];
+                        if (deviceMode !== meta.device.meta.deviceMode) {
+                            meta.device.meta.deviceMode = deviceMode;
+                            meta.deviceExposesChanged();
+                        }
+                    }
+                    if (data.hasOwnProperty('switchType')) {
+                        result.switch_type = Object.keys(stateSwitchType).find((key) => stateSwitchType[key] === msg.data['switchType']);
+                    }
+                    if (data.hasOwnProperty('calibrationOpeningTime')) {
+                        result.calibration_opening_time = msg.data['calibrationOpeningTime'] / 10;
+                    }
+                    if (data.hasOwnProperty('calibrationClosingTime')) {
+                        result.calibration_closing_time = msg.data['calibrationClosingTime'] / 10;
+                    }
+                    if (data.hasOwnProperty('childLock')) {
+                        const property = utils.postfixWithEndpointName('child_lock', msg, model, meta);
+                        result[property] = msg.data['childLock'] === 1 ? 'ON' : 'OFF';
+                    }
+                    if (data.hasOwnProperty('motorState')) {
+                        result.motor_state = Object.keys(stateMotor).find((key) => stateMotor[key] === msg.data['motorState']);
+                    }
+                    return result;
+                },
+            }];
+        const toZigbee = [{
+                key: [
+                    'device_mode',
+                    'switch_type',
+                    'child_lock',
+                    'state',
+                    'on_time',
+                    'off_wait_time',
+                ],
+                convertSet: async (entity, key, value, meta) => {
+                    if (key === 'state') {
+                        if ('ID' in entity && entity.ID === 1) {
+                            await toZigbee_1.default.cover_state.convertSet(entity, key, value, meta);
+                        }
+                        else {
+                            await toZigbee_1.default.on_off.convertSet(entity, key, value, meta);
+                        }
+                    }
+                    if (key === 'on_time' || key === 'on_wait_time') {
+                        if ('ID' in entity && entity.ID !== 1) {
+                            await toZigbee_1.default.on_off.convertSet(entity, key, value, meta);
+                        }
+                    }
+                    if (key === 'device_mode') {
+                        const index = utils.getFromLookup(value, stateDeviceMode);
+                        await entity.write('boschSpecific', { deviceMode: index });
+                        await entity.read('boschSpecific', ['deviceMode']);
+                        return { state: { device_mode: value } };
+                    }
+                    if (key === 'switch_type') {
+                        const index = utils.getFromLookup(value, stateSwitchType);
+                        await entity.write('boschSpecific', { switchType: index });
+                        return { state: { switch_type: value } };
+                    }
+                    if (key === 'child_lock') {
+                        const index = utils.getFromLookup(value, stateOffOn);
+                        await entity.write('boschSpecific', { childLock: index });
+                        return { state: { child_lock: value } };
+                    }
+                },
+                convertGet: async (entity, key, meta) => {
+                    switch (key) {
+                        case 'state':
+                        case 'on_time':
+                        case 'off_wait_time':
+                            if ('ID' in entity && entity.ID !== 1) {
+                                await entity.read('genOnOff', ['onOff']);
+                            }
+                            break;
+                        case 'device_mode':
+                            await entity.read('boschSpecific', ['deviceMode']);
+                            break;
+                        case 'switch_type':
+                            await entity.read('boschSpecific', ['switchType']);
+                            break;
+                        case 'child_lock':
+                            await entity.read('boschSpecific', ['childLock']);
+                            break;
+                        default:
+                            throw new Error(`Unhandled key boschExtend.bmct.toZigbee.convertGet ${key}`);
+                    }
+                },
+            }, {
+                key: ['calibration', 'calibration_closing_time', 'calibration_opening_time'],
+                convertSet: async (entity, key, value, meta) => {
+                    if (key === 'calibration_opening_time') {
+                        const number = utils.toNumber(value, 'calibration_opening_time');
+                        const index = number * 10;
+                        await entity.write('boschSpecific', { calibrationOpeningTime: index });
+                        return { state: { calibration_opening_time: number } };
+                    }
+                    if (key === 'calibration_closing_time') {
+                        const number = utils.toNumber(value, 'calibration_closing_time');
+                        const index = number * 10;
+                        await entity.write('boschSpecific', { calibrationClosingTime: index });
+                        return { state: { calibration_closing_time: number } };
+                    }
+                },
+                convertGet: async (entity, key, meta) => {
+                    switch (key) {
+                        case 'calibration_opening_time':
+                            await entity.read('boschSpecific', ['calibrationOpeningTime']);
+                            break;
+                        case 'calibration_closing_time':
+                            await entity.read('boschSpecific', ['calibrationClosingTime']);
+                            break;
+                        default:
+                            throw new Error(`Unhandled key boschExtend.bmct.toZigbee.convertGet ${key}`);
+                    }
+                },
+            }];
+        return {
+            fromZigbee,
+            toZigbee,
+            isModernExtend: true,
+        };
+    },
 };
 const tzLocal = {
     rbshoszbeu: {
@@ -812,88 +940,6 @@ const tzLocal = {
             }
         },
     },
-    bmct: {
-        key: [
-            'device_mode',
-            'switch_type',
-            'child_lock',
-            'calibration', 'calibration_closing_time', 'calibration_opening_time',
-            'state',
-            'on_time',
-            'off_wait_time',
-        ],
-        convertSet: async (entity, key, value, meta) => {
-            if (key === 'state') {
-                if ('ID' in entity && entity.ID === 1) {
-                    await toZigbee_1.default.cover_state.convertSet(entity, key, value, meta);
-                }
-                else {
-                    await toZigbee_1.default.on_off.convertSet(entity, key, value, meta);
-                }
-            }
-            if (key === 'on_time' || key === 'on_wait_time') {
-                if ('ID' in entity && entity.ID !== 1) {
-                    await toZigbee_1.default.on_off.convertSet(entity, key, value, meta);
-                }
-            }
-            if (key === 'device_mode') {
-                const index = utils.getFromLookup(value, stateDeviceMode);
-                await entity.write('manuSpecificBosch10', { deviceMode: index });
-                await entity.read('manuSpecificBosch10', ['deviceMode']);
-                return { state: { device_mode: value } };
-            }
-            if (key === 'switch_type') {
-                const index = utils.getFromLookup(value, stateSwitchType);
-                await entity.write('manuSpecificBosch10', { switchType: index });
-                return { state: { switch_type: value } };
-            }
-            if (key === 'child_lock') {
-                const index = utils.getFromLookup(value, stateOffOn);
-                await entity.write('manuSpecificBosch10', { childLock: index });
-                return { state: { child_lock: value } };
-            }
-            if (key === 'calibration_opening_time') {
-                const number = utils.toNumber(value, 'calibration_opening_time');
-                const index = number * 10;
-                await entity.write('manuSpecificBosch10', { calibrationOpeningTime: index });
-                return { state: { calibration_opening_time: number } };
-            }
-            if (key === 'calibration_closing_time') {
-                const number = utils.toNumber(value, 'calibration_closing_time');
-                const index = number * 10;
-                await entity.write('manuSpecificBosch10', { calibrationClosingTime: index });
-                return { state: { calibration_closing_time: number } };
-            }
-        },
-        convertGet: async (entity, key, meta) => {
-            switch (key) {
-                case 'state':
-                case 'on_time':
-                case 'off_wait_time':
-                    if ('ID' in entity && entity.ID !== 1) {
-                        await entity.read('genOnOff', ['onOff']);
-                    }
-                    break;
-                case 'device_mode':
-                    await entity.read('manuSpecificBosch10', ['deviceMode']);
-                    break;
-                case 'switch_type':
-                    await entity.read('manuSpecificBosch10', ['switchType']);
-                    break;
-                case 'child_lock':
-                    await entity.read('manuSpecificBosch10', ['childLock']);
-                    break;
-                case 'calibration_opening_time':
-                    await entity.read('manuSpecificBosch10', ['calibrationOpeningTime']);
-                    break;
-                case 'calibration_closing_time':
-                    await entity.read('manuSpecificBosch10', ['calibrationClosingTime']);
-                    break;
-                default: // Unknown key
-                    throw new Error(`Unhandled key toZigbee.bcmt.convertGet ${key}`);
-            }
-        },
-    },
     bhius_config: {
         key: Object.keys(buttonMap),
         convertGet: async (entity, key, meta) => {
@@ -919,39 +965,6 @@ const tzLocal = {
     },
 };
 const fzLocal = {
-    bmct: {
-        cluster: 'manuSpecificBosch10',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const result = {};
-            const data = msg.data;
-            if (data.hasOwnProperty('deviceMode')) {
-                result.device_mode = Object.keys(stateDeviceMode).find((key) => stateDeviceMode[key] === msg.data['deviceMode']);
-                const deviceMode = msg.data['deviceMode'];
-                if (deviceMode !== meta.device.meta.deviceMode) {
-                    meta.device.meta.deviceMode = deviceMode;
-                    meta.deviceExposesChanged();
-                }
-            }
-            if (data.hasOwnProperty('switchType')) {
-                result.switch_type = Object.keys(stateSwitchType).find((key) => stateSwitchType[key] === msg.data['switchType']);
-            }
-            if (data.hasOwnProperty('calibrationOpeningTime')) {
-                result.calibration_opening_time = msg.data['calibrationOpeningTime'] / 10;
-            }
-            if (data.hasOwnProperty('calibrationClosingTime')) {
-                result.calibration_closing_time = msg.data['calibrationClosingTime'] / 10;
-            }
-            if (data.hasOwnProperty('childLock')) {
-                const property = utils.postfixWithEndpointName('child_lock', msg, model, meta);
-                result[property] = msg.data['childLock'] === 1 ? 'ON' : 'OFF';
-            }
-            if (data.hasOwnProperty('motorState')) {
-                result.motor_state = Object.keys(stateMotor).find((key) => stateMotor[key] === msg.data['motorState']);
-            }
-            return result;
-        },
-    },
     bhius_button_press: {
         cluster: 'manuSpecificBosch9',
         type: 'raw',
@@ -1678,12 +1691,10 @@ const definitions = [
             fromZigbee_1.default.on_off,
             fromZigbee_1.default.power_on_behavior,
             fromZigbee_1.default.cover_position_tilt,
-            fzLocal.bmct,
         ],
         toZigbee: [
             toZigbee_1.default.power_on_behavior,
             toZigbee_1.default.cover_position_tilt,
-            tzLocal.bmct,
         ],
         meta: {
             multiEndpoint: true,
@@ -1691,22 +1702,55 @@ const definitions = [
         endpoint: (device) => {
             return { 'left': 2, 'right': 3 };
         },
+        extend: [
+            (0, modernExtend_1.deviceAddCustomCluster)('boschSpecific', {
+                ID: 0xfca0,
+                manufacturerCode: zigbee_herdsman_1.Zcl.ManufacturerCode.ROBERT_BOSCH_GMBH,
+                attributes: {
+                    deviceMode: { ID: 0x0000, type: zigbee_herdsman_1.Zcl.DataType.ENUM8 },
+                    switchType: { ID: 0x0001, type: zigbee_herdsman_1.Zcl.DataType.ENUM8 },
+                    calibrationOpeningTime: { ID: 0x0002, type: zigbee_herdsman_1.Zcl.DataType.UINT32 },
+                    calibrationClosingTime: { ID: 0x0003, type: zigbee_herdsman_1.Zcl.DataType.UINT32 },
+                    childLock: { ID: 0x0008, type: zigbee_herdsman_1.Zcl.DataType.BOOLEAN },
+                    motorState: { ID: 0x0013, type: zigbee_herdsman_1.Zcl.DataType.ENUM8 },
+                },
+                commands: {},
+                commandsResponse: {},
+            }),
+            boschExtend.bmct(),
+        ],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint1 = device.getEndpoint(1);
-            await reporting.bind(endpoint1, coordinatorEndpoint, ['genIdentify', 'closuresWindowCovering', 'manuSpecificBosch10']);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genIdentify', 'closuresWindowCovering', 'boschSpecific']);
             await reporting.currentPositionLiftPercentage(endpoint1);
-            await endpoint1.read('manuSpecificBosch10', ['deviceMode', 'switchType',
+            await endpoint1.read('boschSpecific', ['deviceMode', 'switchType',
                 'calibrationOpeningTime', 'calibrationClosingTime', 'childLock', 'motorState']).catch((e) => { });
             const endpoint2 = device.getEndpoint(2);
-            await endpoint2.read('manuSpecificBosch10', ['childLock']);
+            await endpoint2.read('boschSpecific', ['childLock']);
             await reporting.bind(endpoint2, coordinatorEndpoint, ['genIdentify', 'genOnOff']).catch((e) => { });
             await reporting.onOff(endpoint2);
             const endpoint3 = device.getEndpoint(3);
-            await endpoint3.read('manuSpecificBosch10', ['childLock']).catch((e) => { });
+            await endpoint3.read('boschSpecific', ['childLock']).catch((e) => { });
             await reporting.bind(endpoint3, coordinatorEndpoint, ['genIdentify', 'genOnOff']);
             await reporting.onOff(endpoint3);
         },
         exposes: (device, options) => {
+            const stateDeviceMode = {
+                'light': 0x04,
+                'shutter': 0x01,
+                'disabled': 0x00,
+            };
+            const stateMotor = {
+                'stopped': 0x00,
+                'opening': 0x01,
+                'closing': 0x02,
+            };
+            const stateSwitchType = {
+                'button': 0x01,
+                'button_key_change': 0x02,
+                'rocker_switch': 0x03,
+                'rocker_switch_key_change': 0x04,
+            };
             const commonExposes = [
                 e.enum('switch_type', ea.ALL, Object.keys(stateSwitchType))
                     .withDescription('Module controlled by a rocker switch or a button'),
@@ -1733,7 +1777,7 @@ const definitions = [
                     .withDescription('Calibration opening time').withValueMin(1).withValueMax(90),
             ];
             if (device) {
-                const deviceModeKey = device.getEndpoint(1).getClusterAttributeValue('manuSpecificBosch10', 'deviceMode');
+                const deviceModeKey = device.getEndpoint(1).getClusterAttributeValue('boschSpecific', 'deviceMode');
                 const deviceMode = Object.keys(stateDeviceMode).find((key) => stateDeviceMode[key] === deviceModeKey);
                 if (deviceMode === 'light') {
                     return [...commonExposes, ...lightExposes];