zigbee-herdsman-converters 14.0.405 → 14.0.409

package/converters/fromZigbee.js

@@ -2522,8 +2522,8 @@ const converters = {
                 return {battpercentage: value};
             case tuya.dataPoints.neoAOMelody: // 0x21 [5] Melody
                 return {melody: value};
-            case tuya.dataPoints.neoAOVolume: // 0x5 [0]/[1]/[2] Volume 0-max, 2-low
-                return {volume: {2: 'low', 1: 'medium', 0: 'high'}[value]};
+            case tuya.dataPoints.neoAOVolume: // 0x5 [0]/[1]/[2] Volume 0-low, 2-max
+                return {volume: {0: 'low', 1: 'medium', 2: 'high'}[value]};
             default: // Unknown code
                 meta.logger.warn(`Unhandled DP #${dp}: ${JSON.stringify(msg.data)}`);
             }
@@ -3211,6 +3211,10 @@ const converters = {
                 result[postfixWithEndpointName('pi_heating_demand', msg, model)] =
                     precisionRound(msg.data['pIHeatingDemand'], 0);
             }
+            if (msg.data.hasOwnProperty('danfossWindowOpenFeatureEnable')) {
+                result[postfixWithEndpointName('window_open_feature', msg, model)] =
+                    (msg.data['danfossWindowOpenFeatureEnable'] === 1);
+            }
             if (msg.data.hasOwnProperty('danfossWindowOpenInternal')) {
                 result[postfixWithEndpointName('window_open_internal', msg, model)] =
                     constants.danfossWindowOpen.hasOwnProperty(msg.data['danfossWindowOpenInternal']) ?
@@ -8238,7 +8242,7 @@ const converters = {
         cluster: 'genOnOff',
         type: 'raw',
         convert: (model, msg, publish, options, meta) => {
-            if (hasAlreadyProcessedMessage(msg, msg.data[2])) return;
+            if (hasAlreadyProcessedMessage(msg, msg.data[1])) return;
             let action;
             if (msg.data[2] == 253) {
                 action = {0: 'single', 1: 'double', 2: 'hold'}[msg.data[3]];

package/converters/toZigbee.js

@@ -2417,12 +2417,6 @@ const converters = {
             await entity.read('genAnalogOutput', [0x0055]);
         },
     },
-    xiaomi_curtain_acn002_status: {
-        key: ['motor_state'],
-        convertGet: async (entity, key, meta) => {
-            await entity.read('genMultistateOutput', [0x0055]);
-        },
-    },
     ledvance_commands: {
         /* deprectated osram_*/
         key: ['set_transition', 'remember_state', 'osram_set_transition', 'osram_remember_state'],
@@ -2752,6 +2746,16 @@ const converters = {
             await entity.read('hvacThermostat', ['danfossTriggerTime'], manufacturerOptions.danfoss);
         },
     },
+    danfoss_window_open_feature: {
+        key: ['window_open_feature'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.write('hvacThermostat', {'danfossWindowOpenFeatureEnable': value}, manufacturerOptions.danfoss);
+            return {readAfterWriteTime: 200, state: {'window_open_feature': value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacThermostat', ['danfossWindowOpenFeatureEnable'], manufacturerOptions.danfoss);
+        },
+    },
     danfoss_window_open_internal: {
         key: ['window_open_internal'],
         convertGet: async (entity, key, meta) => {
@@ -6759,7 +6763,7 @@ const converters = {
                 await tuya.sendDataPoints(entity, [
                     tuya.dpValueFromEnum(tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white),
                     tuya.dpValueFromIntValue(tuya.dataPoints.dimmerLevel, newValue),
-                ], 'dataRequest', 1);
+                ], 'dataRequest');
 
                 return {state: (key == 'white_brightness') ? {white_brightness: value} : {brightness: value}};
             } else if (key == 'color_temp') {
@@ -6786,7 +6790,7 @@ const converters = {
                 await tuya.sendDataPoints(entity, [
                     tuya.dpValueFromEnum(tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white),
                     tuya.dpValueFromIntValue(tuya.dataPoints.silvercrestSetColorTemp, data),
-                ], 'dataRequest', 1);
+                ], 'dataRequest');
 
                 return {state: {color_temp: value}};
             } else if (key == 'color' || (separateWhite && (key == 'brightness'))) {
@@ -6865,13 +6869,7 @@ const converters = {
                     tuya.dpValueFromStringBuffer(tuya.dataPoints.silvercrestSetColor, data),
                 ];
 
-                if (separateWhite && meta.state.white_brightness != undefined) {
-                    // restore white state
-                    const newValue = utils.mapNumberRange(meta.state.white_brightness, 0, 255, 0, 1000);
-                    commands.push(tuya.dpValueFromEnum(tuya.dataPoints.silvercrestChangeMode, tuya.silvercrestModes.white));
-                    commands.push(tuya.dpValueFromIntValue(tuya.dataPoints.dimmerLevel, newValue));
-                }
-                await tuya.sendDataPoints(entity, commands, 'dataRequest', 1);
+                await tuya.sendDataPoints(entity, commands, 'dataRequest');
 
                 return {state: newState};
             }

package/devices/acova.js

@@ -3,33 +3,64 @@ const fz = require('../converters/fromZigbee');
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 
-module.exports = [{
-    zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00'],
-    model: 'PERCALE2',
-    vendor: 'Acova',
-    description: 'Percale 2 heater',
-    fromZigbee: [fz.thermostat, fz.hvac_user_interface],
-    toZigbee: [
-        tz.thermostat_local_temperature,
-        tz.thermostat_system_mode,
-        tz.thermostat_occupied_heating_setpoint,
-        tz.thermostat_unoccupied_heating_setpoint,
-        tz.thermostat_occupied_cooling_setpoint,
-        tz.thermostat_running_state,
-    ],
-    exposes: [
-        exposes.climate()
-            .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
-            .withLocalTemperature()
-            .withSystemMode(['off', 'heat', 'auto'])
-            .withRunningState(['idle', 'heat']),
-    ],
-    configure: async (device, coordinatorEndpoint, logger) => {
-        const endpoint = device.getEndpoint(1);
-        await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
-        await reporting.thermostatTemperature(endpoint);
-        await reporting.thermostatRunningState(endpoint);
-        await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
-        await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+module.exports = [
+    {
+        zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00'],
+        model: 'PERCALE2',
+        vendor: 'Acova',
+        description: 'Percale 2 heater',
+        fromZigbee: [fz.thermostat, fz.hvac_user_interface],
+        toZigbee: [
+            tz.thermostat_local_temperature,
+            tz.thermostat_system_mode,
+            tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_unoccupied_heating_setpoint,
+            tz.thermostat_occupied_cooling_setpoint,
+            tz.thermostat_running_state,
+        ],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'heat', 'auto'])
+                .withRunningState(['idle', 'heat']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
+            await reporting.thermostatTemperature(endpoint);
+            await reporting.thermostatRunningState(endpoint);
+            await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+            await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+        },
     },
-}];
+    {
+        zigbeeModel: ['ALCANTARA2 D1.00P1.02Z1.00\u0000\u0000\u0000\u0000\u0000\u0000'],
+        model: 'ALCANTARA2',
+        vendor: 'Acova',
+        description: 'Alcantara 2 heater',
+        fromZigbee: [fz.thermostat, fz.hvac_user_interface],
+        toZigbee: [
+            tz.thermostat_local_temperature,
+            tz.thermostat_system_mode,
+            tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_unoccupied_heating_setpoint,
+            tz.thermostat_running_state,
+        ],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'heat', 'auto'])
+                .withRunningState(['idle', 'heat']),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
+            await reporting.thermostatTemperature(endpoint);
+            await reporting.thermostatRunningState(endpoint);
+            await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+            await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+        },
+    },
+];

