zigbee-herdsman-converters 15.0.20 → 15.0.22

package/converters/fromZigbee.js

@@ -30,8 +30,10 @@ const converters = {
         cluster: 'hvacFanCtrl',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
-            const key = getKey(constants.fanMode, msg.data.fanMode);
-            return {fan_mode: key, fan_state: key === 'off' ? 'OFF' : 'ON'};
+            if (msg.data.hasOwnProperty('fanMode')) {
+                const key = getKey(constants.fanMode, msg.data.fanMode);
+                return {fan_mode: key, fan_state: key === 'off' ? 'OFF' : 'ON'};
+            }
         },
     },
     thermostat: {
@@ -978,9 +980,9 @@ const converters = {
     },
     ias_smoke_alarm_1: {
         cluster: 'ssIasZone',
-        type: 'commandStatusChangeNotification',
+        type: ['commandStatusChangeNotification', 'attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
-            const zoneStatus = msg.data.zonestatus;
+            const zoneStatus = msg.type === 'commandStatusChangeNotification' ? msg.data.zonestatus : msg.data.zoneStatus;
             return {
                 smoke: (zoneStatus & 1) > 0,
                 tamper: (zoneStatus & 1<<2) > 0,
@@ -990,6 +992,7 @@ const converters = {
                 trouble: (zoneStatus & 1<<6) > 0,
                 ac_status: (zoneStatus & 1<<7) > 0,
                 test: (zoneStatus & 1<<8) > 0,
+                battery_defect: (zoneStatus & 1<<9) > 0,
             };
         },
     },
@@ -4018,7 +4021,7 @@ const converters = {
                 return {deadzone_temperature: value};
             case tuya.dataPoints.moesLocalTemp:
                 temperature = value & 1<<15 ? value - (1<<16) + 1 : value;
-                if (!['_TZE200_ztvwu4nk', '_TZE200_ye5jkfsb'].includes(meta.device.manufacturerName)) {
+                if (!['_TZE200_ztvwu4nk', '_TZE200_ye5jkfsb', '_TZE200_5toc8efa'].includes(meta.device.manufacturerName)) {
                     // https://github.com/Koenkk/zigbee2mqtt/issues/11980
                     temperature = temperature / 10;
                 }
@@ -8312,6 +8315,15 @@ const converters = {
             return result;
         },
     },
+    hw_version: {
+        cluster: 'genBasic',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty('hwVersion')) result['hw_version'] = msg.data.hwVersion;
+            return result;
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).

package/devices/awox.js

@@ -151,6 +151,13 @@ module.exports = [
                     {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361], outputClusters: [65360, 65361]},
                 ],
             },
+            {
+                type: 'Router', manufacturerName: 'AwoX', modelID: 'TLSR82xx', endpoints: [
+                    {ID: 1, profileID: 260, deviceID: 268, inputClusters: [0, 3, 4, 5, 6, 8, 768, 4096, 64599, 10], outputClusters: [6]},
+                    {ID: 242, profileID: 41440, deviceID: 97, inputClusters: [], outputClusters: [33]},
+                    {ID: 3, profileID: 4751, deviceID: 268, inputClusters: [65360, 65361, 4], outputClusters: [65360, 65361]},
+                ],
+            },
         ],
         model: '33957',
         vendor: 'AwoX',

package/devices/bosch.js

@@ -508,6 +508,26 @@ const definition = [
             exposes.enum('heartbeat', ea.ALL, Object.keys(stateOffOn)).withDescription('Enable/disable heartbeat'),
         ],
     },
+    {
+        zigbeeModel: ['RBSH-SP-ZB-EU'],
+        model: 'BSP-FZ2',
+        vendor: 'Bosch',
+        description: 'Plug compact EU',
+        fromZigbee: [fz.on_off, fz.power_on_behavior, fz.electrical_measurement, fz.metering],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genOnOff', ['onOff', 'startUpOnOff']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint, {change: [0, 1]});
+            await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement']);
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+            await reporting.activePower(endpoint);
+        },
+        exposes: [e.switch(), e.power_on_behavior(), e.power(), e.energy()],
+    },
 ];
 
 module.exports = definition;

package/devices/datek.js

@@ -10,12 +10,12 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        zigbeeModel: ['PoP'],
+        fingerprint: [{modelID: 'PoP', manufacturerName: 'Eva'}],
         model: 'HLU2909K',
         vendor: 'Datek',
         description: 'APEX smart plug 16A',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.temperature],
-        toZigbee: [tz.on_off],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'msTemperatureMeasurement']);
@@ -28,24 +28,26 @@ module.exports = [
             await reporting.activePower(endpoint);
             await reporting.temperature(endpoint);
         },
