zigbee-herdsman-converters 21.3.0 → 21.4.0

package/devices/inovelli.js

@@ -378,23 +378,6 @@ const COMMON_ATTRIBUTES = {
             "A setting of 'instant' turns the light immediately off. Increasing the value slows down the transition speed. " +
             'Every number represents 100ms. Default = 127 - Keep in sync with rampRateOffToOnLocal setting.',
     },
-    minimumLevel: {
-        ID: 9,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        min: 1,
-        max: 254,
-        description: 'The minimum level that the dimmer allows the bulb to be dimmed to. ' +
-            'Useful when the user has an LED bulb that does not turn on or flickers at a lower level.',
-    },
-    maximumLevel: {
-        ID: 10,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        min: 2,
-        max: 255,
-        description: 'The maximum level that the dimmer allows the bulb to be dimmed to.' +
-            'Useful when the user has an LED bulb that reaches its maximum level before the ' +
-            'dimmer value of 99 or when the user wants to limit the maximum brightness.',
-    },
     invertSwitch: {
         ID: 11,
         dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
@@ -461,16 +444,6 @@ const COMMON_ATTRIBUTES = {
         min: 0,
         max: 11,
     },
-    powerType: {
-        ID: 21,
-        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
-        displayType: 'enum',
-        values: { 'Non Neutral': 0, Neutral: 1 },
-        min: 0,
-        max: 1,
-        readOnly: true,
-        description: 'Set the power type for the device.',
-    },
     switchType: {
         ID: 22,
         dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
@@ -487,6 +460,8 @@ const COMMON_ATTRIBUTES = {
         max: 127,
         readOnly: true,
         description: 'The temperature measured by the temperature sensor inside the chip, in degrees Celsius',
+        category: 'diagnostic',
+        unit: '°C',
     },
     overheat: {
         ID: 33,
@@ -905,15 +880,6 @@ const COMMON_ATTRIBUTES = {
         max: 101,
         description: 'Intesity of LED strip when off. 101 = Synchronized with default all LED strip intensity parameter.',
     },
-    outputMode: {
-        ID: 258,
-        min: 0,
-        max: 1,
-        values: { Dimmer: 0, 'On/Off': 1 },
-        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
-        description: 'Use device as a Dimmer or an On/Off switch.',
-        displayType: 'enum',
-    },
     doubleTapClearNotifications: {
         ID: 262,
         dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
@@ -932,8 +898,53 @@ const COMMON_ATTRIBUTES = {
         description: 'Level display of the LED Strip',
     },
 };
-const VZM31_ATTRIBUTES = {
+const COMMON_DIMMER_ATTRIBUTES = {
     ...COMMON_ATTRIBUTES,
+    minimumLevel: {
+        ID: 9,
+        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
+        min: 1,
+        max: 254,
+        description: 'The minimum level that the dimmer allows the bulb to be dimmed to. ' +
+            'Useful when the user has an LED bulb that does not turn on or flickers at a lower level.',
+    },
+    maximumLevel: {
+        ID: 10,
+        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
+        min: 2,
+        max: 255,
+        description: 'The maximum level that the dimmer allows the bulb to be dimmed to.' +
+            'Useful when the user has an LED bulb that reaches its maximum level before the ' +
+            'dimmer value of 99 or when the user wants to limit the maximum brightness.',
+    },
+    powerType: {
+        ID: 21,
+        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
+        displayType: 'enum',
+        values: { 'Non Neutral': 0, Neutral: 1 },
+        min: 0,
+        max: 1,
+        readOnly: true,
+        description: 'Set the power type for the device.',
+    },
+    outputMode: {
+        ID: 258,
+        min: 0,
+        max: 1,
+        values: { Dimmer: 0, 'On/Off': 1 },
+        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
+        description: 'Use device as a Dimmer or an On/Off switch.',
+        displayType: 'enum',
+    },
+};
+const COMMON_DIMMER_ON_OFF_ATTRIBUTES = {
+    ledBarScaling: {
+        ID: 100,
+        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
+        displayType: 'enum',
+        values: { 'Gen3 method (VZM-style)': 0, 'Gen2 method (LZW-style)': 1 },
+        description: 'Method used for scaling.',
+    },
     activePowerReports: {
         ID: 18,
         dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
@@ -956,6 +967,19 @@ const VZM31_ATTRIBUTES = {
         description: 'Energy reports Energy level change which will result in sending a new energy report.' +
             '0 = disabled, 1-32767 = 0.01kWh-327.67kWh. Default setting: 10 (0.1 kWh)',
     },
+};
+const VZM30_ATTRIBUTES = {
+    ...COMMON_ATTRIBUTES,
+    ...COMMON_DIMMER_ON_OFF_ATTRIBUTES,
+    switchType: {
+        ...COMMON_ATTRIBUTES.switchType,
+        values: { 'Single Pole': 0, 'Aux Switch': 1 },
+        max: 1,
+    },
+};
+const VZM31_ATTRIBUTES = {
+    ...COMMON_DIMMER_ATTRIBUTES,
+    ...COMMON_DIMMER_ON_OFF_ATTRIBUTES,
     quickStartTime: {
         ID: 23,
         dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
@@ -979,13 +1003,6 @@ const VZM31_ATTRIBUTES = {
         max: 1,
         description: 'Increase level in non-neutral mode',
     },
-    ledBarScaling: {
-        ID: 100,
-        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
-        displayType: 'enum',
-        values: { 'Gen3 method (VZM-style)': 0, 'Gen2 method (LZW-style)': 1 },
-        description: 'Method used for scaling.',
-    },
     relayClick: {
         ID: 261,
         dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
@@ -999,15 +1016,15 @@ const VZM31_ATTRIBUTES = {
     },
 };
 const VZM35_ATTRIBUTES = {
-    ...COMMON_ATTRIBUTES,
+    ...COMMON_DIMMER_ATTRIBUTES,
     minimumLevel: {
-        ...COMMON_ATTRIBUTES.minimumLevel,
+        ...COMMON_DIMMER_ATTRIBUTES.minimumLevel,
         description: '1-84: The level corresponding to the fan is Low, Medium, High. ' +
             '85-170: The level corresponding to the fan is Medium, Medium, High. ' +
             '170-254: The level corresponding to the fan is High, High, High ',
     },
     maximumLevel: {
-        ...COMMON_ATTRIBUTES.maximumLevel,
+        ...COMMON_DIMMER_ATTRIBUTES.maximumLevel,
         description: '2-84: The level corresponding to the fan is Low, Medium, High.',
     },
     switchType: {
@@ -1042,7 +1059,7 @@ const VZM35_ATTRIBUTES = {
         description: 'Identification value in Non-nuetral, low gear, aux switch',
     },
     outputMode: {
-        ...COMMON_ATTRIBUTES.outputMode,
+        ...COMMON_DIMMER_ATTRIBUTES.outputMode,
         values: { 'Ceiling Fan (3-Speed)': 0, 'Exhaust Fan (On/Off)': 1 },
         description: 'Use device in ceiling fan (3-Speed) or in exhaust fan (On/Off) mode.',
     },
@@ -1059,8 +1076,8 @@ const VZM36_ATTRIBUTES = {
     rampRateOffToOnRemote_1: { ...COMMON_ATTRIBUTES.rampRateOffToOnRemote },
     dimmingSpeedDownRemote_1: { ...COMMON_ATTRIBUTES.dimmingSpeedDownRemote },
     rampRateOnToOffRemote_1: { ...COMMON_ATTRIBUTES.rampRateOnToOffRemote },
-    minimumLevel_1: { ...COMMON_ATTRIBUTES.minimumLevel },
-    maximumLevel_1: { ...COMMON_ATTRIBUTES.maximumLevel },
+    minimumLevel_1: { ...COMMON_DIMMER_ATTRIBUTES.minimumLevel },
+    maximumLevel_1: { ...COMMON_DIMMER_ATTRIBUTES.maximumLevel },
     autoTimerOff_1: {
         ...COMMON_ATTRIBUTES.autoTimerOff,
         description: 'Automatically turns the light off after this many seconds.' +
@@ -1114,7 +1131,7 @@ const VZM36_ATTRIBUTES = {
     ledColorWhenOn_1: { ...COMMON_ATTRIBUTES.ledColorWhenOn },
     ledIntensityWhenOn_1: { ...COMMON_ATTRIBUTES.ledIntensityWhenOn },
     // remote protection is readonly...
-    outputMode_1: { ...COMMON_ATTRIBUTES.outputMode },
+    outputMode_1: { ...COMMON_DIMMER_ATTRIBUTES.outputMode },
     // Endpoint 2 (Fan)
     dimmingSpeedUpRemote_2: {
         ...COMMON_ATTRIBUTES.dimmingSpeedUpRemote,
@@ -1141,11 +1158,11 @@ const VZM36_ATTRIBUTES = {
             'Every number represents 100ms. Default = 127 - Keep in sync with rampRateOffToOnRemote setting.',
     },
     minimumLevel_2: {
-        ...COMMON_ATTRIBUTES.minimumLevel,
+        ...COMMON_DIMMER_ATTRIBUTES.minimumLevel,
         description: 'The minimum level that the fan can be set to.',
     },
     maximumLevel_2: {
-        ...COMMON_ATTRIBUTES.maximumLevel,
+        ...COMMON_DIMMER_ATTRIBUTES.maximumLevel,
         description: 'The maximum level that the fan can be set to.',
     },
     autoTimerOff_2: {
@@ -1173,13 +1190,13 @@ const VZM36_ATTRIBUTES = {
     // internal temp readonly
     // overheat readonly
     smartBulbMode_2: {
-        ...COMMON_ATTRIBUTES.smartBulbMode,
+        ...COMMON_DIMMER_ATTRIBUTES.smartBulbMode,
         values: { Disabled: 0, 'Smart Fan Mode': 1 },
         description: 'For use with Smart Fans that need constant power and are controlled via commands rather than power.',
     },
     // remote protection readonly..
     outputMode_2: {
-        ...COMMON_ATTRIBUTES.outputMode,
+        ...COMMON_DIMMER_ATTRIBUTES.outputMode,
         values: { 'Ceiling Fan (3-Speed)': 0, 'Exhaust Fan (On/Off)': 1 },
         description: 'Use device in ceiling fan (3-Speed) or in exhaust fan (On/Off) mode.',
     },
@@ -1376,13 +1393,15 @@ const tzLocal = {
             }
         },
     },
-    fan_mode: {
+    fan_mode: (endpointId) => ({
         key: ['fan_mode'],
         convertSet: async (entity, key, value, meta) => {
-            await entity.command('genLevelCtrl', 'moveToLevelWithOnOff', {
+            const endpoint = meta.device.getEndpoint(endpointId);
+            await endpoint.command('genLevelCtrl', 'moveToLevelWithOnOff', {
                 level: fanModes[value],
                 transtime: 0xffff,
             }, utils.getOptions(meta.mapped, entity));
+            meta.state[key] = value;
             return {
                 state: {
                     [key]: value,
@@ -1391,9 +1410,10 @@ const tzLocal = {
             };
         },
         convertGet: async (entity, key, meta) => {
-            await entity.read('genLevelCtrl', ['currentLevel']);
+            const endpoint = meta.device.getEndpoint(endpointId);
+            await endpoint.read('genLevelCtrl', ['currentLevel']);
         },
-    },
+    }),
     fan_state: {
         key: ['fan_state'],
         convertSet: async (entity, key, value, meta) => {
@@ -1412,27 +1432,6 @@ const tzLocal = {
             await entity.read('genOnOff', ['onOff']);
         },
     },
-    vzm36_fan_mode: {
-        key: ['fan_mode'],
-        convertSet: async (entity, key, value, meta) => {
-            const endpoint = meta.device.getEndpoint(2);
-            await endpoint.command('genLevelCtrl', 'moveToLevelWithOnOff', {
-                level: fanModes[value],
-                transtime: 0xffff,
-            }, utils.getOptions(meta.mapped, entity));
-            meta.state[key] = value;
-            return {
-                state: {
-                    [key]: value,
-                    fan_state: 'ON',
-                },
-            };
-        },
-        convertGet: async (entity, key, meta) => {
-            const endpoint = meta.device.getEndpoint(2);
-            await endpoint.read('genLevelCtrl', ['currentLevel']);
-        },
-    },
     /**
      * On the VZM36, When turning the fan on and off, we must ensure that we are sending these
      * commands to endpoint 2 on the canopy module.
@@ -1644,24 +1643,11 @@ const fzLocal = {
             }
         },
     }),
-    fan_mode: {
-        cluster: 'genLevelCtrl',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            if (msg.data.currentLevel !== undefined) {
-                const mode = intToFanMode(msg.data['currentLevel'] || 1);
-                return {
-                    fan_mode: mode,
-                };
-            }
-            return msg.data;
-        },
-    },
-    vzm36_fan_mode: {
+    fan_mode: (endpointId) => ({
         cluster: 'genLevelCtrl',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
-            if (msg.endpoint.ID == 2) {
+            if (msg.endpoint.ID == endpointId) {
                 if (msg.data.currentLevel !== undefined) {
                     const mode = intToFanMode(msg.data['currentLevel'] || 1);
                     return {
@@ -1671,7 +1657,7 @@ const fzLocal = {
             }
             return msg.data;
         },
-    },
+    }),
     fan_state: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
@@ -1761,37 +1747,10 @@ const fzLocal = {
         },
     },
 };
-const exposesListVZM31 = [
-    e.light_brightness(),
-    e.power(),
-    e.energy(),
-    e
+const exposeLedEffects = () => {
+    return e
         .composite('led_effect', 'led_effect', ea.STATE_SET)
-        .withFeature(e
-        .enum('effect', ea.STATE_SET, [
-        'off',
-        'solid',
-        'fast_blink',
-        'slow_blink',
-        'pulse',
-        'chase',
-        'open_close',
-        'small_to_big',
-        'aurora',
-        'slow_falling',
-        'medium_falling',
-        'fast_falling',
-        'slow_rising',
-        'medium_rising',
-        'fast_rising',
-        'medium_blink',
-        'slow_chase',
-        'fast_chase',
-        'fast_siren',
-        'slow_siren',
-        'clear_effect',
-    ])
-        .withDescription('Animation Effect to use for the LEDs'))
+        .withFeature(e.enum('effect', ea.STATE_SET, Object.keys(ledEffects)).withDescription('Animation Effect to use for the LEDs'))
         .withFeature(e
         .numeric('color', ea.STATE_SET)
         .withValueMin(0)
@@ -1805,98 +1764,13 @@ const exposesListVZM31 = [
         .withDescription('1-60 is in seconds calculated 61-120 is in minutes calculated by(value-60) ' +
         'Example a value of 65 would be 65-60 = 5 minutes - 120-254 Is in hours calculated by(value-120) ' +
         'Example a value of 132 would be 132-120 would be 12 hours. - 255 Indefinitely'))
-        .withCategory('config'),
-    e
-        .composite('individual_led_effect', 'individual_led_effect', ea.STATE_SET)
-        .withFeature(e.enum('led', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7']).withDescription('Individual LED to target.'))
-        .withFeature(e
-        .enum('effect', ea.STATE_SET, [
-        'off',
-        'solid',
-        'fast_blink',
-        'slow_blink',
-        'pulse',
-        'chase',
-        'falling',
-        'rising',
-        'aurora',
-        'clear_effect',
-    ])
-        .withDescription('Animation Effect to use for the LED'))
-        .withFeature(e
-        .numeric('color', ea.STATE_SET)
-        .withValueMin(0)
-        .withValueMax(255)
-        .withDescription('Calculated by using a hue color circle(value/255*360) If color = 255 display white'))
-        .withFeature(e.numeric('level', ea.STATE_SET).withValueMin(0).withValueMax(100).withDescription('Brightness of the LED'))
-        .withFeature(e
-        .numeric('duration', ea.STATE_SET)
-        .withValueMin(0)
-        .withValueMax(255)
-        .withDescription('1-60 is in seconds calculated 61-120 is in minutes calculated by(value-60) ' +
-        'Example a value of 65 would be 65-60 = 5 minutes - 120-254 Is in hours calculated by(value-120) ' +
-        ' Example a value of 132 would be 132-120 would be 12 hours. - 255 Indefinitely'))
-        .withCategory('config'),
-];
-const exposesListVZM35 = [
-    e.fan().withModes(Object.keys(fanModes)),
-    e
-        .composite('led_effect', 'led_effect', ea.STATE_SET)
-        .withFeature(e
-        .enum('effect', ea.STATE_SET, [
-        'off',
-        'solid',
-        'fast_blink',
-        'slow_blink',
-        'pulse',
-        'chase',
-        'open_close',
-        'small_to_big',
-        'aurora',
-        'slow_falling',
-        'medium_falling',
-        'fast_falling',
-        'slow_rising',
-        'medium_rising',
-        'fast_rising',
-        'medium_blink',
-        'slow_chase',
-        'fast_chase',
-        'fast_siren',
-        'slow_siren',
-        'clear_effect',
-    ])
-        .withDescription('Animation Effect to use for the LEDs'))
-        .withFeature(e
-        .numeric('color', ea.STATE_SET)
-        .withValueMin(0)
-        .withValueMax(255)
-        .withDescription('Calculated by using a hue color circle(value/255*360) If color = 255 display white'))
-        .withFeature(e.numeric('level', ea.STATE_SET).withValueMin(0).withValueMax(100).withDescription('Brightness of the LEDs'))
-        .withFeature(e
-        .numeric('duration', ea.STATE_SET)
-        .withValueMin(0)
-        .withValueMax(255)
-        .withDescription('1-60 is in seconds calculated 61-120 is in minutes calculated by(value-60) ' +
-        'Example a value of 65 would be 65-60 = 5 minutes - 120-254 Is in hours calculated by(value-120) ' +
-        'Example a value of 132 would be 132-120 would be 12 hours. - 255 Indefinitely')),
-    e
+        .withCategory('config');
+};
+const exposeIndividualLedEffects = () => {
+    return e
         .composite('individual_led_effect', 'individual_led_effect', ea.STATE_SET)
         .withFeature(e.enum('led', ea.STATE_SET, ['1', '2', '3', '4', '5', '6', '7']).withDescription('Individual LED to target.'))
-        .withFeature(e
-        .enum('effect', ea.STATE_SET, [
-        'off',
-        'solid',
-        'fast_blink',
-        'slow_blink',
-        'pulse',
-        'chase',
-        'falling',
-        'rising',
-        'aurora',
-        'clear_effect',
-    ])
-        .withDescription('Animation Effect to use for the LED'))
+        .withFeature(e.enum('effect', ea.STATE_SET, Object.keys(individualLedEffects)).withDescription('Animation Effect to use for the LED'))
         .withFeature(e
         .numeric('color', ea.STATE_SET)
         .withValueMin(0)
@@ -1910,26 +1784,10 @@ const exposesListVZM35 = [
         .withDescription('1-60 is in seconds calculated 61-120 is in minutes calculated by(value-60) ' +
         'Example a value of 65 would be 65-60 = 5 minutes - 120-254 Is in hours calculated by(value-120) ' +
         ' Example a value of 132 would be 132-120 would be 12 hours. - 255 Indefinitely'))
-        .withCategory('config'),
-    e
-        .composite('breeze mode', 'breezeMode', ea.STATE_SET)
-        .withFeature(e.enum('speed1', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('Step 1 Speed'))
-        .withFeature(e.numeric('time1', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 1  '))
-        .withFeature(e.enum('speed2', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('Step 2 Speed'))
-        .withFeature(e.numeric('time2', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 2  '))
-        .withFeature(e.enum('speed3', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('Step 3 Speed'))
-        .withFeature(e.numeric('time3', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 3  '))
-        .withFeature(e.enum('speed4', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('Step 4 Speed'))
-        .withFeature(e.numeric('time4', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 4  '))
-        .withFeature(e.enum('speed5', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('Step 5 Speed'))
-        .withFeature(e.numeric('time5', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 5  '))
-        .withCategory('config'),
-];
-const exposesListVZM36 = [
-    e.light_brightness(),
-    e.fan().withModes(Object.keys(fanModes)),
-    // Breezee
-    e
+        .withCategory('config');
+};
+const exposeBreezeMode = () => {
+    return e
         .composite('breeze mode', 'breezeMode', ea.STATE_SET)
         .withFeature(e.enum('speed1', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('Step 1 Speed'))
         .withFeature(e.numeric('time1', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 1  '))
@@ -1941,37 +1799,19 @@ const exposesListVZM36 = [
         .withFeature(e.numeric('time4', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 4  '))
         .withFeature(e.enum('speed5', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('Step 5 Speed'))
         .withFeature(e.numeric('time5', ea.STATE_SET).withValueMin(1).withValueMax(80).withDescription('Duration (s) for fan in Step 5  '))
-        .withCategory('config'),
-];
+        .withCategory('config');
+};
+const exposesListVZM30 = [e.light_brightness(), exposeLedEffects(), exposeIndividualLedEffects()];
+const exposesListVZM31 = [e.light_brightness(), exposeLedEffects(), exposeIndividualLedEffects()];
+const exposesListVZM35 = [e.fan().withModes(Object.keys(fanModes)), exposeLedEffects(), exposeIndividualLedEffects(), exposeBreezeMode()];
+const exposesListVZM36 = [e.light_brightness(), e.fan().withModes(Object.keys(fanModes)), exposeBreezeMode()];
 // Populate exposes list from the attributes description
+attributesToExposeList(VZM30_ATTRIBUTES, exposesListVZM30);
 attributesToExposeList(VZM31_ATTRIBUTES, exposesListVZM31);
 attributesToExposeList(VZM35_ATTRIBUTES, exposesListVZM35);
 attributesToExposeList(VZM36_ATTRIBUTES, exposesListVZM36);
 // Put actions at the bottom of ui
-exposesListVZM31.push(e.action([
-    'down_single',
-    'up_single',
-    'config_single',
-    'down_release',
-    'up_release',
-    'config_release',
-    'down_held',
-    'up_held',
-    'config_held',
-    'down_double',
-    'up_double',
-    'config_double',
-    'down_triple',
-    'up_triple',
-    'config_triple',
-    'down_quadruple',
-    'up_quadruple',
-    'config_quadruple',
-    'down_quintuple',
-    'up_quintuple',
-    'config_quintuple',
-]));
-exposesListVZM35.push(e.action([
+const buttonTapSequences = [
     'down_single',
     'up_single',
     'config_single',
@@ -1993,15 +1833,67 @@ exposesListVZM35.push(e.action([
     'down_quintuple',
     'up_quintuple',
     'config_quintuple',
-]));
+];
+exposesListVZM30.push(e.action(buttonTapSequences));
+exposesListVZM31.push(e.action(buttonTapSequences));
+exposesListVZM35.push(e.action(buttonTapSequences));
 const definitions = [
+    {
+        zigbeeModel: ['VZM30-SN'],
+        model: 'VZM30-SN',
+        vendor: 'Inovelli',
+        description: 'On/off switch',
+        exposes: exposesListVZM30.concat((0, modernExtend_1.identify)().exposes),
+        extend: [
+            (0, modernExtend_1.deviceEndpoints)({
+                endpoints: { '1': 1, '2': 2, '3': 3, '4': 4 },
+                multiEndpointSkip: ['state', 'voltage', 'power', 'current', 'energy', 'brightness', 'temperature', 'humidity'],
+            }),
+            inovelliExtend.addCustomClusterInovelli(),
+            (0, modernExtend_1.temperature)(),
+            (0, modernExtend_1.humidity)(),
+            (0, modernExtend_1.electricityMeter)(),
+        ],
+        toZigbee: [
+            tzLocal.light_onoff_brightness_inovelli,
+            toZigbee_1.default.power_on_behavior,
+            toZigbee_1.default.ignore_transition,
+            toZigbee_1.default.identify,
+            tzLocal.inovelli_led_effect,
+            tzLocal.inovelli_individual_led_effect,
+            tzLocal.inovelli_parameters(VZM30_ATTRIBUTES),
+            tzLocal.inovelli_parameters_readOnly(VZM30_ATTRIBUTES),
+        ],
+        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.brightness, fromZigbee_1.default.level_config, fromZigbee_1.default.power_on_behavior, fromZigbee_1.default.ignore_basic_report, fzLocal.inovelli(VZM30_ATTRIBUTES)],
+        ota: true,
+        configure: async (device, coordinatorEndpoint) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.onOff(endpoint);
+            // Bind for Button Event Reporting
+            const endpoint2 = device.getEndpoint(2);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['manuSpecificInovelli']);
+        },
+    },
     {
         zigbeeModel: ['VZM31-SN'],
         model: 'VZM31-SN',
         vendor: 'Inovelli',
         description: '2-in-1 switch + dimmer',
         exposes: exposesListVZM31.concat((0, modernExtend_1.identify)().exposes),
-        extend: [inovelliExtend.addCustomClusterInovelli()],
+        extend: [
+            (0, modernExtend_1.deviceEndpoints)({
+                endpoints: { '1': 1, '2': 2, '3': 3 },
+                multiEndpointSkip: ['state', 'power', 'energy', 'brightness'],
+            }),
+            inovelliExtend.addCustomClusterInovelli(),
+            (0, modernExtend_1.electricityMeter)({
+                current: false,
+                voltage: false,
+                power: { min: 15, max: 3600, change: 1 },
+                energy: { min: 15, max: 3600, change: 0 },
+            }),
+        ],
         toZigbee: [
             tzLocal.light_onoff_brightness_inovelli,
             toZigbee_1.default.power_on_behavior,
@@ -2012,32 +1904,15 @@ const definitions = [
             tzLocal.inovelli_parameters(VZM31_ATTRIBUTES),
             tzLocal.inovelli_parameters_readOnly(VZM31_ATTRIBUTES),
         ],
-        fromZigbee: [
-            fromZigbee_1.default.on_off,
-            fromZigbee_1.default.brightness,
-            fromZigbee_1.default.level_config,
-            fromZigbee_1.default.power_on_behavior,
-            fromZigbee_1.default.ignore_basic_report,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fzLocal.inovelli(VZM31_ATTRIBUTES),
-        ],
+        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.brightness, fromZigbee_1.default.level_config, fromZigbee_1.default.power_on_behavior, fromZigbee_1.default.ignore_basic_report, fzLocal.inovelli(VZM31_ATTRIBUTES)],
         ota: true,
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['seMetering', 'haElectricalMeasurement', 'genOnOff', 'genLevelCtrl']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
             await reporting.onOff(endpoint);
             // Bind for Button Event Reporting
             const endpoint2 = device.getEndpoint(2);
             await reporting.bind(endpoint2, coordinatorEndpoint, ['manuSpecificInovelli']);
-            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.activePower(endpoint, { min: 15, max: 3600, change: 1 });
-            await reporting.currentSummDelivered(endpoint, {
-                min: 15,
-                max: 3600,
-                change: 0,
-            });
         },
     },
     {
@@ -2045,11 +1920,11 @@ const definitions = [
         model: 'VZM35-SN',
         vendor: 'Inovelli',
         description: 'Fan controller',
-        fromZigbee: [fzLocal.fan_state, fzLocal.fan_mode, fzLocal.breeze_mode, fzLocal.inovelli(VZM35_ATTRIBUTES)],
+        fromZigbee: [fzLocal.fan_state, fzLocal.fan_mode(1), fzLocal.breeze_mode, fzLocal.inovelli(VZM35_ATTRIBUTES)],
         toZigbee: [
             toZigbee_1.default.identify,
             tzLocal.fan_state,
-            tzLocal.fan_mode,
+            tzLocal.fan_mode(1),
             tzLocal.inovelli_led_effect,
             tzLocal.inovelli_individual_led_effect,
             tzLocal.inovelli_parameters(VZM35_ATTRIBUTES),
@@ -2072,17 +1947,11 @@ const definitions = [
         model: 'VZM36',
         vendor: 'Inovelli',
         description: 'Fan canopy module',
-        fromZigbee: [
-            fzLocal.brightness,
-            fzLocal.vzm36_fan_light_state,
-            fzLocal.vzm36_fan_mode,
-            fzLocal.breeze_mode,
-            fzLocal.inovelli(VZM36_ATTRIBUTES),
-        ],
+        fromZigbee: [fzLocal.brightness, fzLocal.vzm36_fan_light_state, fzLocal.fan_mode(2), fzLocal.breeze_mode, fzLocal.inovelli(VZM36_ATTRIBUTES)],
         toZigbee: [
             toZigbee_1.default.identify,
             tzLocal.vzm36_fan_on_off, // Need to use VZM36 specific converter
-            tzLocal.vzm36_fan_mode, // Need to use VZM36 specific converter
+            tzLocal.fan_mode(2),
             tzLocal.light_onoff_brightness_inovelli,
             tzLocal.inovelli_parameters(VZM36_ATTRIBUTES),
             tzLocal.inovelli_parameters_readOnly(VZM36_ATTRIBUTES),