package/devices/danfoss.js

@@ -22,7 +22,8 @@ module.exports = [
             tz.danfoss_window_open_internal, tz.danfoss_window_open_external, tz.danfoss_load_estimate,
             tz.danfoss_viewing_direction, tz.danfoss_external_measured_room_sensor, tz.danfoss_radiator_covered,
             tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.danfoss_load_balancing_enable, tz.danfoss_load_room_mean,
-            tz.thermostat_weekly_schedule, tz.thermostat_clear_weekly_schedule, tz.thermostat_programming_operation_mode],
+            tz.thermostat_weekly_schedule, tz.thermostat_clear_weekly_schedule, tz.thermostat_programming_operation_mode,
+            tz.danfoss_window_open_feature],
         exposes: [e.battery(), e.keypad_lockout(), e.programming_operation_mode(),
             exposes.binary('mounted_mode_active', ea.STATE_GET, true, false)
                 .withDescription('Is the unit in mounting mode. This is set to `false` for mounted (already on ' +
@@ -53,6 +54,8 @@ module.exports = [
             exposes.binary('radiator_covered', ea.ALL, true, false)
                 .withDescription('Set if the TRV should solely rely on external_measured_room_sensor or operate in offset mode. ' +
                     '`false` = Auto Offset Mode or `true` = Room Sensor Mode'),
+            exposes.binary('window_open_feature', ea.ALL, true, false)
+                .withDescription('Whether or not the window open feature is enabled'),
             exposes.numeric('window_open_internal', ea.STATE_GET).withValueMin(0).withValueMax(4)
                 .withDescription('0=Quarantine, 1=Windows are closed, 2=Hold - Windows are maybe about to open, ' +
                     '3=Open window detected, 4=In window open state from external but detected closed locally'),
@@ -114,6 +117,7 @@ module.exports = [
             }], options);
 
             await endpoint.read('hvacThermostat', [
+                'danfossWindowOpenFeatureEnable',
                 'danfossWindowOpenExternal',
                 'danfossDayOfWeek',
                 'danfossTriggerTime',

package/devices/gledopto.js

@@ -62,6 +62,12 @@ const gledoptoExtend = {
     }),
 };
 
+const configureReadModelID = async (device, coordinatorEndpoint, logger) => {
+    // https://github.com/Koenkk/zigbee-herdsman-converters/issues/3016#issuecomment-1027726604
+    const endpoint = device.endpoints[0];
+    await endpoint.read('genBasic', ['modelId']);
+};
+
 module.exports = [
     {
         fingerprint: [
@@ -117,6 +123,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller WW/CW (pro)',
         extend: gledoptoExtend.light_onoff_brightness_colortemp(),
+        configure: configureReadModelID,
     },
     {
         fingerprint: [
@@ -180,6 +187,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller RGBW (pro)',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
+        configure: configureReadModelID,
     },
     {
         fingerprint: [
@@ -238,6 +246,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller RGB (pro)',
         extend: gledoptoExtend.light_onoff_brightness_color(),
+        configure: configureReadModelID,
     },
     {
         zigbeeModel: ['GL-C-008P'],
@@ -247,6 +256,7 @@ module.exports = [
         description: 'Zigbee LED Controller RGB+CCT (pro)',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
         meta: {disableDefaultResponse: true},
+        configure: configureReadModelID,
     },
     {
         zigbeeModel: ['GL-C-009'],
@@ -268,6 +278,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
         description: 'Zigbee LED Controller W (pro)',
         extend: gledoptoExtend.light_onoff_brightness(),
+        configure: configureReadModelID,
     },
     {
         zigbeeModel: ['GL-C-009S'],

package/devices/kwikset.js

@@ -36,7 +36,7 @@ module.exports = [
         exposes: [e.lock(), e.battery()],
     },
     {
-        zigbeeModel: ['SMARTCODE_DEADBOLT_10_W3'],
+        zigbeeModel: ['SMARTCODE_DEADBOLT_10_W3', 'SMARTCODE_DEADBOLT_10T_W3'],
         model: '99140-031',
         vendor: 'Kwikset',
         description: 'SmartCode traditional electronic deadbolt',

package/devices/legrand.js

@@ -6,6 +6,7 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
 const ota = require('../lib/ota');
+const utils = require('../lib/utils');
 
 const readInitialBatteryState = async (type, data, device) => {
     if (['deviceAnnounce'].includes(type)) {
@@ -20,7 +21,9 @@ const fzLocal = {
         cluster: 'genOnOff',
         type: 'commandOff',
         convert: (model, msg, publish, options, meta) => {
-            return {action: 'off'};
+            const payload = {action: utils.postfixWithEndpointName('off', msg, model)};
+            utils.addActionGroup(payload, msg, model);
+            return payload;
         },
     },
 };

package/devices/m/303/274ller_licht.js

@@ -87,6 +87,14 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color(),
         toZigbee: extend.light_onoff_brightness_colortemp_color().toZigbee.concat([tz.tint_scene]),
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_mntza0sw'}],
+        model: '404062',
+        vendor: 'Müller Licht',
+        description: 'Kea RGB+CCT',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        toZigbee: extend.light_onoff_brightness_colortemp_color().toZigbee.concat([tz.tint_scene]),
+    },
     {
         zigbeeModel: ['ZBT-Remote-ALL-RGBW'],
         model: 'MLI-404011',

package/devices/orvibo.js

@@ -292,4 +292,182 @@ module.exports = [
         },
         exposes: [e.cover_position(), e.battery()],
     },
+    {
+        zigbeeModel: ['2ae011fb6d0542f58705d6861064eb5f'],
+        model: 'T40W1Z',
+        vendor: 'ORVIBO',
+        description: 'MixSwitch 1 gang',
+        extend: extend.switch(),
+        exposes: [e.switch()],
+
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+    {
+        zigbeeModel: ['2e13af8e17434961be98f055d68c2166'],
+        model: 'T40W2Z',
+        vendor: 'ORVIBO',
+        description: 'MixSwitch 2 gangs',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right')],
+        endpoint: (device) => {
+            return {'left': 1, 'right': 2};
+        },
+        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);
+        },
+    },
+    {
+        zigbeeModel: ['e8d667cb184b4a2880dd886c23d00976'],
+        model: 'T40W3Z',
+        vendor: 'ORVIBO',
+        description: 'MixSwitch 3 gangs',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('center'), e.switch().withEndpoint('right')],
+        endpoint: (device) => {
+            return {'left': 1, 'center': 2, 'right': 3};
+        },
+        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);
+            const endpoint3 = device.getEndpoint(3);
+            await reporting.bind(endpoint3, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint3);
+        },
+    },
+    {
+        zigbeeModel: ['20513b10079f4cc68cffb8b0dc6d3277'],
+        model: 'T40W4Z',
+        vendor: 'ORVIBO',
+        description: 'MixSwitch 4 gangs',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.switch().withEndpoint('l3'),
+            e.switch().withEndpoint('l4'), e.switch().withEndpoint('l5'), e.switch().withEndpoint('l6')],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4, 'l5': 5, 'l6': 6};
+        },
+        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);
+            const endpoint3 = device.getEndpoint(3);
+            await reporting.bind(endpoint3, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint3);
+            const endpoint4 = device.getEndpoint(4);
+            await reporting.bind(endpoint4, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint4);
+            const endpoint5 = device.getEndpoint(5);
+            await reporting.bind(endpoint5, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint5);
+            const endpoint6 = device.getEndpoint(6);
+            await reporting.bind(endpoint6, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint6);
+        },
+    },
+    {
+        zigbeeModel: ['bcb949e87e8c4ea6bc2803052dd8fbf5'],
+        model: 'T40S6Z',
+        vendor: 'ORVIBO',
+        description: 'MixSwitch 6 gangs',
+        fromZigbee: [fz.orvibo_raw_2],
+        toZigbee: [],
+        exposes: [e.action(['button_1_click', 'button_2_click', 'button_3_click', 'button_4_click', 'button_5_click', 'button_6_click'])],
+    },
+    {
+        zigbeeModel: ['ba8120ad03f744ecb6a973672369e80d'],
+        model: 'T41W1Z',
+        vendor: 'ORVIBO',
+        description: 'MixSwitch 1 gang (without neutral wire)',
+        extend: extend.switch(),
+        exposes: [e.switch()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+    {
+        zigbeeModel: ['7c8f476a0f764cd4b994bc73d07c906d'],
+        model: 'T41W2Z',
+        vendor: 'ORVIBO',
+        description: 'MixSwitch 2 gang (without neutral wire)',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right')],
+        endpoint: (device) => {
+            return {'left': 1, 'right': 2};
+        },
+        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);
+        },
+    },
+    {
+        zigbeeModel: ['cb7ce9fe2cb147e69c5ea700b39b3d5b'],
+        model: 'DM10ZW',
+        vendor: 'ORVIBO',
+        description: '0-10v dimmer',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 371]}),
+    },
+    {
+        zigbeeModel: ['1a20628504bf48c88ed698fe96b7867c'],
+        model: 'DTZ09039',
+        vendor: 'ORVIBO',
+        description: 'Downlight (Q series)',
+        extend: extend.light_onoff_brightness(),
+    },
+    {
+        zigbeeModel: ['bbfed49c738948b989911f9f9f73d759'],
+        model: 'R30W3Z',
+        vendor: 'ORVIBO',
+        description: 'In-wall switch 3 gang',
+        extend: extend.switch(),
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('center'), e.switch().withEndpoint('right')],
+        endpoint: (device) => {
+            return {'left': 1, 'center': 2, 'right': 3};
+        },
+        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);
+            const endpoint3 = device.getEndpoint(3);
+            await reporting.bind(endpoint3, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint3);
+        },
+    },
+    {
+        zigbeeModel: ['0e93fa9c36bb417a90ad5d8a184b683a'],
+        model: 'SM20',
+        vendor: 'ORVIBO',
+        description: 'Door or window contact switch',
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery],
+        toZigbee: [],
+        exposes: [e.contact(), e.battery_low(), e.tamper(), e.battery()],
+    },
 ];