-        exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.temperature()],
+        exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.temperature(), e.power_on_behavior()],
     },
     {
-        zigbeeModel: ['Meter Reader'],
+        fingerprint: [{modelID: 'Meter Reader', manufacturerName: 'Eva'}],
         model: 'HSE2905E',
         vendor: 'Datek',
         description: 'Datek Eva AMS HAN power-meter sensor',
-        fromZigbee: [fz.metering_datek, fz.electrical_measurement, fz.temperature],
+        fromZigbee: [fz.metering_datek, fz.electrical_measurement, fz.temperature, fz.hw_version],
         toZigbee: [],
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement', 'seMetering', 'msTemperatureMeasurement']);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.readMeteringMultiplierDivisor(endpoint);
             try {
-                await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            } catch (error) {
-                /* fails for some: https://github.com/Koenkk/zigbee2mqtt/issues/11867 */
+                // hwVersion < 2 do not support hwVersion attribute, so we are testing if this is hwVersion 1 or 2
+                await endpoint.read('genBasic', ['hwVersion']);
+            } catch (e) {
+                e;
             }
             const payload = [{
                 attribute: 'rmsVoltagePhB',
@@ -78,8 +80,6 @@ module.exports = [
             await reporting.currentSummDelivered(endpoint, {min: 60, max: 3600, change: [1, 1]});
             await reporting.currentSummReceived(endpoint);
             await reporting.temperature(endpoint, {min: 60, max: 3600, change: 0});
-            device.powerSource = 'DC source';
-            device.save();
         },
         exposes: [e.power(), e.energy(), e.current(), e.voltage(), e.current_phase_b(), e.voltage_phase_b(), e.current_phase_c(),
             e.voltage_phase_c(), e.temperature()],
@@ -113,7 +113,7 @@ module.exports = [
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('seconds').withValueMin(0).withValueMax(65535)],
     },
     {
-        zigbeeModel: ['ID Lock 150'],
+        fingerprint: [{modelID: 'ID Lock 150', manufacturerName: 'Eva'}],
         model: '0402946',
         vendor: 'Datek',
         description: 'Zigbee module for ID lock 150',
@@ -187,7 +187,7 @@ module.exports = [
                 'random_pin_24_hours']).withDescription('Service Mode of the Lock')],
     },
     {
-        zigbeeModel: ['Water Sensor'],
+        fingerprint: [{modelID: 'Water Sensor', manufacturerName: 'Eva'}],
         model: 'HSE2919E',
         vendor: 'Datek',
         description: 'Eva water leak sensor',
@@ -228,6 +228,7 @@ module.exports = [
                 'brightness_move_down', 'brightness_move_up', 'brightness_stop'])],
     },
     {
+        fingerprint: [{modelID: 'Door/Window Sensor', manufacturerName: 'Eva'}],
         zigbeeModel: ['Door/Window Sensor'],
         model: 'HSE2920E',
         vendor: 'Datek',

package/devices/essentialb.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['EB-E14-P45-RGBW'],
+        model: 'EB-E14-P45-RGBW',
+        vendor: 'EssentielB',
+        description: 'Smart LED bulb',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+    },
+];

package/devices/hgkg.js

