zigbee-herdsman-converters 14.0.645 → 14.0.646

package/converters/fromZigbee.js

@@ -5047,11 +5047,8 @@ const converters = {
                 0x63: 'release_2_and_4', 0x22: 'press_energy_bar',
             };
 
-            if (!lookup.hasOwnProperty(commandID)) {
-                meta.logger.error(`PTM 215Z: missing command '${commandID}'`);
-            } else {
-                return {action: lookup[commandID]};
-            }
+            const action = lookup.hasOwnProperty(commandID) ? lookup[commandID] : `unknown_${commandID}`;
+            return {action};
         },
     },
     enocean_ptm215ze: {
@@ -7491,23 +7488,6 @@ const converters = {
             return result;
         },
     },
-    tuya_gas: {
-        cluster: 'manuSpecificTuya',
-        type: ['commandDataResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const dpValue = tuya.firstDpValue(msg, meta, 'tuya_gas');
-            const dp = dpValue.dp;
-            const value = tuya.getDataValue(dpValue);
-
-            switch (dp) {
-            case tuya.dataPoints.state:
-                return {gas: value === 0 ? true : false};
-            default:
-                meta.logger.warn(`zigbee-herdsman-converters:tuya_gas: Unrecognized DP #${
-                    dp} with data ${JSON.stringify(dpValue)}`);
-            }
-        },
-    },
     idlock: {
         cluster: 'closuresDoorLock',
         type: ['attributeReport', 'readResponse'],

package/devices/adeo.js

@@ -87,6 +87,13 @@ module.exports = [
         description: 'ENKI LEXMAN E14 LED white',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['ZBEK-11'],
+        model: 'IM-CDZDGAAG005KA-MZN',
+        vendor: 'ADEO',
+        description: 'ENKI LEXMAN GU-10 LED white',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['ZBEK-12'],
         model: 'IA-CDZFB2AA007NA-MZN-01',

package/devices/develco.js

@@ -534,24 +534,25 @@ module.exports = [
             return {default: 35};
         },
         configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint39 = device.getEndpoint(39);
+            await reporting.bind(endpoint39, coordinatorEndpoint, ['msIlluminanceMeasurement']);
+            await reporting.illuminance(endpoint39,
+                {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 500});
+
+            const endpoint38 = device.getEndpoint(38);
+            await reporting.bind(endpoint38, coordinatorEndpoint, ['msTemperatureMeasurement']);
+            await reporting.temperature(endpoint38,
+                {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 100});
+
             const endpoint35 = device.getEndpoint(35);
             await reporting.bind(endpoint35, coordinatorEndpoint, ['genPowerCfg']);
             await reporting.batteryVoltage(endpoint35, {min: constants.repInterval.HOUR, max: 43200, change: 100});
+            await endpoint35.read('genBasic', ['develcoPrimarySwVersion', 'develcoPrimaryHwVersion'], manufacturerOptions);
+
             try {
-                await endpoint35.read('genBasic', ['develcoPrimarySwVersion', 'develcoPrimaryHwVersion'], manufacturerOptions);
                 await endpoint35.read('ssIasZone', ['develcoAlarmOffDelay'], manufacturerOptions);
                 await endpoint35.read('genBasic', ['develcoLedControl'], manufacturerOptions);
             } catch (error) {/* some reports of timeouts on reading these */}
-
-            const endpoint38 = device.getEndpoint(38);
-            await reporting.bind(endpoint38, coordinatorEndpoint, ['msTemperatureMeasurement']);
-            await reporting.temperature(endpoint38,
-                {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 100});
-
-            const endpoint39 = device.getEndpoint(39);
-            await reporting.bind(endpoint39, coordinatorEndpoint, ['msIlluminanceMeasurement']);
-            await reporting.illuminance(endpoint39,
-                {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 500});
         },
     },
     {

package/devices/innr.js

@@ -7,6 +7,21 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 module.exports = [
+    {
+        zigbeeModel: ['RC 250'],
+        model: 'RC 250',
+        vendor: 'Innr',
+        description: 'Remote control',
+        fromZigbee: [fz.command_step, fz.command_on, fz.command_off, fz.command_move_to_level, fz.command_move_to_color_temp],
+        toZigbee: [],
+        exposes: [e.action(['on', 'off', 'brightness_step_up', 'brightness_step_down',
+            'brightness_move_to_level', 'color_temperature_move'])],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep = device.getEndpoint(1);
+            await reporting.bind(ep, coordinatorEndpoint, ['genBasic', 'genGroups', 'genScenes',
+                'genOnOff', 'genLevelCtrl', 'lightingColorCtrl']);
+        },
+    },
     {
         zigbeeModel: ['RCL 240 T'],
         model: 'RCL 240 T',
@@ -144,6 +159,14 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
         meta: {applyRedFix: true, turnsOffAtBrightness1: true},
     },
+    {
+        zigbeeModel: ['RB 279 T'],
+        model: 'RB 279 T',
+        vendor: 'Innr',
+        description: 'Smart bulb tunable white E27',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
+        meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+    },
     {
         zigbeeModel: ['RB 285 C'],
         model: 'RB 285 C',

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], supportsHS: true, preferHS: true}),
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [125, 666], supportsHS: true}),
         ota: ota.ledvance,
     },
     {
@@ -458,4 +458,12 @@ module.exports = [
             }
         },
     },