package/devices/philips.js

@@ -1613,7 +1613,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['4080248U9'],
+        zigbeeModel: ['4080248U9', '915005987201'],
         model: '4080248U9',
         vendor: 'Philips',
         description: 'Hue White and color ambiance Signe floor light',

package/devices/shinasystem.js

@@ -341,4 +341,25 @@ module.exports = [
             }]);
         },
     },
+    {
+        zigbeeModel: ['DLM-300Z'],
+        model: 'DLM-300Z',
+        vendor: 'ShinaSystem',
+        description: 'Sihas door lock',
+        fromZigbee: [fz.lock, fz.battery, fz.lock_operation_event, fz.lock_programming_event, fz.lock_pin_code_response],
+        toZigbee: [tz.lock, tz.pincode_lock],
+        meta: {pinCodeCount: 4},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['closuresDoorLock', 'genPowerCfg']);
+            await reporting.lockState(endpoint, {min: 0, max: 3600, change: 0});
+            await reporting.batteryPercentageRemaining(endpoint, {min: 600, max: 21600, change: 1});
+            await reporting.doorState(endpoint);
+        },
+        exposes: [e.battery(), e.lock(), exposes.enum('door_state', ea.STATE, ['open', 'closed']).withDescription('Door status'),
+            exposes.composite('pin_code', 'pin_code')
+                .withFeature(exposes.numeric('user', ea.SET).withDescription('User ID can only number 1'))
+                .withFeature(exposes.numeric('pin_code', ea.SET).withDescription('Pincode to set, set pincode(4 digit) to null to clear')),
+        ],
+    },
 ];

