zigbee-herdsman-converters 15.0.5 → 15.0.7

package/converters/fromZigbee.js

@@ -2304,43 +2304,59 @@ const converters = {
             // Protocol description
             // https://github.com/Koenkk/zigbee-herdsman-converters/issues/1159#issuecomment-614659802
 
-            const dpValue = tuya.firstDpValue(msg, meta, 'tuya_cover');
-            const dp = dpValue.dp;
-            const value = tuya.getDataValue(dpValue);
+            const result = {};
 
-            switch (dp) {
-            case tuya.dataPoints.coverPosition: // Started moving to position (triggered from Zigbee)
-            case tuya.dataPoints.coverArrived: { // Arrived at position
-                const invert = tuya.isCoverInverted(meta.device.manufacturerName) ? !options.invert_cover : options.invert_cover;
-                const position = invert ? 100 - (value & 0xFF) : (value & 0xFF);
-                const running = dp !== tuya.dataPoints.coverArrived;
+            // Iterate through dpValues in case of some zigbee models returning multiple dp values in one message
+            // For example: [TS0601, _TZE200_3ylew7b4]
+            for (const dpValue of msg.data.dpValues) {
+                const dp = dpValue.dp;
+                const value = tuya.getDataValue(dpValue);
 
-                // Not all covers report coverArrived, so set running to false if device doesn't report position for a few seconds
-                clearTimeout(globalStore.getValue(msg.endpoint, 'running_timer'));
-                if (running) {
-                    const timer = setTimeout(() => publish({running: false}), 3 * 1000);
-                    globalStore.putValue(msg.endpoint, 'running_timer', timer);
-                }
+                switch (dp) {
+                case tuya.dataPoints.coverPosition: // Started moving to position (triggered from Zigbee)
+                case tuya.dataPoints.coverArrived: { // Arrived at position
+                    const invert = tuya.isCoverInverted(meta.device.manufacturerName) ? !options.invert_cover : options.invert_cover;
+                    const position = invert ? 100 - (value & 0xff) : value & 0xff;
+                    const running = dp !== tuya.dataPoints.coverArrived;
+
+                    // Not all covers report coverArrived, so set running to false if device doesn't report position
+                    // for a few seconds
+                    clearTimeout(globalStore.getValue(msg.endpoint, 'running_timer'));
+                    if (running) {
+                        const timer = setTimeout(() => publish({running: false}), 3 * 1000);
+                        globalStore.putValue(msg.endpoint, 'running_timer', timer);
+                    }
 
-                if (position > 0 && position <= 100) {
-                    return {running, position, state: 'OPEN'};
-                } else if (position == 0) { // Report fully closed
-                    return {running, position, state: 'CLOSE'};
-                } else {
-                    return {running}; // Not calibrated yet, no position is available
+                    if (position > 0 && position <= 100) {
+                        result.running = running;
+                        result.position = position;
+                        result.state = 'OPEN';
+                    } else if (position == 0) {
+                    // Report fully closed
+                        result.running = running;
+                        result.position = position;
+                        result.state = 'CLOSE';
+                    } else {
+                        result.running = running; // Not calibrated yet, no position is available
+                    }
+                }
+                    break;
+                case tuya.dataPoints.coverSpeed: // Cover is reporting its current speed setting
+                    result.motor_speed = value;
+                    break;
+                case tuya.dataPoints.state: // Ignore the cover state, it's not reliable between different covers!
+                    break;
+                case tuya.dataPoints.coverChange: // Ignore manual cover change, it's not reliable between different covers!
+                    break;
+                case tuya.dataPoints.config: // Returned by configuration set; ignore
+                    break;
+                default: // Unknown code
+                    meta.logger.warn(`TuYa_cover_control: Unhandled DP #${dp} for ${meta.device.manufacturerName}:
+                    ${JSON.stringify(dpValue)}`);
                 }
             }
-            case tuya.dataPoints.coverSpeed: // Cover is reporting its current speed setting
-                return {motor_speed: value};
-            case tuya.dataPoints.state: // Ignore the cover state, it's not reliable between different covers!
-            case tuya.dataPoints.coverChange: // Ignore manual cover change, it's not reliable between different covers!
-                break;
-            case tuya.dataPoints.config: // Returned by configuration set; ignore
-                break;
-            default: // Unknown code
-                meta.logger.warn(`TuYa_cover_control: Unhandled DP #${dp} for ${meta.device.manufacturerName}:
-                ${JSON.stringify(dpValue)}`);
-            }
+
+            return result;
         },
     },
     wiser_device_info: {

package/devices/bosch.js

@@ -11,6 +11,21 @@ const ea = exposes.access;
 // Radiator Thermostat II
 const boschManufacturer = {manufacturerCode: 0x1209};
 
+// Twinguard
+const smokeSensitivity = {
+    'low': 3,
+    'medium': 2,
+    'high': 1,
+};
+
+// Twinguard
+const sirenState = {
+    'stop': 0,
+    'pre_alarm': 1,
+    'fire': 2,
+    'burglar': 3,
+};
+
 // Radiator Thermostat II
 const operatingModes = {
     'automatic': 0,
@@ -122,6 +137,67 @@ const tzLocal = {
             }
         },
     },
+    bosch_twinguard: {
+        key: ['sensitivity', 'pre_alarm', 'self_test', 'alarm', 'heartbeat'],
+        convertSet: async (entity, key, value, meta) => {
+            if (key === 'sensitivity') {
+                value = value.toUpperCase();
+                const index = smokeSensitivity[value];
+                await entity.write('manuSpecificBosch', {0x4003: {value: index, type: 0x21}}, boschManufacturer);
+                return {state: {sensitivity: value}};
+            }
+            if (key === 'pre_alarm') {
+                value = value.toUpperCase();
+                const index = stateOffOn[value];
+                await entity.write('manuSpecificBosch5', {0x4001: {value: index, type: 0x18}}, boschManufacturer);
+                return {state: {pre_alarm: value}};
+            }
+            if (key === 'heartbeat') {
+                const endpoint = meta.device.getEndpoint(12);
+                value = value.toUpperCase();
+                const index = stateOffOn[value];
+                await endpoint.write('manuSpecificBosch7', {0x5005: {value: index, type: 0x18}}, boschManufacturer);
+                return {state: {heartbeat: value}};
+            }
+            if (key === 'self_test') {
+                if (value) {
+                    await entity.command('manuSpecificBosch', 'initiateTestMode', boschManufacturer);
+                }
+            }
+            if (key === 'alarm') {
+                const endpoint = meta.device.getEndpoint(12);
+                const index = sirenState[value];
+                if (index == 0) {
+                    await entity.commandResponse('genAlarms', 'alarm', {alarmcode: 0x16, clusterid: 0xe000}, {direction: 1});
+                    await entity.commandResponse('genAlarms', 'alarm', {alarmcode: 0x14, clusterid: 0xe000}, {direction: 1});
+                    await endpoint.command('manuSpecificBosch8', 'burglarAlarm', {data: 0}, boschManufacturer);
+                } else if (index == 1) {
+                    await entity.commandResponse('genAlarms', 'alarm', {alarmcode: 0x11, clusterid: 0xe000}, {direction: 1});
+                    return {state: {siren_state: 'pre-alarm'}};
+                } else if (index == 2) {
+                    await entity.commandResponse('genAlarms', 'alarm', {alarmcode: 0x10, clusterid: 0xe000}, {direction: 1});
+                    return {state: {siren_state: 'fire'}};
+                } else if (index == 3) {
+                    await endpoint.command('manuSpecificBosch8', 'burglarAlarm', {data: 1}, boschManufacturer);
+                }
+            }
+        },
+        convertGet: async (entity, key, meta) => {
+            switch (key) {
+            case 'sensitivity':
+                await entity.read('manuSpecificBosch', [0x4003], boschManufacturer);
+                break;
+            case 'pre_alarm':
+                await entity.read('manuSpecificBosch5', [0x4001], boschManufacturer);
+                break;
+            case 'heartbeat':
+                await meta.device.getEndpoint(12).read('manuSpecificBosch7', [0x5005], boschManufacturer);
+                break;
+            default: // Unknown key
+                throw new Error(`Unhandled key toZigbee.bosch_twinguard.convertGet ${key}`);
+            }
+        },
+    },
 };
 
 