+    {
+        zigbeeModel: ['LIGHTIFY Under Cabinet TW'],
+        model: '71150',
+        vendor: 'OSRAM',
+        description: 'Lightify under cabinet tunable white',
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
 ];

package/devices/philips.js

@@ -813,7 +813,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness(),
     },
     {
-        zigbeeModel: ['LTA001', '4080130P6'],
+        zigbeeModel: ['LTA001', '4080130P6', '4300631P6'],
         model: '9290022169',
         vendor: 'Philips',
         description: 'Hue white ambiance E27 with Bluetooth',

package/devices/tuya.js

@@ -22,7 +22,7 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba', '_TZ3000_iksasdbv', '_TZ3000_idrffznf', '_TZ3000_okaz9tjs', '_TZ3210_q7oryllx',
     '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx',
     '_TZ3000_aim0ztek', '_TZ3000_mlswgkc3', '_TZ3000_7dndcnnb', '_TZ3000_waho4jtj', '_TZ3000_nmsciidq', '_TZ3000_jtgxgmks',
-    '_TZ3000_rdfh8cfs'];
+    '_TZ3000_rdfh8cfs', '_TZ3000_yujkchbz'];
 
 const tzLocal = {
     SA12IZL_silence_siren: {
@@ -781,13 +781,23 @@ module.exports = [
         exposes: [e.carbon_monoxide(), e.co()],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_ggev5fsl'}],
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ggev5fsl', '_TZE200_u319yc66']),
         model: 'TS0601_gas_sensor',
         vendor: 'TuYa',
         description: 'gas sensor',
-        fromZigbee: [fz.tuya_gas],
-        toZigbee: [],
-        exposes: [e.gas()],
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [e.gas(), tuya.exposes.selfTest(), tuya.exposes.selfTestResult(), tuya.exposes.faultAlarm(), tuya.exposes.silence()],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'gas', tuya.valueConverter.true0ElseFalse],
+                [8, 'self_test', tuya.valueConverter.raw],
+                [9, 'self_test_result', tuya.valueConverter.selfTestResult],
+                [11, 'fault_alarm', tuya.valueConverter.trueFalse],
+                [16, 'silence', tuya.valueConverter.raw],
+            ],
+        },
     },
     {
         fingerprint: [{modelID: 'TS0001', manufacturerName: '_TZ3000_hktqahrq'}, {manufacturerName: '_TZ3000_hktqahrq'},
@@ -2004,6 +2014,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_cpmgn2cf'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_4eeyebrt'}, // Immax 07732B
             {modelID: 'TS0601', manufacturerName: '_TZE200_8whxpsiw'}, // EVOLVEO
+            {modelID: 'TS0601', manufacturerName: '_TZE200_bvu2wnxz'}, /* model: 'TRV06', vendor: 'AVATTO' */
         ],
         model: 'TS0601_thermostat',
         vendor: 'TuYa',