package/devices/sinope.js

@@ -331,4 +331,36 @@ module.exports = [
         },
         exposes: [e.water_leak(), e.battery_low(), e.temperature(), e.battery()],
     },
+    {
+        zigbeeModel: ['VA4200WZ'],
+        model: 'VA4200WZ',
+        vendor: 'Sinopé',
+        description: 'Zigbee smart water valve (3/4")',
+        fromZigbee: [fz.cover_position_via_brightness, fz.cover_state_via_onoff, fz.battery],
+        toZigbee: [tz.cover_via_brightness],
+        configure: async (device, coordinatorEndpoint) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint); // valve position
+        },
+        exposes: [e.valve_switch(), e.valve_position(), e.battery_low(), e.battery()],
+    },
+    {
+        zigbeeModel: ['VA4201WZ'],
+        model: 'VA4201WZ',
+        vendor: 'Sinopé',
+        description: 'Zigbee smart water valve (1")',
+        fromZigbee: [fz.cover_position_via_brightness, fz.cover_state_via_onoff, fz.battery],
+        toZigbee: [tz.cover_via_brightness],
+        configure: async (device, coordinatorEndpoint) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint); // valve position
+        },
+        exposes: [e.valve_switch(), e.valve_position(), e.battery_low(), e.battery()],
+    },
 ];