@@ -172,6 +248,112 @@ const fzLocal = {
             return result;
         },
     },
+    bosch_twinguard_sensitivity: {
+        cluster: 'manuSpecificBosch',
+        type: ['attributeReport', 'readResponse'],
+        options: [],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty(0x4003)) {
+                result.sensitivity = (Object.keys(smokeSensitivity)[msg.data[0x4003]]);
+            }
+            return result;
+        },
+    },
+    bosch_twinguard_measurements: {
+        cluster: 'manuSpecificBosch3',
+        type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.precision('temperature'), exposes.options.calibration('temperature'),
+            exposes.options.precision('humidity'), exposes.options.calibration('humidity'),
+            exposes.options.calibration('illuminance_lux', 'percentual')],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty('humidity')) {
+                result.humidity = utils.calibrateAndPrecisionRoundOptions(msg.data['humidity'] / 100.0, options, 'humidity');
+            }
+            if (msg.data.hasOwnProperty('airpurity')) {
+                result.co2 = msg.data['airpurity'] * 10.0 + 500.0;
+            }
+            if (msg.data.hasOwnProperty('temperature')) {
+                result.temperature = utils.calibrateAndPrecisionRoundOptions(msg.data['temperature'] / 100.0, options, 'temperature');
+            }
+            if (msg.data.hasOwnProperty('illuminance_lux')) {
+                result.illuminance_lux = utils.calibrateAndPrecisionRoundOptions(
+                    msg.data['illuminance_lux'] / 2.0, options, 'illuminance_lux');
+            }
+            if (msg.data.hasOwnProperty('battery')) {
+                result.battery = msg.data['battery'] / 2.0;
+            }
+            return result;
+        },
+    },
+    bosch_twinguard_pre_alarm: {
+        cluster: 'manuSpecificBosch5',
+        type: ['attributeReport', 'readResponse'],
+        options: [],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty('pre_alarm')) {
+                result.pre_alarm = (Object.keys(stateOffOn)[msg.data['pre_alarm']]);
+            }
+            return result;
+        },
+    },
+    bosch_twinguard_heartbeat: {
+        cluster: 'manuSpecificBosch7',
+        type: ['attributeReport', 'readResponse'],
+        options: [],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty('heartbeat')) {
+                result.heartbeat = (Object.keys(stateOffOn)[msg.data['heartbeat']]);
+            }
+            return result;
+        },
+    },
+    bosch_twinguard_alarm_state: {
+        cluster: 'manuSpecificBosch8',
+        type: ['attributeReport', 'readResponse'],
+        options: [],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            const lookup = {
+                0x00200020: 'clear',
+                0x01200020: 'self_test',
+                0x02200020: 'burglar',
+                0x00200082: 'pre-alarm',
+                0x00200081: 'fire',
+                0x00200040: 'silenced',
+            };
+
+            if (msg.data.hasOwnProperty('alarm_status')) {
+                result.self_test = (msg.data['alarm_status'] & 1<<24) > 0;
+                result.smoke = (msg.data['alarm_status'] & 1<<7) > 0;
+                result.siren_state = lookup[msg.data['alarm_status']];
+            }
+            return result;
+        },
+    },
+    bosch_twinguard_smoke_alarm_state: {
+        cluster: 'genAlarms',
+        type: ['commandAlarm', 'readResponse'],
+        options: [],
+        convert: async (model, msg, publish, options, meta) => {
+            const result = {};
+            const lookup = {
+                0x10: 'fire',
+                0x11: 'pre-alarm',
+                0x14: 'clear',
+                0x16: 'silenced',
+            };
+            result.siren_state = lookup[msg.data.alarmcode];
+            if (msg.data.alarmcode == 0x10 || msg.data.alarmcode == 0x11) {
+                await msg.endpoint.commandResponse('genAlarms', 'alarm',
+                    {alarmcode: msg.data.alarmcode, clusterid: 0xe000}, {direction: 1});
+            }
+            return result;
+        },
+    },
 };
 
 const definition = [
@@ -283,6 +465,47 @@ const definition = [
             await endpoint.read('hvacUserInterfaceCfg', [0x400b, 0x403a, 0x403b], boschManufacturer);
         },
     },