@@ -2056,7 +2067,6 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_mudxchsu'}, /* model: 'TV05-ZG curve', vendor: 'TuYa' */
             {modelID: 'TS0601', manufacturerName: '_TZE200_7yoranx2'}, /* model: 'TV01-ZB', vendor: 'Moes' */
             {modelID: 'TS0601', manufacturerName: '_TZE200_kds0pmmv'}, /* model: 'TV01-ZB', vendor: 'Moes' */
-            {modelID: 'TS0601', manufacturerName: '_TZE200_bvu2wnxz'}, /* model: 'TRV06', vendor: 'AVATTO' */
         ],
         model: 'TV02-Zigbee',
         vendor: 'TuYa',

package/devices/vimar.js

@@ -48,4 +48,29 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
         },
     },
+    {
+        zigbeeModel: ['Thermostat_v0.1'],
+        model: '02973.B',
+        vendor: 'Vimar',
+        description: 'Vimar IoT thermostat',
+        fromZigbee: [fz.thermostat],
+        toZigbee: [
+            tz.thermostat_local_temperature,
+            tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_occupied_cooling_setpoint,
+            tz.thermostat_system_mode,
+        ],
+        exposes: [
+            exposes.climate().withSetpoint('occupied_heating_setpoint', 4, 40, 0.1)
+                .withSetpoint('occupied_cooling_setpoint', 4, 40, 0.1)
+                .withLocalTemperature()
+                .withSystemMode(['heat', 'cool']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(10);
+            const binds = ['genBasic', 'genIdentify', 'hvacThermostat'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.thermostatTemperature(endpoint);
+        },
+    },
 ];

package/lib/tuya.js

@@ -1152,6 +1152,12 @@ const tuyaExposes = {
     countdown: () => exposes.numeric('countdown', ea.STATE_SET).withValueMin(0).withValueMax(43200).withValueStep(1).withUnit('s')
         .withDescription('Countdown to turn device off after a certain time'),
     switch: () => e.switch().setAccess('state', ea.STATE_SET),
+    selfTest: () => exposes.binary('self_test', ea.STATE_SET, true, false)
+        .withDescription('Indicates whether the device is being self-tested'),
+    selfTestResult: () => exposes.enum('self_test_result', ea.STATE, ['checking', 'success', 'failure', 'others'])
+        .withDescription('Result of the self-test'),
+    faultAlarm: () => exposes.binary('fault_alarm', ea.STATE, true, false).withDescription('Indicates whether a fault was detected'),
+    silence: () => exposes.binary('silence', ea.STATE_SET, true, false).withDescription('Silence the alarm'),
 };
 
 const skip = {
@@ -1215,10 +1221,12 @@ const valueConverter = {
         },
     },
     true0ElseFalse: {from: (v) => v === 0},
+    selfTestResult: valueConverterBasic.lookup({'checking': 0, 'success': 1, 'failure': 2, 'others': 3}),
 };
 
 const tzDataPoints = {
-    key: ['state', 'brightness', 'min_brightness', 'max_brightness', 'power_on_behavior', 'countdown', 'light_type'],
+    key: ['state', 'brightness', 'min_brightness', 'max_brightness', 'power_on_behavior',
+        'countdown', 'light_type', 'silence', 'self_test'],
     convertSet: async (entity, key, value, meta) => {
         // A set converter is only called once; therefore we need to loop
         const state = {};

package/package.json

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