@@ -42,7 +42,7 @@ module.exports = [
                 .withPreset(['hold', 'program'])
                 .withFanMode(['off', 'low', 'medium', 'high', 'auto'], ea.STATE_SET),
             e.temperature_sensor_select(['IN', 'AL', 'OU']),
-            exposes.composite('programming_mode')
+            exposes.composite('programming_mode', 'programming_mode', ea.STATE)
                 .withDescription(
                     'Schedule MODE ⏱ - In this mode, the device executes a preset week programming temperature time and temperature.',
                 )

package/devices/iluminize.js

@@ -162,7 +162,7 @@ module.exports = [
         exposes: [e.battery(), e.action([
             'color_move', 'color_temperature_move', 'hue_move', 'hue_stop', 'brightness_step_up', 'brightness_step_down',
             'recall_*', 'on', 'off']),
-        exposes.composite('action_color', 'action_color')
+        exposes.composite('action_color', 'action_color', ea.STATE)
             .withFeature(exposes.numeric('x', ea.STATE))
             .withFeature(exposes.numeric('y', ea.STATE))
             .withDescription('Only shows the transmitted color in X7Y-Mode. Noch changes possible.'),

package/devices/inovelli.js

@@ -1077,10 +1077,10 @@ const exposesList = [
     e.power(),
     e.energy(),
     exposes
-        .composite('led_effect', 'led_effect')
+        .composite('led_effect', 'led_effect', ea.STATE_SET)
         .withFeature(
             exposes
-                .enum('effect', ea.SET_STATE, [
+                .enum('effect', ea.STATE_SET, [
                     'off',
                     'solid',
                     'fast_blink',
@@ -1107,7 +1107,7 @@ const exposesList = [
         )
         .withFeature(
             exposes
-                .numeric('color', ea.SET_STATE)
+                .numeric('color', ea.STATE_SET)
                 .withValueMin(0)
                 .withValueMax(255)
                 .withDescription(
@@ -1116,14 +1116,14 @@ const exposesList = [
         )
         .withFeature(
             exposes
-                .numeric('level', ea.SET_STATE)
+                .numeric('level', ea.STATE_SET)
                 .withValueMin(0)
                 .withValueMax(100)
                 .withDescription('Brightness of the LEDs'),
         )
         .withFeature(
             exposes
-                .numeric('duration', ea.SET_STATE)
+                .numeric('duration', ea.STATE_SET)
                 .withValueMin(0)
                 .withValueMax(255)
                 .withDescription(
@@ -1133,15 +1133,15 @@ const exposesList = [
                 ),
         ),
     exposes
-        .composite('individual_led_effect', 'individual_led_effect')
+        .composite('individual_led_effect', 'individual_led_effect', ea.STATE_SET)
         .withFeature(
             exposes
-                .enum('led', ea.SET_STATE, ['1', '2', '3', '4', '5', '6', '7'])
+                .enum('led', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7'])
                 .withDescription('Individual LED to target.'),
         )
         .withFeature(
             exposes
-                .enum('effect', ea.SET_STATE, [
+                .enum('effect', ea.STATE_SET, [
                     'off',
                     'solid',
                     'fast_blink',
@@ -1157,7 +1157,7 @@ const exposesList = [
         )
         .withFeature(
             exposes
-                .numeric('color', ea.SET_STATE)
+                .numeric('color', ea.STATE_SET)
                 .withValueMin(0)
                 .withValueMax(255)
                 .withDescription(
@@ -1166,14 +1166,14 @@ const exposesList = [
         )
         .withFeature(
             exposes
-                .numeric('level', ea.SET_STATE)
+                .numeric('level', ea.STATE_SET)
                 .withValueMin(0)
                 .withValueMax(100)
                 .withDescription('Brightness of the LED'),
         )
         .withFeature(
             exposes
-                .numeric('duration', ea.SET_STATE)
+                .numeric('duration', ea.STATE_SET)
                 .withValueMin(0)
                 .withValueMax(255)
                 .withDescription(

package/devices/lidl.js

@@ -409,14 +409,15 @@ module.exports = [
         model: 'HG08164',
         vendor: 'Lidl',
         description: 'Silvercrest smart button',
-        fromZigbee: [fz.command_on, fz.command_off, fz.command_step, fz.command_stop, fz.battery],
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_step, fz.command_stop, fz.battery, fz.tuya_on_off_action],
         toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
             await reporting.batteryPercentageRemaining(endpoint);
         },
-        exposes: [e.action(['on', 'off', 'brightness_stop', 'brightness_step_up', 'brightness_step_down']), e.battery()],
+        exposes: [e.action(
+            ['on', 'off', 'brightness_stop', 'brightness_step_up', 'brightness_step_down', 'single', 'double']), e.battery()],
     },
     {
         fingerprint: [{modelID: 'TS0211', manufacturerName: '_TZ1800_ladpngdx'}],
@@ -523,7 +524,7 @@ module.exports = [
         description: 'Melinera smart LED string lights',
         toZigbee: [tz.on_off, tz.silvercrest_smart_led_string],
         fromZigbee: [fz.on_off, fz.silvercrest_smart_led_string],
-        exposes: [e.light_brightness_colorhs().setAccess('brightness', ea.STATE_SET)],
+        exposes: [e.light_brightness_colorhs().setAccess('brightness', ea.STATE_SET).setAccess('color_hs', ea.STATE_SET)],
     },
     {
         fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_odygigth'}],
@@ -873,7 +874,8 @@ module.exports = [
             exposes.binary('binary_one', ea.STATE_SET, 'ON', 'OFF').withDescription('Unknown binary one'),
             exposes.binary('binary_two', ea.STATE_SET, 'ON', 'OFF').withDescription('Unknown binary two'),
             exposes.binary('away_mode', ea.STATE, 'ON', 'OFF').withDescription('Away mode'),
-            exposes.composite('away_setting', 'away_setting').withFeature(e.away_preset_days()).setAccess('away_preset_days', ea.ALL)
+            exposes.composite('away_setting', 'away_setting', ea.STATE_SET)
+                .withFeature(e.away_preset_days()).setAccess('away_preset_days', ea.ALL)
                 .withFeature(e.away_preset_temperature()).setAccess('away_preset_temperature', ea.ALL)
                 .withFeature(exposes.numeric('away_preset_year', ea.ALL).withUnit('year').withDescription('Start away year 20xx'))
                 .withFeature(exposes.numeric('away_preset_month', ea.ALL).withUnit('month').withDescription('Start away month'))
@@ -881,7 +883,7 @@ module.exports = [
                 .withFeature(exposes.numeric('away_preset_hour', ea.ALL).withUnit('hour').withDescription('Start away hours'))
                 .withFeature(exposes.numeric('away_preset_minute', ea.ALL).withUnit('min').withDescription('Start away minutes')),
             ...['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'].map((day) => {
-                const expose = exposes.composite(day, day);
+                const expose = exposes.composite(day, day, ea.STATE_SET);
                 [1, 2, 3, 4, 5, 6, 7, 8, 9].forEach((i) => {
                     expose.withFeature(exposes.numeric(`${day}_temp_${i}`, ea.ALL).withValueMin(0.5)
                         .withValueMax(29.5).withValueStep(0.5).withUnit('°C').withDescription(`Temperature ${i}`));

package/devices/livolo.js

@@ -205,7 +205,7 @@ module.exports = [
         toZigbee: [tz.livolo_cover_state, tz.livolo_cover_position, tz.livolo_cover_options],
         exposes: [
             e.cover_position().setAccess('position', ea.STATE_SET),
-            exposes.composite('options', 'options')
+            exposes.composite('options', 'options', ea.STATE_SET)
                 .withDescription('Motor options')
                 .withFeature(exposes.numeric('motor_speed', ea.STATE_SET)
                     .withValueMin(20)

package/devices/miboxer.js

@@ -46,7 +46,7 @@ module.exports = [
         model: 'FUT036Z',
         description: 'Single color LED controller',
         vendor: 'Miboxer',
-        extend: extend.light_onoff_brightness(),
+        extend: extend.light_onoff_brightness({disablePowerOnBehavior: true}),
         onEvent: tuya.onEventSetTime,
     },
     {

package/devices/moes.js

@@ -114,7 +114,7 @@ module.exports = [
                 .withSystemMode(['off', 'heat'], ea.STATE_SET).withRunningState(['idle', 'heat', 'cool'], ea.STATE)
                 .withPreset(['hold', 'program']),
             e.temperature_sensor_select(['IN', 'AL', 'OU']),
-            exposes.composite('program', 'program').withDescription('Time of day and setpoint to use when in program mode')
+            exposes.composite('program', 'program', ea.STATE_SET).withDescription('Time of day and setpoint to use when in program mode')
                 .withFeature(exposesLocal.hour('weekdays_p1_hour'))
                 .withFeature(exposesLocal.minute('weekdays_p1_minute'))
                 .withFeature(exposesLocal.program_temperature('weekdays_p1_temperature'))
@@ -308,9 +308,9 @@ module.exports = [
                 'You can set up to 4 stages of temperature every for WEEKDAY ➀➁➂➃➄,  SATURDAY ➅ and SUNDAY ➆.'),
             exposes.binary('boost_heating', ea.STATE_SET, 'ON', 'OFF').withDescription('Boost Heating: press and hold "+" for 3 seconds, ' +
                 'the device will enter the boost heating mode, and the ▷╵◁ will flash. The countdown will be displayed in the APP'),
-            exposes.numeric('boost_heating_countdown', ea.STATE).withUnit('Min').withDescription('Countdown in minutes')
+            exposes.numeric('boost_heating_countdown', ea.STATE).withUnit('minutes').withDescription('Countdown in minutes')
                 .withValueMin(0).withValueMax(15),
-            exposes.numeric('boost_heating_countdown_time_set', ea.STATE_SET).withUnit('second')
+            exposes.numeric('boost_heating_countdown_time_set', ea.STATE_SET).withUnit('seconds')
                 .withDescription('Boost Time Setting 100 sec - 900 sec, (default = 300 sec)').withValueMin(100)
                 .withValueMax(900).withValueStep(100)],
     },

package/devices/namron.js

@@ -734,4 +734,25 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
         meta: {turnsOffAtBrightness1: true},
     },
+    {
+        zigbeeModel: ['4512749'],
+        model: '4512749',
+        vendor: 'Namron',
+        description: 'Thermostat outlet socket',
+        fromZigbee: [fz.metering, fz.electrical_measurement, fz.on_off, fz.temperature],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        exposes: [e.temperature(), e.power(), e.current(), e.voltage(), e.switch(), e.power_on_behavior()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'msTemperatureMeasurement']);
+            await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor']);
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+            await endpoint.read('haElectricalMeasurement', ['acCurrentMultiplier', 'acCurrentDivisor']);
+            await reporting.onOff(endpoint);
+            await reporting.temperature(endpoint);
+            await reporting.rmsVoltage(endpoint);
+            await reporting.rmsCurrent(endpoint);
+            await reporting.activePower(endpoint);
+        },
+    },
 ];

package/devices/nodon.js

@@ -51,6 +51,21 @@ module.exports = [
             return {default: 1};
         },
     },
+    {
+        zigbeeModel: ['SIN-4-1-20_PRO'],
+        model: 'SIN-4-1-20_PRO',
+        vendor: 'NodOn',
+        description: 'Single LED relay',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep = device.getEndpoint(1);
+            await reporting.bind(ep, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(ep);
+        },
+        endpoint: (device) => {
+            return {default: 1};
+        },
+    },
     {
         zigbeeModel: ['SIN-4-2-20'],
         model: 'SIN-4-2-20',
@@ -71,4 +86,24 @@ module.exports = [
             await reporting.onOff(ep2);
         },
     },
+    {
+        zigbeeModel: ['SIN-4-2-20_PRO'],
+        model: 'SIN-4-2-20_PRO',
+        vendor: 'NodOn',
+        description: 'Double LED relay',
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
+        extend: extend.switch(),
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep1 = device.getEndpoint(1);
+            const ep2 = device.getEndpoint(2);
+            await reporting.bind(ep1, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(ep2, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(ep1);
+            await reporting.onOff(ep2);
+        },
+    },
 ];

package/devices/nue_3a.js

@@ -370,4 +370,27 @@ module.exports = [
             return {left: 1, right: 2};
         },
     },
+    {
+        zigbeeModel: ['LXN56-1S27LX1.2', 'LXX60-FN27LX1.0'],
+        model: 'NUE-ZBFLB',
+        vendor: 'Nue / 3A',
+        description: 'Smart fan light switch',
+        extend: extend.switch(),
+        exposes: [
+            e.switch().withEndpoint('button_light'),
+            e.switch().withEndpoint('button_fan_high'),
+            e.switch().withEndpoint('button_fan_med'),
+            e.switch().withEndpoint('button_fan_low'),
+        ],
+        endpoint: (device) => {
+            return {'button_light': 1, 'button_fan_high': 2, 'button_fan_med': 3, 'button_fan_low': 4};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
 ];

package/devices/philips.js

@@ -979,7 +979,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['LCG002', '929003047701'],
+        zigbeeModel: ['LCG002', '929003047701', '929003047701'],
         model: '929001953101',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10',
@@ -1288,7 +1288,7 @@ module.exports = [
         model: '1743930P7',
         vendor: 'Philips',
         description: 'Hue Outdoor Econic wall lantern',
-        extend: hueExtend.light_onoff_brightness_colortemp_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003053001'],
@@ -1963,7 +1963,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['915005987701'],
+        zigbeeModel: ['929003479701'],
         model: '915005987701',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (wood)',
@@ -3323,32 +3323,46 @@ module.exports = [
         description: 'Hue white ambiance extra bright high lumen dimmable LED smart retrofit recessed 6" downlight',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003115801'],
+        model: '929003115801',
+        vendor: 'Philips',
+        description: 'Hue Perifo ceiling light, 1 pendant (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003116201'],
+        model: '929003116201',
+        vendor: 'Philips',
+        description: 'Hue Perifo linear light bar',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['929003115901'],
         model: '929003117101',
         vendor: 'Philips',
-        description: 'Hue Perifo Ceiling Light, 3 pendant (black)',
+        description: 'Hue Perifo ceiling light, 3 pendant (black)',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003117201'],
         model: '929003117201',
         vendor: 'Philips',
-        description: 'Hue Perifo Ceiling Light, 3 pendant (white)',
+        description: 'Hue Perifo ceiling light, 3 pendant (white)',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003117301'],
         model: '929003117301',
         vendor: 'Philips',
-        description: 'Hue Perifo Ceiling Light, 4 spotlights (black)',
+        description: 'Hue Perifo ceiling light, 4 spotlights (black)',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003117401'],
         model: '929003117401',
         vendor: 'Philips',
-        description: 'Hue Perifo Ceiling Light, 4 spotlights (white)',
+        description: 'Hue Perifo ceiling light, 4 spotlights (white)',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {

package/devices/schneider_electric.js

@@ -5,6 +5,7 @@ const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const utils = require('../lib/utils');
+const ota = require('../lib/ota');
 const e = exposes.presets;
 const ea = exposes.access;
 
@@ -981,4 +982,28 @@ module.exports = [
                 .withUnit('A').withDescription('Instantaneous measured electrical current on phase C'),
         ],
     },
+    {
+        zigbeeModel: ['W599001'],
+        model: 'W599001',
+        vendor: 'Schneider Electric',
+        description: 'Wiser smoke alarm',
+        fromZigbee: [fz.temperature, fz.battery, fz.ias_enroll, fz.ias_smoke_alarm_1],
+        toZigbee: [],
+        ota: ota.zigbeeOTA, // local OTA updates are untested
+        exposes: [e.smoke(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage(),
+            // the temperature readings are unreliable and may need more investigation.
+            e.temperature(),
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(20);
+            const binds = ['msTemperatureMeasurement', 'ssIasZone', 'genPowerCfg'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.batteryVoltage(endpoint);
+            await reporting.temperature(endpoint);
+            await endpoint.read('msTemperatureMeasurement', ['measuredValue']);
+            await endpoint.read('ssIasZone', ['iasCieAddr', 'zoneState', 'zoneStatus', 'zoneId']);
+            await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
+        },
+    },
 ];

package/devices/shinasystem.js

@@ -620,7 +620,7 @@ module.exports = [
         },
         exposes: [e.battery(), e.lock(), exposes.enum('door_state', ea.STATE, ['open', 'closed']).withDescription('Door status'),
             e.lock_action(), e.lock_action_source_name(), e.lock_action_user(),
-            exposes.composite('pin_code', 'pin_code')
+            exposes.composite('pin_code', 'pin_code', ea.ALL)
                 .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

@@ -860,12 +860,12 @@ module.exports = [
                 .withDescription('Control status LED intensity when load ON'),
             exposes.numeric('led_intensity_off', ea.ALL).withValueMin(0).withValueMax(100)
                 .withDescription('Control status LED intensity when load OFF'),
-            exposes.composite('led_color_on', 'led_color_on')
+            exposes.composite('led_color_on', 'led_color_on', ea.SET)
                 .withFeature(exposes.numeric('r', ea.SET))
                 .withFeature(exposes.numeric('g', ea.SET))
                 .withFeature(exposes.numeric('b', ea.SET))
                 .withDescription('Control status LED color when load ON'),
-            exposes.composite('led_color_off', 'led_color_off')
+            exposes.composite('led_color_off', 'led_color_off', ea.SET)
                 .withFeature(exposes.numeric('r', ea.SET))
                 .withFeature(exposes.numeric('g', ea.SET))
                 .withFeature(exposes.numeric('b', ea.SET))
@@ -894,12 +894,12 @@ module.exports = [
                 .withDescription('Control status LED when load OFF'),
             exposes.numeric('minimum_brightness', ea.ALL).withValueMin(0).withValueMax(3000)
                 .withDescription('Control minimum dimmer brightness'),
-            exposes.composite('led_color_on', 'led_color_on')
+            exposes.composite('led_color_on', 'led_color_on', ea.SET)
                 .withFeature(exposes.numeric('r', ea.SET))
                 .withFeature(exposes.numeric('g', ea.SET))
                 .withFeature(exposes.numeric('b', ea.SET))
                 .withDescription('Control status LED color when load ON'),
-            exposes.composite('led_color_off', 'led_color_off')
+            exposes.composite('led_color_off', 'led_color_off', ea.SET)
                 .withFeature(exposes.numeric('r', ea.SET))
                 .withFeature(exposes.numeric('g', ea.SET))
                 .withFeature(exposes.numeric('b', ea.SET))
@@ -930,7 +930,7 @@ module.exports = [
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 10 : 0.1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 10}); // divider 100: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 10}); // divider 100: 0.1Vrms
-            await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [0, 1]}); // divider 1
         },
     },
     {
@@ -950,7 +950,7 @@ module.exports = [
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 10 : 0.1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 10}); // divider 100: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 10}); // divider 100: 0.1Vrms
-            await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [0, 1]}); // divider 1
         },
     },
     {

package/devices/skydance.js

@@ -48,7 +48,7 @@ module.exports = [
         toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
         exposes: [
             exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
-                ea.STATE_SET).withColor(['hs']),
+                ea.STATE_SET).withColor(['hs']).setAccess('color_hs', ea.STATE_SET),
         ],
     },
     {
@@ -71,7 +71,7 @@ module.exports = [
         toZigbee: [tz.tuya_dimmer_state, tz.tuya_light_wz5],
         exposes: [
             exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
-                ea.STATE_SET).withColor(['hs']),
+                ea.STATE_SET).withColor(['hs']).setAccess('color_hs', ea.STATE_SET),
             exposes.numeric('white_brightness', ea.STATE_SET).withValueMin(0).withValueMax(254).withDescription(
                 'White brightness of this light'),
         ],
@@ -90,7 +90,7 @@ module.exports = [
         exposes: [
             exposes.light().withBrightness().setAccess('state', ea.STATE_SET).setAccess('brightness',
                 ea.STATE_SET).withColor(['hs']).withColorTemp([250, 454]).setAccess('color_temp',
-                ea.STATE_SET),
+                ea.STATE_SET).setAccess('color_hs', ea.STATE_SET),
             exposes.numeric('white_brightness', ea.STATE_SET).withValueMin(0).withValueMax(254).withDescription(
                 'White brightness of this light'),
         ],

package/devices/smart_home_pty.js

@@ -1,7 +1,4 @@
-const exposes = require('../lib/exposes');
-const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
-const e = exposes.presets;
 
 module.exports = [
     {
@@ -18,23 +15,4 @@ module.exports = [
         description: 'Power plug',
         extend: extend.switch(),
     },
-    {
-        zigbeeModel: ['LXN56-1S27LX1.2'],
-        model: 'NUE-ZBFLB',
-        vendor: 'Nue / 3A',
-        description: 'Smart fan light switch',
-        extend: extend.switch(),
-        exposes: [e.switch().withEndpoint('button_light'), e.switch().withEndpoint('button_fan_high'),
-            e.switch().withEndpoint('button_fan_med'), e.switch().withEndpoint('button_fan_low')],
-        endpoint: (device) => {
-            return {'button_light': 1, 'button_fan_high': 2, 'button_fan_med': 3, 'button_fan_low': 4};
-        },
-        meta: {multiEndpoint: true},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genOnOff']);
-        },
-    },
 ];

package/devices/smartthings.js

@@ -126,8 +126,7 @@ module.exports = [
         model: 'GP-WOU019BBDWG',
         vendor: 'SmartThings',
         description: 'Outlet with power meter',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
-        toZigbee: [tz.on_off],
+        extend: extend.switch({fromZigbee: [fz.electrical_measurement, fz.metering], exposes: [e.power(), e.energy()]}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
@@ -139,7 +138,6 @@ module.exports = [
             await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.currentSummDelivered(endpoint);
         },
-        exposes: [e.switch(), e.power(), e.energy()],
     },
     {
         zigbeeModel: ['outlet'],

package/devices/sonoff.js

@@ -90,7 +90,7 @@ module.exports = [
         model: 'S31ZB',
         vendor: 'SONOFF',
         description: 'Zigbee smart plug (US version)',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         fromZigbee: [fz.on_off_skip_duplicate_transaction],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/devices/sunricher.js

@@ -271,6 +271,14 @@ module.exports = [
         description: 'Constant Current Zigbee LED dimmable driver',
         extend: extend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['HK-DIM'],
+        model: '50208702',
+        vendor: 'Sunricher',
+        description: 'LED dimmable driver',
+        extend: extend.light_onoff_brightness(),
+        whiteLabel: [{vendor: 'Yphix', model: '50208702'}],
+    },
     {
         zigbeeModel: ['SR-ZG9040A-S'],
         model: 'SR-ZG9040A-S',

package/devices/tuya.js

@@ -1009,6 +1009,8 @@ module.exports = [
         vendor: 'TuYa',
         description: 'Zigbee RGBW light',
         extend: extend.light_onoff_brightness_color({disablePowerOnBehavior: true}),
+        exposes: [e.light_brightness_color({disablePowerOnBehavior: true})
+            .setAccess('color_xy', ea.STATE_SET).setAccess('color_hs', ea.STATE_SET)],
         toZigbee: utils.replaceInArray(extend.light_onoff_brightness_color().toZigbee, [tz.light_color], [tzLocal.TS0504B_color]),
         meta: {applyRedFix: true},
     },
@@ -1153,11 +1155,18 @@ module.exports = [
             exposes.enum('sensitivity', ea.ALL, ['low', 'medium', 'high']).withDescription('PIR sensor sensitivity'),
             exposes.enum('keep_time', ea.ALL, [30, 60, 120]).withDescription('PIR keep time in seconds'),
         ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.batteryVoltage(endpoint);
+        },
     },
     {
         fingerprint: [{modelID: 'TS0207', manufacturerName: '_TZ3000_m0vaazab'},
             {modelID: 'TS0207', manufacturerName: '_TZ3000_ufttklsz'},
             {modelID: 'TS0207', manufacturerName: '_TZ3000_nkkl7uzv'},
+            {modelID: 'TS0207', manufacturerName: '_TZ3000_misw04hq'},
             {modelID: 'TS0207', manufacturerName: '_TZ3000_gszjt2xx'},
             {modelID: 'TS0207', manufacturerName: '_TZ3000_5k5vh43t'}],
         model: 'TS0207_repeater',
@@ -2109,7 +2118,7 @@ module.exports = [
         toZigbee: [tz.tuya_cover_control, tz.tuya_cover_options],
         exposes: [
             e.cover_position().setAccess('position', ea.STATE_SET),
-            exposes.composite('options', 'options')
+            exposes.composite('options', 'options', ea.STATE_SET)
                 .withFeature(exposes.numeric('motor_speed', ea.STATE_SET)
                     .withValueMin(0)
                     .withValueMax(255)
@@ -2168,7 +2177,7 @@ module.exports = [
                 .withRunningState(['idle', 'heat'], ea.STATE),
             e.auto_lock(), e.away_mode(), e.away_preset_days(), e.boost_time(), e.comfort_temperature(), e.eco_temperature(), e.force(),
             e.max_temperature(), e.min_temperature(), e.away_preset_temperature(),
-            exposes.composite('programming_mode').withDescription('Schedule MODE ⏱ - In this mode, ' +
+            exposes.composite('programming_mode', 'programming_mode', ea.STATE).withDescription('Schedule MODE ⏱ - In this mode, ' +
                     'the device executes a preset week programming temperature time and temperature.')
                 .withFeature(e.week())
                 .withFeature(exposes.text('workdays_schedule', ea.STATE_SET))
@@ -2224,7 +2233,7 @@ module.exports = [
                 '- schedule for Monday used for each day (define it only for Monday). `mon_fri+sat+sun` - schedule for ' +
                 'workdays used from Monday (define it only for Monday), Saturday and Sunday are defined separately. `separate` ' +
                 '- schedule for each day is defined separately.'),
-            exposes.composite('schedule', 'schedule').withFeature(exposes.enum('week_day', ea.SET, ['monday', 'tuesday',
+            exposes.composite('schedule', 'schedule', ea.SET).withFeature(exposes.enum('week_day', ea.SET, ['monday', 'tuesday',
                 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'])).withFeature(exposes.text('schedule', ea.SET))
                 .withDescription('Schedule will work with "auto" preset. In this mode, the device executes ' +
                 'a preset week programming temperature time and temperature. Before using these properties, check `working_day` ' +
@@ -2447,7 +2456,7 @@ module.exports = [
                     'ON - In this mode, the thermostat stays open ' +
                     'OFF - In this mode, the thermostat stays closed')
                 .withSystemMode(['auto', 'heat', 'off'], ea.STATE_SET),
-            exposes.composite('programming_mode').withDescription('Auto MODE ⏱ - In this mode, ' +
+            exposes.composite('programming_mode', 'programming_mode', ea.STATE).withDescription('Auto MODE ⏱ - In this mode, ' +
                     'the device executes a preset week programming temperature time and temperature. ')
                 .withFeature(exposes.text('monday_schedule', ea.STATE))
                 .withFeature(exposes.text('tuesday_schedule', ea.STATE))

package/devices/ubisys.js

@@ -704,7 +704,7 @@ module.exports = [
                 'brightness_move_up_s2', 'brightness_move_down_s1', 'brightness_move_down_s2', 'brightness_stop_s1',
                 'brightness_stop_s2']),
             e.light_brightness(),
-            exposes.composite('level_config', 'level_config')
+            exposes.composite('level_config', 'level_config', ea.ALL)
                 .withFeature(exposes.numeric('on_off_transition_time', ea.ALL)
                     .withDescription('Specifies the amount of time, in units of 0.1 seconds, which will be used during a transition to ' +
                     'either the on or off state, when an on/off/toggle command of the on/off cluster is used to turn the light on or off'))

package/devices/xiaomi.js

@@ -2311,17 +2311,17 @@ module.exports = [
                 .withDescription('Standby LCD brightness'),
             exposes.enum('available_switches', ea.STATE_SET, ['none', '1', '2', '3', '1 and 2', '1 and 3', '2 and 3', 'all'])
                 .withDescription('Control which switches are available in the switches screen (none disables switches screen)'),
-            exposes.composite('switch_1_text_icon', 'switch_1_text_icon').withDescription('Switch 1 text and icon')
+            exposes.composite('switch_1_text_icon', 'switch_1_text_icon', ea.STATE_SET).withDescription('Switch 1 text and icon')
                 .withFeature(exposes.enum('switch_1_icon', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
                     .withDescription('Icon'))
                 .withFeature(exposes.text('switch_1_text', ea.STATE_SET)
                     .withDescription('Text')),
-            exposes.composite('switch_2_text_icon', 'switch_2_text_icon').withDescription('Switch 2 text and icon')
+            exposes.composite('switch_2_text_icon', 'switch_2_text_icon', ea.STATE_SET).withDescription('Switch 2 text and icon')
                 .withFeature(exposes.enum('switch_2_icon', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
                     .withDescription('Icon'))
                 .withFeature(exposes.text('switch_2_text', ea.STATE_SET)
                     .withDescription('Text')),
-            exposes.composite('switch_3_text_icon', 'switch_3_text_icon').withDescription('Switch 3 text and icon')
+            exposes.composite('switch_3_text_icon', 'switch_3_text_icon', ea.STATE_SET).withDescription('Switch 3 text and icon')
                 .withFeature(exposes.enum('switch_3_icon', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'])
                     .withDescription('Icon'))
                 .withFeature(exposes.text('switch_3_text', ea.STATE_SET)
@@ -2714,7 +2714,7 @@ module.exports = [
             exposes.numeric('weight_per_day', ea.STATE).withDescription('Weight per day').withUnit('g'),
             exposes.binary('error', ea.STATE, true, false)
                 .withDescription('Indicates wether there is an error with the feeder'),
-            exposes.list('schedule', ea.STATE_SET, exposes.composite('dayTime', exposes.access.STATE_SET)
+            exposes.list('schedule', ea.STATE_SET, exposes.composite('dayTime', 'dayTime', exposes.access.STATE_SET)
                 .withFeature(exposes.enum('days', exposes.access.STATE_SET, [
                     'everyday', 'workdays', 'weekend', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun',
                     'mon-wed-fri-sun', 'tue-thu-sat']))

package/devices/zemismart.js

@@ -149,8 +149,8 @@ module.exports = [
         fromZigbee: [fz.ZMAM02_cover],
         toZigbee: [tz.ZMAM02_cover],
         exposes: [e.cover_position().setAccess('position', ea.STATE_SET),
-            exposes.composite('options', 'options')
-                .withFeature(exposes.numeric('motor_speed', ea.STATE_SET)
+            exposes.composite('options', 'options', ea.STATE)
+                .withFeature(exposes.numeric('motor_speed', ea.STATE)
                     .withValueMin(0)
                     .withValueMax(255)
                     .withDescription('Motor speed')),

package/lib/exposes.js

@@ -194,12 +194,13 @@ class Text extends Base {
 }
 
 class Composite extends Base {
-    constructor(name, property) {
+    constructor(name, property, access) {
         super();
         this.type = 'composite';
         this.property = property;
         this.name = name;
         this.features = [];
+        this.access = access;
     }
 
     withFeature(feature) {
@@ -237,7 +238,7 @@ class Light extends Base {
 
     withLevelConfig() {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
-        const levelConfig = new Composite('level_config', 'level_config')
+        const levelConfig = new Composite('level_config', 'level_config', access.ALL)
             .withFeature(new Numeric('on_off_transition_time', access.ALL)
                 .withDescription('Represents the time taken to move to or from the target level when On of Off commands are received by an On/Off cluster'),
             )
@@ -313,13 +314,13 @@ class Light extends Base {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
         for (const type of types) {
             if (type === 'xy') {
-                const colorXY = new Composite('color_xy', 'color')
+                const colorXY = new Composite('color_xy', 'color', access.ALL)
                     .withFeature(new Numeric('x', access.ALL))
                     .withFeature(new Numeric('y', access.ALL))
                     .withDescription('Color of this light in the CIE 1931 color space (x/y)');
                 this.features.push(colorXY);
             } else if (type === 'hs') {
-                const colorHS = new Composite('color_hs', 'color')
+                const colorHS = new Composite('color_hs', 'color', access.ALL)
                     .withFeature(new Numeric('hue', access.ALL))
                     .withFeature(new Numeric('saturation', access.ALL))
                     .withDescription('Color of this light expressed as hue/saturation');
@@ -491,7 +492,7 @@ module.exports = {
     access,
     binary: (name, access, valueOn, valueOff) => new Binary(name, access, valueOn, valueOff),
     climate: () => new Climate(),
-    composite: (name, property) => new Composite(name, property),
+    composite: (name, property, access) => new Composite(name, property, access),
     cover: () => new Cover(),
     enum: (name, access, values) => new Enum(name, access, values),
     light: () => new Light(),
@@ -509,7 +510,7 @@ module.exports = {
         occupancy_timeout: () => new Numeric(`occupancy_timeout`, access.SET).withValueMin(0).withDescription('Time in seconds after which occupancy is cleared after detecting it (default 90 seconds).'),
         occupancy_timeout_2: () => new Numeric(`occupancy_timeout`, access.SET).withValueMin(0).withValueStep(0.1).withUnit('s').withDescription('Time in seconds after which occupancy is cleared after detecting it (default is "detection_interval" + 2 seconds). The value must be equal to or greater than "detection_interval", and it can also be a fraction.'),
         vibration_timeout: () => new Numeric(`vibration_timeout`, access.SET).withValueMin(0).withDescription('Time in seconds after which vibration is cleared after detecting it (default 90 seconds).'),
-        simulated_brightness: (extraNote='') => new Composite('simulated_brightness', 'simulated_brightness')
+        simulated_brightness: (extraNote='') => new Composite('simulated_brightness', 'simulated_brightness', access.SET)
             .withDescription(`Simulate a brightness value. If this device provides a brightness_move_up or brightness_move_down action it is possible to specify the update interval and delta. The action_brightness_delta indicates the delta for each interval. ${extraNote}`)
             .withFeature(new Numeric('delta', access.SET).withValueMin(0).withDescription('Delta per interval, 20 by default'))
             .withFeature(new Numeric('interval', access.SET).withValueMin(0).withUnit('ms').withDescription('Interval duration')),
@@ -535,7 +536,7 @@ module.exports = {
         away_mode: () => new Switch().withState('away_mode', false, 'Enable/disable away mode', access.STATE_SET),
         away_preset_days: () => new Numeric('away_preset_days', access.STATE_SET).withDescription('Away preset days').withValueMin(0).withValueMax(100),
         away_preset_temperature: () => new Numeric('away_preset_temperature', access.STATE_SET).withUnit('°C').withDescription('Away preset temperature').withValueMin(-10).withValueMax(35),
-        battery: () => new Numeric('battery', access.STATE).withUnit('%').withDescription('Remaining battery in %').withValueMin(0).withValueMax(100),
+        battery: () => new Numeric('battery', access.STATE).withUnit('%').withDescription('Remaining battery in %, can take up to 24 hours before reported.').withValueMin(0).withValueMax(100),
         battery_low: () => new Binary('battery_low', access.STATE, true, false).withDescription('Indicates if the battery of this device is almost empty'),
         battery_voltage: () => new Numeric('voltage', access.STATE).withUnit('mV').withDescription('Voltage of the battery in millivolts'),
         boost_time: () => new Numeric('boost_time', access.STATE_SET).withUnit('s').withDescription('Boost time').withValueMin(0).withValueMax(900),
@@ -637,7 +638,7 @@ module.exports = {
         voltage_phase_b: () => new Numeric('voltage_phase_b', access.STATE).withUnit('V').withDescription('Measured electrical potential value on phase B'),
         voltage_phase_c: () => new Numeric('voltage_phase_c', access.STATE).withUnit('V').withDescription('Measured electrical potential value on phase C'),
         water_leak: () => new Binary('water_leak', access.STATE, true, false).withDescription('Indicates whether the device detected a water leak'),
-        warning: () => new Composite('warning', 'warning')
+        warning: () => new Composite('warning', 'warning', access.SET)
             .withFeature(new Enum('mode', access.SET, ['stop', 'burglar', 'fire', 'emergency', 'police_panic', 'fire_panic', 'emergency_panic']).withDescription('Mode of the warning (sound effect)'))
             .withFeature(new Enum('level', access.SET, ['low', 'medium', 'high', 'very_high']).withDescription('Sound level'))
             .withFeature(new Enum('strobe_level', access.SET, ['low', 'medium', 'high', 'very_high']).withDescription('Intensity of the strobe'))
@@ -650,12 +651,12 @@ module.exports = {
         x_axis: () => new Numeric('x_axis', access.STATE).withDescription('Accelerometer X value'),
         y_axis: () => new Numeric('y_axis', access.STATE).withDescription('Accelerometer Y value'),
         z_axis: () => new Numeric('z_axis', access.STATE).withDescription('Accelerometer Z value'),
-        pincode: () => new Composite('pin_code', 'pin_code')
+        pincode: () => new Composite('pin_code', 'pin_code', access.ALL)
             .withFeature(new Numeric('user', access.SET).withDescription('User ID to set or clear the pincode for'))
             .withFeature(new Enum('user_type', access.SET, ['unrestricted', 'year_day_schedule', 'week_day_schedule', 'master', 'non_access']).withDescription('Type of user, unrestricted: owner (default), (year|week)_day_schedule: user has ability to open lock based on specific time period, master: user has ability to both program and operate the door lock, non_access: user is recognized by the lock but does not have the ability to open the lock'))
             .withFeature(new Binary('user_enabled', access.SET, true, false).withDescription('Whether the user is enabled/disabled'))
             .withFeature(new Numeric('pin_code', access.SET).withDescription('Pincode to set, set pincode to null to clear')),
-        squawk: () => new Composite('squawk', 'squawk')
+        squawk: () => new Composite('squawk', 'squawk', access.SET)
             .withFeature(new Enum('state', access.SET, ['system_is_armed', 'system_is_disarmed']).withDescription('Set Squawk state'))
             .withFeature(new Enum('level', access.SET, ['low', 'medium', 'high', 'very_high']).withDescription('Sound level'))
             .withFeature(new Binary('strobe', access.SET, true, false).withDescription('Turn on/off the strobe (light) for Squawk')),

package/lib/extend.js

@@ -6,10 +6,10 @@ const light = require('./light');
 
 const extend = {
     switch: (options={}) => {
-        options = {disablePowerOnBehavior: false, ...options};
-        const exposes = [e.switch()];
-        const fromZigbee = [fz.on_off, fz.ignore_basic_report];
-        const toZigbee = [tz.on_off];
+        options = {disablePowerOnBehavior: false, toZigbee: [], fromZigbee: [], exposes: [], ...options};
+        const exposes = [e.switch(), ...options.exposes];
+        const fromZigbee = [fz.on_off, fz.ignore_basic_report, ...options.fromZigbee];
+        const toZigbee = [tz.on_off, ...options.toZigbee];
         if (!options.disablePowerOnBehavior) {
             exposes.push(e.power_on_behavior(['off', 'on', 'toggle', 'previous']));
             fromZigbee.push(fz.power_on_behavior);

package/package.json

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