+    {
+        zigbeeModel: ['Champion'],
+        model: '8750001213',
+        vendor: 'Bosch',
+        description: 'Twinguard',
+        fromZigbee: [fzLocal.bosch_twinguard_measurements, fzLocal.bosch_twinguard_sensitivity,
+            fzLocal.bosch_twinguard_pre_alarm, fzLocal.bosch_twinguard_alarm_state, fzLocal.bosch_twinguard_smoke_alarm_state,
+            fzLocal.bosch_twinguard_heartbeat],
+        toZigbee: [tzLocal.bosch_twinguard],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const coordinatorEndpointB = coordinatorEndpoint.getDevice().getEndpoint(1);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpointB, [0x0009]);
+            await reporting.bind(device.getEndpoint(7), coordinatorEndpointB, [0x0019]);
+            await reporting.bind(device.getEndpoint(7), coordinatorEndpointB, [0x0020]);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpointB, [0xe000]);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpointB, [0xe002]);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpointB, [0xe004]);
+            await reporting.bind(device.getEndpoint(12), coordinatorEndpointB, [0xe006]);
+            await reporting.bind(device.getEndpoint(12), coordinatorEndpointB, [0xe007]);
+            await device.getEndpoint(1).read('manuSpecificBosch5', ['unknown_attribute'], boschManufacturer); // Needed for pairing
+            await device.getEndpoint(12).command('manuSpecificBosch7', 'pairingCompleted', boschManufacturer); // Needed for pairing
+            await device.getEndpoint(1).write('manuSpecificBosch',
+                {0x4003: {value: 0x0002, type: 0x21}}, boschManufacturer); // Setting defaults
+            await device.getEndpoint(1).write('manuSpecificBosch5',
+                {0x4001: {value: 0x01, type: 0x18}}, boschManufacturer); // Setting defaults
+            await device.getEndpoint(12).write('manuSpecificBosch7',
+                {0x5005: {value: 0x01, type: 0x18}}, boschManufacturer); // Setting defaults
+            await device.getEndpoint(1).read('manuSpecificBosch', ['sensitivity'], boschManufacturer);
+            await device.getEndpoint(1).read('manuSpecificBosch5', ['pre_alarm'], boschManufacturer);
+            await device.getEndpoint(12).read('manuSpecificBosch7', ['heartbeat'], boschManufacturer);
+        },
+        exposes: [
+            e.smoke(), e.temperature(), e.humidity(), e.co2(), e.illuminance_lux(), e.battery(),
+            exposes.enum('alarm', ea.ALL, Object.keys(sirenState)).withDescription('Mode of the alarm (sound effect)'),
+            exposes.text('siren_state', ea.STATE).withDescription('Siren state'),
+            exposes.binary('self_test', ea.ALL, true, false).withDescription('Initiate self-test'),
+            exposes.enum('sensitivity', ea.ALL, Object.keys(smokeSensitivity)).withDescription('Sensitivity of the smoke alarm'),
+            exposes.enum('pre_alarm', ea.ALL, Object.keys(stateOffOn)).withDescription('Enable/disable pre-alarm'),
+            exposes.enum('heartbeat', ea.ALL, Object.keys(stateOffOn)).withDescription('Enable/disable heartbeat'),
+        ],
+    },
 ];
 
 module.exports = definition;