package/devices/stelpro.js

@@ -103,6 +103,36 @@ module.exports = [
                 reportableChange: 1}]);
         },
     },
+    {
+        zigbeeModel: ['SORB'],
+        model: 'SORB',
+        vendor: 'Stelpro',
+        description: 'ORLÉANS fan heater',
+        fromZigbee: [fz.stelpro_thermostat, fz.hvac_user_interface],
+        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state],
+        exposes: [e.local_temperature(), e.keypad_lockout(),
+            exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5).withLocalTemperature()
+                .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat'])],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(25);
+            const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+
+            // Those exact parameters (min/max/change) are required for reporting to work with Stelpro SORB
+            await reporting.thermostatTemperature(endpoint);
+            await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+            await reporting.thermostatSystemMode(endpoint);
+            await reporting.thermostatPIHeatingDemand(endpoint);
+            await reporting.thermostatKeypadLockMode(endpoint);
+            // cluster 0x0201 attribute 0x401c
+            await endpoint.configureReporting('hvacThermostat', [{
+                attribute: 'StelproSystemMode',
+                minimumReportInterval: constants.repInterval.MINUTE,
+                maximumReportInterval: constants.repInterval.HOUR,
+                reportableChange: 1}]);
+        },
+    },
     {
         zigbeeModel: ['SMT402AD'],
         model: 'SMT402AD',

package/devices/tplink.js

@@ -23,4 +23,20 @@ module.exports = [
             device.save();
         },
     },
+    {
+        zigbeeModel: ['CS100'],
+        model: 'CS100',
+        vendor: 'TP-Link',
+        description: 'Contact sensor',
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery],
+        toZigbee: [],
+        exposes: [e.contact(), e.battery_low(), e.battery()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            device.powerSource = 'Battery';
+            device.save();
+        },
+    },
 ];