package/devices/centralite.js

@@ -212,7 +212,7 @@ module.exports = [
         vendor: 'Centralite',
         description: '3-Series pearl touch thermostat',
         fromZigbee: [fz.battery, fz.thermostat, fz.fan, fz.ignore_time_read],
-        toZigbee: [tz.factory_reset, tz.thermostat_local_temperature, tz.thermostat_local_temperature_calibration,
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_local_temperature_calibration,
             tz.thermostat_occupied_heating_setpoint, tz.thermostat_occupied_cooling_setpoint,
             tz.thermostat_setpoint_raise_lower, tz.thermostat_remote_sensing,
             tz.thermostat_control_sequence_of_operation, tz.thermostat_system_mode,
@@ -242,7 +242,7 @@ module.exports = [
         vendor: 'Centralite',
         description: 'HA thermostat',
         fromZigbee: [fz.battery, fzLocal.thermostat_3156105, fz.fan, fz.ignore_time_read],
-        toZigbee: [tz.factory_reset, tz.thermostat_local_temperature,
+        toZigbee: [tz.thermostat_local_temperature,
             tz.thermostat_occupied_heating_setpoint, tz.thermostat_occupied_cooling_setpoint,
             tz.thermostat_setpoint_raise_lower, tz.thermostat_remote_sensing,
             tz.thermostat_control_sequence_of_operation, tz.thermostat_system_mode,

package/devices/custom_devices_diy.js

@@ -437,7 +437,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: 'Flower sensor with rechargeable battery',
         fromZigbee: [fz.temperature, fz.illuminance, fz.soil_moisture, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
@@ -458,7 +458,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Plant Wattering Sensor, CR2450, CR2477 batteries, temperature ]',
         fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fz.soil_moisture, fz.battery, fzLocal.node_config],
-        toZigbee: [tz.factory_reset, tzLocal.node_config],
+        toZigbee: [tzLocal.node_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
             await reporting.bind(firstEndpoint, coordinatorEndpoint, [
@@ -482,7 +482,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: 'DIY outdoor long-range sensor for temperature, humidity and atmospheric pressure',
         fromZigbee: [fz.temperature, fz.humidity, fz.pressure, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
@@ -503,7 +503,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Plant wattering sensor with e-ink display](https://efektalab.com/epws102)',
         fromZigbee: [fz.temperature, fz.soil_moisture, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
             await reporting.bind(firstEndpoint, coordinatorEndpoint, ['genPowerCfg', 'msTemperatureMeasurement', 'msSoilMoisture']);
@@ -521,7 +521,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Temperature and humidity sensor with e-ink2.13](http://efektalab.com/eON213z)',
         fromZigbee: [fz.temperature, fz.humidity, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
@@ -540,7 +540,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Mini plant wattering sensor](http://efektalab.com/miniPWS)',
         fromZigbee: [fz.soil_moisture, fz.battery, fzLocal.node_config],
-        toZigbee: [tz.factory_reset, tzLocal.node_config],
+        toZigbee: [tzLocal.node_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
             await reporting.bind(firstEndpoint, coordinatorEndpoint, ['genPowerCfg', 'msSoilMoisture']);
@@ -555,7 +555,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Mini weather station, digital barometer, forecast, charts, temperature, humidity](http://efektalab.com/eON213wz)',
         fromZigbee: [fz.temperature, fz.humidity, fz.pressure, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
@@ -576,7 +576,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[DIY temperature, humidity and atmospheric pressure sensor, long battery life](http://efektalab.com/eON_THP)',
         fromZigbee: [fz.temperature, fz.humidity, fz.pressure, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
@@ -597,7 +597,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Plant watering sensor EFEKTA PWS max](http://efektalab.com/PWS_Max)',
         fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fz.soil_moisture, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
             await reporting.bind(firstEndpoint, coordinatorEndpoint, [
@@ -618,7 +618,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Plant watering sensor EFEKTA PWS Max Pro,  long battery life](http://efektalab.com/PWS_MaxPro)',
         fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fz.soil_moisture, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
             await reporting.bind(firstEndpoint, coordinatorEndpoint, [
@@ -639,7 +639,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Mini weather station, barometer, forecast, charts, temperature, humidity, light](http://efektalab.com/eON290wz)',
         fromZigbee: [fz.temperature, fz.humidity, fz.pressure, fz.illuminance, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
@@ -661,7 +661,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Plant Wattering Sensor with e-ink display 2.13](https://efektalab.com/eFlowerPro)',
         fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fz.soil_moisture, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
             await reporting.bind(firstEndpoint, coordinatorEndpoint, [
@@ -682,7 +682,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: '[Mini digital thermometer & hygrometer with e-ink1.02](http://efektalab.com/eTH102)',
         fromZigbee: [fz.temperature, fz.humidity, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [
@@ -702,7 +702,7 @@ module.exports = [
         description: '[CO2 Monitor with IPS TFT Display, outdoor temperature and humidity, date and time](http://efektalab.com/iAQ)',
         fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fzLocal.co2, fzLocal.co2_config,
             fzLocal.temperature_config, fzLocal.humidity_config],
-        toZigbee: [tz.factory_reset, tzLocal.co2_config, tzLocal.temperature_config, tzLocal.humidity_config, tzLocal.local_time],
+        toZigbee: [tzLocal.co2_config, tzLocal.temperature_config, tzLocal.humidity_config, tzLocal.local_time],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const clusters = ['msTemperatureMeasurement', 'msRelativeHumidity', 'msIlluminanceMeasurement', 'msCO2'];
@@ -762,7 +762,7 @@ module.exports = [
         description: '[EFEKTA CO2 Smart Monitor, ws2812b indicator, can control the relay, binding](https://efektalab.com/CO2_Monitor)',
         fromZigbee: [fz.temperature, fz.humidity, fzLocal.co2, fzLocal.co2_config, fzLocal.temperature_config,
             fzLocal.humidity_config, fzLocal.termostat_config, fzLocal.hydrostat_config, fzLocal.co2_gasstat_config],
-        toZigbee: [tz.factory_reset, tzLocal.co2_config, tzLocal.temperature_config, tzLocal.humidity_config,
+        toZigbee: [tzLocal.co2_config, tzLocal.temperature_config, tzLocal.humidity_config,
             tzLocal.termostat_config, tzLocal.hydrostat_config, tzLocal.co2_gasstat_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -813,7 +813,7 @@ module.exports = [
         vendor: 'Custom devices (DiY)',
         description: 'Alternative firmware for the SONOFF SNZB-02 sensor from EfektaLab, DIY',
         fromZigbee: [fz.temperature, fz.humidity, fz.battery, fzLocal.termostat_config, fzLocal.hydrostat_config, fzLocal.node_config],
-        toZigbee: [tz.factory_reset, tzLocal.termostat_config, tzLocal.hydrostat_config, tzLocal.node_config],
+        toZigbee: [tzLocal.termostat_config, tzLocal.hydrostat_config, tzLocal.node_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, [

package/devices/diyruz.js

@@ -73,7 +73,7 @@ module.exports = [
             }
             return features;
         })(20)),
-        toZigbee: [tz.diyruz_freepad_on_off_config, tz.factory_reset],
+        toZigbee: [tz.diyruz_freepad_on_off_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
@@ -116,7 +116,7 @@ module.exports = [
             }
             return features;
         })(8)),
-        toZigbee: [tz.diyruz_freepad_on_off_config, tz.factory_reset],
+        toZigbee: [tz.diyruz_freepad_on_off_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
@@ -157,7 +157,7 @@ module.exports = [
             exposes.numeric('sensors_count', ea.ALL).withDescription('Count of installed tubes').withValueMin(0).withValueMax(50),
             exposes.numeric('sensitivity', ea.ALL).withDescription('This is applicable if tubes type is set to other')
                 .withValueMin(0).withValueMax(100)],
-        toZigbee: [tz.diyruz_geiger_config, tz.factory_reset],
+        toZigbee: [tz.diyruz_geiger_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['msIlluminanceMeasurement', 'genOnOff']);
@@ -202,7 +202,7 @@ module.exports = [
         vendor: 'DIYRuZ',
         description: '[Flower sensor](http://modkam.ru/?p=1700)',
         fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fz.soil_moisture, fz.pressure, fz.battery],
-        toZigbee: [tz.factory_reset],
+        toZigbee: [],
         meta: {multiEndpoint: true},
         endpoint: (device) => {
             return {'bme': 1, 'ds': 2};
@@ -237,7 +237,7 @@ module.exports = [
         description: '[Air quality sensor](https://modkam.ru/?p=1715)',
         fromZigbee: [fz.temperature, fz.humidity, fz.co2, fz.pressure, fz.diyruz_airsense_config_co2,
             fz.diyruz_airsense_config_temp, fz.diyruz_airsense_config_pres, fz.diyruz_airsense_config_hum],
-        toZigbee: [tz.factory_reset, tz.diyruz_airsense_config],
+        toZigbee: [tz.diyruz_airsense_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const clusters = ['msTemperatureMeasurement', 'msRelativeHumidity', 'msPressureMeasurement', 'msCO2'];
@@ -269,7 +269,7 @@ module.exports = [
         vendor: 'DIYRuZ',
         description: '[Matrix intercom auto opener](https://diyruz.github.io/posts/zintercom/)',
         fromZigbee: [fz.battery, fz.diyruz_zintercom_config],
-        toZigbee: [tz.factory_reset, tz.diyruz_zintercom_config],
+        toZigbee: [tz.diyruz_zintercom_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
             await reporting.bind(firstEndpoint, coordinatorEndpoint, ['closuresDoorLock', 'genPowerCfg']);

package/devices/ecozy.js

@@ -12,7 +12,7 @@ module.exports = [
         vendor: 'eCozy',
         description: 'Smart heating thermostat',
         fromZigbee: [fz.battery, fz.legacy.thermostat_att_report],
-        toZigbee: [tz.factory_reset, tz.thermostat_local_temperature, tz.thermostat_local_temperature_calibration, tz.thermostat_occupancy,
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_local_temperature_calibration, tz.thermostat_occupancy,
             tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint, tz.thermostat_setpoint_raise_lower,
             tz.thermostat_remote_sensing, tz.thermostat_control_sequence_of_operation, tz.thermostat_system_mode,
             tz.thermostat_weekly_schedule, tz.thermostat_clear_weekly_schedule, tz.thermostat_relay_status_log,

package/devices/leviton.js

@@ -90,7 +90,7 @@ module.exports = [
         vendor: 'Leviton',
         description: 'Omnistat2 wireless thermostat',
         fromZigbee: [fz.legacy.thermostat_att_report, fz.fan],
-        toZigbee: [tz.factory_reset, tz.thermostat_local_temperature, tz.thermostat_local_temperature_calibration, tz.thermostat_occupancy,
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_local_temperature_calibration, tz.thermostat_occupancy,
             tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint, tz.thermostat_occupied_cooling_setpoint,
             tz.thermostat_unoccupied_cooling_setpoint, tz.thermostat_setpoint_raise_lower, tz.thermostat_remote_sensing,
             tz.thermostat_control_sequence_of_operation, tz.thermostat_system_mode, tz.thermostat_weekly_schedule,

package/devices/lidl.js

@@ -8,7 +8,6 @@ const ea = exposes.access;
 const tuya = require('../lib/tuya');
 const globalStore = require('../lib/store');
 const ota = require('../lib/ota');
-const utils = require('../lib/utils');
 
 const tuyaLocal = {
     dataPoints: {
@@ -543,11 +542,6 @@ module.exports = [
         vendor: 'Lidl',
         description: 'Livarno smart LED ceiling light',
         ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, colorTempRange: [153, 500]}),
-        toZigbee: utils.replaceInArray(
-            extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, colorTempRange: [153, 500]}).toZigbee,
-            [tz.light_color_colortemp],
-            [tz.light_color_and_colortemp_via_color],
-        ),
         meta: {applyRedFix: true, enhancedHue: false},
         configure: async (device, coordinatorEndpoint, logger) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});

package/devices/lux.js

@@ -10,7 +10,7 @@ module.exports = [
         vendor: 'LUX',
         description: 'KONOz thermostat',
         fromZigbee: [fz.battery, fz.thermostat, fz.fan, fz.thermostat_weekly_schedule],
-        toZigbee: [tz.factory_reset, tz.thermostat_local_temperature,
+        toZigbee: [tz.thermostat_local_temperature,
             tz.thermostat_occupancy, tz.thermostat_occupied_heating_setpoint, tz.thermostat_occupied_cooling_setpoint,
             tz.thermostat_unoccupied_heating_setpoint, tz.thermostat_setpoint_raise_lower, tz.thermostat_running_state,
             tz.fan_mode, tz.thermostat_system_mode,

package/devices/neo.js

@@ -35,7 +35,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_t1blo2bj'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_t1blo2bj'}, {modelID: 'TS0601', manufacturerName: '_TZE204_t1blo2bj'}],
         zigbeeModel: ['1blo2bj'],
         model: 'NAS-AB02B2',
         vendor: 'Neo',

package/devices/philips.js

@@ -1693,7 +1693,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color(),
     },
     {
-        zigbeeModel: ['1746430P7'],
+        zigbeeModel: ['1746430P7', '929003098701'],
         model: '1746430P7',
         vendor: 'Philips',
         description: 'Hue outdoor Resonate wall lamp (black)',
@@ -2271,6 +2271,13 @@ module.exports = [
         description: 'Hue White Fuzo outdoor floor light',
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['929003098901'],
+        model: '929003098901',
+        vendor: 'Philips',
+        description: 'Hue White Inara outdoor light',
+        extend: hueExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['1744530P7', '1744630P7', '1744430P7', '1744730P7'],
         model: '8718696170625',