zigbee-herdsman-converters 21.27.0 → 21.28.0

package/devices/inovelli.js

@@ -98,12 +98,13 @@ const individualLedEffects = {
     aurora: 8,
     clear_effect: 255,
 };
+const INOVELLI_CLUSTER_NAME = 'manuSpecificInovelli';
 const inovelliExtend = {
-    addCustomClusterInovelli: () => m.deviceAddCustomCluster('manuSpecificInovelli', {
+    addCustomClusterInovelli: () => m.deviceAddCustomCluster(INOVELLI_CLUSTER_NAME, {
         ID: 64561,
         manufacturerCode: 0x122f,
         attributes: {
-            dimmingSpeedUpRemote: { ID: 0x001, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
+            dimmingSpeedUpRemote: { ID: 0x0001, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
             dimmingSpeedUpLocal: { ID: 0x0002, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
             rampRateOffToOnRemote: { ID: 0x0003, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
             rampRateOffToOnLocal: { ID: 0x0004, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
@@ -127,7 +128,7 @@ const inovelliExtend = {
             quickStartTime: { ID: 0x0017, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
             quickStartLevel: { ID: 0x0018, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
             higherOutputInNonNeutral: { ID: 0x0019, type: zigbee_herdsman_1.Zcl.DataType.BOOLEAN },
-            leadingTrailingEdge: { ID: 0x001a, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
+            dimmingMode: { ID: 0x001a, type: zigbee_herdsman_1.Zcl.DataType.BOOLEAN },
             nonNeutralAuxMediumGear: { ID: 0x001e, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
             nonNeutralAuxLowGear: { ID: 0x001f, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
             internalTemperature: { ID: 0x0020, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
@@ -898,6 +899,13 @@ const COMMON_ATTRIBUTES = {
         description: 'Level display of the LED Strip',
     },
 };
+/**
+ * Common Dimmer Attributes
+ *
+ * These attributes are shared between all devices that act like dimmers (including dimmers + fan switches) with
+ * the manufacturer specific Inovelli cluster. These are not shared with on/off switches.
+ * Some of the descriptions, max, min or value properties may be overridden for each device
+ */
 const COMMON_DIMMER_ATTRIBUTES = {
     ...COMMON_ATTRIBUTES,
     minimumLevel: {
@@ -937,6 +945,58 @@ const COMMON_DIMMER_ATTRIBUTES = {
         displayType: 'enum',
     },
 };
+/**
+ * Common Dimmable light Attributes
+ *
+ * These attributes are shared between all devices that are dimmable light switches with
+ * the manufacturer specific Inovelli cluster. These are not shared with fans or on/off switches.
+ * Some of the descriptions, max, min or value properties may be overridden for each device
+ */
+const COMMON_DIMMABLE_LIGHT_ATTRIBUTES = {
+    quickStartTime: {
+        ID: 23,
+        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
+        min: 0,
+        max: 60,
+        description: 'Duration of full power output while lamp transitions from Off to On. In 60th of second. 0 = disable, 1 = 1/60s, 60 = 1s',
+    },
+    quickStartLevel: {
+        ID: 24,
+        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
+        min: 1,
+        max: 254,
+        description: 'Level of power output during Quick Start Light time (P23).',
+    },
+    higherOutputInNonNeutral: {
+        ID: 25,
+        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
+        displayType: 'enum',
+        values: { 'Disabled (default)': 0, Enabled: 1 },
+        min: 0,
+        max: 1,
+        description: 'Increase level in non-neutral mode',
+    },
+    dimmingMode: {
+        ID: 26,
+        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
+        displayType: 'enum',
+        values: { 'Leading edge': 0, 'Trailing edge': 1 },
+        min: 0,
+        max: 1,
+        readOnly: true,
+        description: 'Switches the dimming mode from leading edge (default) to trailing edge. ' +
+            '1. Trailing Edge is only available on neutral single-pole and neutral multi-way with an ' +
+            'aux/add-on switch (multi-way with a dumb/existing switch and non-neutral setups are not supported and ' +
+            'will default back to Leading Edge). This parameter can only be changed at the switch.',
+    },
+};
+/**
+ * Common Dimmer or On/Off Attributes
+ *
+ * These attributes are shared between all devices that are light switches (either dimmers or on/off) with
+ * the manufacturer specific Inovelli cluster. These are not shared with fans.
+ * Some of the descriptions, max, min or value properties may be overridden for each device
+ */
 const COMMON_DIMMER_ON_OFF_ATTRIBUTES = {
     ledBarScaling: {
         ID: 100,
@@ -980,29 +1040,7 @@ const VZM30_ATTRIBUTES = {
 const VZM31_ATTRIBUTES = {
     ...COMMON_DIMMER_ATTRIBUTES,
     ...COMMON_DIMMER_ON_OFF_ATTRIBUTES,
-    quickStartTime: {
-        ID: 23,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        min: 0,
-        max: 60,
-        description: 'Duration of full power output while lamp tranisitions from Off to On. In 60th of second. 0 = disable, 1 = 1/60s, 60 = 1s',
-    },
-    quickStartLevel: {
-        ID: 24,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        min: 1,
-        max: 254,
-        description: 'Level of power output during Quick Start Light time (P23).',
-    },
-    higherOutputInNonNeutral: {
-        ID: 25,
-        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
-        displayType: 'enum',
-        values: { 'Disabled (default)': 0, Enabled: 1 },
-        min: 0,
-        max: 1,
-        description: 'Increase level in non-neutral mode',
-    },
+    ...COMMON_DIMMABLE_LIGHT_ATTRIBUTES,
     relayClick: {
         ID: 261,
         dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
@@ -1092,38 +1130,17 @@ const VZM36_ATTRIBUTES = {
         ...COMMON_ATTRIBUTES.stateAfterPowerRestored,
         description: 'The state the light should return to when power is restored after power failure. 0 = off, 1-254 = level, 255 = previous.',
     },
+    quickStartTime_1: { ...COMMON_DIMMABLE_LIGHT_ATTRIBUTES.quickStartTime },
+    quickStartLevel_1: { ...COMMON_DIMMABLE_LIGHT_ATTRIBUTES.quickStartLevel },
     higherOutputInNonNeutral_1: {
-        ID: 25,
-        dataType: zigbee_herdsman_1.Zcl.DataType.BOOLEAN,
-        displayType: 'enum',
-        values: { 'Disabled (default)': 0, Enabled: 1 },
-        min: 0,
-        max: 1,
+        ...COMMON_DIMMABLE_LIGHT_ATTRIBUTES.higherOutputInNonNeutral,
         description: 'Increase level in non-neutral mode for light.',
     },
-    quickStartTime_1: {
-        ID: 23,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        min: 0,
-        max: 60,
-        description: 'Duration of full power output while lamp tranisitions from Off to On. In 60th of second. 0 = disable, 1 = 1/60s, 60 = 1s',
-    },
-    quickStartLevel_1: {
-        ID: 24,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        min: 1,
-        max: 254,
-        description: 'Level of power output during Quick Start Light time (P23).',
-    },
-    leadingTrailingEdge_1: {
-        ID: 26,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        displayType: 'enum',
-        values: { 'Leading Edge': 0, 'Trailing Edge': 1 },
-        min: 0,
-        max: 1,
-        description: 'Leading Edge has a value of 0 and is the default value, whereas Trailing Edge has a value of ' +
-            '1. Please note that Trailing Edge is only available on neutral single-pole and neutral multi-way with an ' +
+    dimmingMode_1: {
+        ...COMMON_DIMMABLE_LIGHT_ATTRIBUTES.dimmingMode,
+        readOnly: false,
+        description: 'Switches the dimming mode from leading edge (default) to trailing edge. ' +
+            '1. Trailing Edge is only available on neutral single-pole and neutral multi-way with an ' +
             'aux/add-on switch (multi-way with a dumb/existing switch and non-neutral setups are not supported and ' +
             'will default back to Leading Edge).',
     },
@@ -1180,11 +1197,8 @@ const VZM36_ATTRIBUTES = {
         description: 'The state the fan should return to when power is restored after power failure. 0 = off, 1-254 = level, 255 = previous.',
     },
     quickStartTime_2: {
-        ID: 23,
-        dataType: zigbee_herdsman_1.Zcl.DataType.UINT8,
-        min: 0,
-        max: 60,
-        description: 'Duration of full power output while fan tranisitions from Off to On. In 60th of second. 0 = disable, 1 = 1/60s, 60 = 1s',
+        ...COMMON_DIMMABLE_LIGHT_ATTRIBUTES.quickStartTime,
+        description: 'Duration of full power output while fan transitions from Off to On. In 60th of second. 0 = disable, 1 = 1/60s, 60 = 1s',
     },
     // power type readonly
     // internal temp readonly
@@ -1202,7 +1216,7 @@ const VZM36_ATTRIBUTES = {
     },
 };
 const tzLocal = {
-    inovelli_parameters: (ATTRIBUTES) => ({
+    inovelli_parameters: (ATTRIBUTES, cluster) => ({
         key: Object.keys(ATTRIBUTES).filter((a) => !ATTRIBUTES[a].readOnly),
         convertSet: async (entity, key, value, meta) => {
             // Check key to see if there is an endpoint postfix for the VZM36
@@ -1223,7 +1237,7 @@ const tzLocal = {
                     type: ATTRIBUTES[key].dataType,
                 },
             };
-            await entityToUse.write('manuSpecificInovelli', payload, {
+            await entityToUse.write(cluster, payload, {
                 manufacturerCode: INOVELLI,
             });
             return {
@@ -1241,12 +1255,12 @@ const tzLocal = {
                 entityToUse = meta.device.getEndpoint(Number(keysplit[1]));
                 keyToUse = keysplit[0];
             }
-            await entityToUse.read('manuSpecificInovelli', [keyToUse], {
+            await entityToUse.read(cluster, [keyToUse], {
                 manufacturerCode: INOVELLI,
             });
         },
     }),
-    inovelli_parameters_readOnly: (ATTRIBUTES) => ({
+    inovelli_parameters_readOnly: (ATTRIBUTES, cluster) => ({
         key: Object.keys(ATTRIBUTES).filter((a) => ATTRIBUTES[a].readOnly),
         convertGet: async (entity, key, meta) => {
             // Check key to see if there is an endpoint postfix for the VZM36
@@ -1257,7 +1271,7 @@ const tzLocal = {
                 entityToUse = meta.device.getEndpoint(Number(keysplit[1]));
                 keyToUse = keysplit[0];
             }
-            await entityToUse.read('manuSpecificInovelli', [keyToUse], {
+            await entityToUse.read(cluster, [keyToUse], {
                 manufacturerCode: INOVELLI,
             });
         },
@@ -1265,7 +1279,7 @@ const tzLocal = {
     inovelli_led_effect: {
         key: ['led_effect'],
         convertSet: async (entity, key, values, meta) => {
-            await entity.command('manuSpecificInovelli', 'ledEffect', {
+            await entity.command(INOVELLI_CLUSTER_NAME, 'ledEffect', {
                 // @ts-expect-error ignore
                 effect: ledEffects[values.effect],
                 // @ts-expect-error ignore
@@ -1281,7 +1295,7 @@ const tzLocal = {
     inovelli_individual_led_effect: {
         key: ['individual_led_effect'],
         convertSet: async (entity, key, values, meta) => {
-            await entity.command('manuSpecificInovelli', 'individualLedEffect', {
+            await entity.command(INOVELLI_CLUSTER_NAME, 'individualLedEffect', {
                 // @ts-expect-error ignore
                 led: Math.min(Math.max(0, parseInt(values.led)), 7),
                 // @ts-expect-error ignore
@@ -1402,6 +1416,14 @@ const tzLocal = {
                 transtime: 0xffff,
             }, utils.getOptions(meta.mapped, entity));
             meta.state[key] = value;
+            if (endpointId == 2) {
+                return {
+                    state: {
+                        [key]: value,
+                        fan_state: 'ON',
+                    },
+                };
+            }
             return {
                 state: {
                     [key]: value,
@@ -1472,55 +1494,7 @@ const tzLocal = {
             await endpoint.read('genOnOff', ['onOff']);
         },
     },
-    vzm36_breezeMode: {
-        key: ['breezeMode'],
-        convertSet: async (entity, key, values, meta) => {
-            // Calculate the value..
-            let configValue = 0;
-            let term = false;
-            configValue += speedToInt(values.speed1);
-            configValue += (Number(values.time1) / 5) * 4;
-            let speed = speedToInt(values.speed2);
-            if (speed !== 0) {
-                configValue += speed * 64;
-                configValue += (values.time2 / 5) * 256;
-            }
-            else {
-                term = true;
-            }
-            speed = speedToInt(values.speed3);
-            if (speed !== 0 && !term) {
-                configValue += speed * 4096;
-                configValue += (values.time3 / 5) * 16384;
-            }
-            else {
-                term = true;
-            }
-            speed = speedToInt(values.speed4);
-            if (speed !== 0 && !term) {
-                configValue += speed * 262144;
-                configValue += (values.time4 / 5) * 1048576;
-            }
-            else {
-                term = true;
-            }
-            speed = speedToInt(values.speed5);
-            if (speed !== 0 && !term) {
-                configValue += speed * 16777216;
-                configValue += (values.time5 / 5) * 67108864;
-            }
-            else {
-                term = true;
-            }
-            const endpoint = meta.device.getEndpoint(2);
-            const payload = { breezeMode: configValue.toString() };
-            await endpoint.write('manuSpecificInovelli', payload, {
-                manufacturerCode: INOVELLI,
-            });
-            return { state: { [key]: values } };
-        },
-    },
-    breezeMode: {
+    breezeMode: (endpointId) => ({
         key: ['breezeMode'],
         convertSet: async (entity, key, values, meta) => {
             // Calculate the value..
@@ -1560,14 +1534,14 @@ const tzLocal = {
             else {
                 term = true;
             }
-            const endpoint = meta.device.getEndpoint(1);
+            const endpoint = meta.device.getEndpoint(endpointId);
             const payload = { breezeMode: configValue.toString() };
-            await endpoint.write('manuSpecificInovelli', payload, {
+            await endpoint.write(INOVELLI_CLUSTER_NAME, payload, {
                 manufacturerCode: INOVELLI,
             });
             return { state: { [key]: values } };
         },
-    },
+    }),
 };
 /*
  * Inovelli VZM31SN has a default transition property that the device should
@@ -1605,8 +1579,8 @@ const inovelliOnOffConvertSet = async (entity, key, value, meta) => {
     }
 };
 const fzLocal = {
-    inovelli: (ATTRIBUTES) => ({
-        cluster: 'manuSpecificInovelli',
+    inovelli: (ATTRIBUTES, cluster, splitValuesByEndpoint = false) => ({
+        cluster: cluster,
         type: ['raw', 'readResponse', 'commandQueryNextImageRequest'],
         convert: (model, msg, publish, options, meta) => {
             if (msg.type === 'raw' && msg.endpoint.ID == 2 && msg.data[4] === 0x00) {
@@ -1629,13 +1603,14 @@ const fzLocal = {
             }
             else if (msg.type === 'readResponse') {
                 return Object.keys(msg.data).reduce((p, c) => {
-                    if (ATTRIBUTES[c] && ATTRIBUTES[c].displayType === 'enum') {
+                    const key = splitValuesByEndpoint ? `${c}_${msg.endpoint.ID}` : c;
+                    if (ATTRIBUTES[key] && ATTRIBUTES[key].displayType === 'enum') {
                         return {
                             ...p,
-                            [c]: Object.keys(ATTRIBUTES[c].values).find((k) => ATTRIBUTES[c].values[k] === msg.data[c]),
+                            [key]: Object.keys(ATTRIBUTES[key].values).find((k) => ATTRIBUTES[key].values[k] === msg.data[c]),
                         };
                     }
-                    return { ...p, [c]: msg.data[c] };
+                    return { ...p, [key]: msg.data[c] };
                 }, {});
             }
             else {
@@ -1691,11 +1666,11 @@ const fzLocal = {
      *
      * Extract each nybble of the word, then reverse the calculation to get the settig for each.
      */
-    breeze_mode: {
-        cluster: 'manuSpecificInovelli',
+    breeze_mode: (endpointId) => ({
+        cluster: INOVELLI_CLUSTER_NAME,
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
-            if (msg.endpoint.ID == 2) {
+            if (msg.endpoint.ID == endpointId) {
                 if (msg.data.breeze_mode !== undefined) {
                     const bitmasks = [3, 60, 192, 3840, 12288, 245760, 786432, 15728640, 50331648, 1006632960];
                     const raw = msg.data['breeze_mode'];
@@ -1726,7 +1701,7 @@ const fzLocal = {
                 }
             }
         },
-    },
+    }),
     vzm36_fan_light_state: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
@@ -1837,6 +1812,16 @@ const buttonTapSequences = [
 exposesListVZM30.push(e.action(buttonTapSequences));
 exposesListVZM31.push(e.action(buttonTapSequences));
 exposesListVZM35.push(e.action(buttonTapSequences));
+/*
+ * Inovelli devices have a huge number of attributes. Calling endpoint.read() in a single call
+ * for all attributes causes timeouts even with the timeout set to an absurdly high number (2 minutes)
+ */
+const chunkedRead = async (endpoint, attributes, cluster) => {
+    const chunkSize = 10;
+    for (let i = 0; i < attributes.length; i += chunkSize) {
+        await endpoint.read(cluster, attributes.slice(i, i + chunkSize));
+    }
+};
 const definitions = [
     {
         zigbeeModel: ['VZM30-SN'],
@@ -1861,18 +1846,26 @@ const definitions = [
             toZigbee_1.default.identify,
             tzLocal.inovelli_led_effect,
             tzLocal.inovelli_individual_led_effect,
-            tzLocal.inovelli_parameters(VZM30_ATTRIBUTES),
-            tzLocal.inovelli_parameters_readOnly(VZM30_ATTRIBUTES),
+            tzLocal.inovelli_parameters(VZM30_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+            tzLocal.inovelli_parameters_readOnly(VZM30_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+        ],
+        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, INOVELLI_CLUSTER_NAME),
         ],
-        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);
+            await chunkedRead(endpoint, Object.keys(VZM30_ATTRIBUTES), INOVELLI_CLUSTER_NAME);
             // Bind for Button Event Reporting
             const endpoint2 = device.getEndpoint(2);
-            await reporting.bind(endpoint2, coordinatorEndpoint, ['manuSpecificInovelli']);
+            await reporting.bind(endpoint2, coordinatorEndpoint, [INOVELLI_CLUSTER_NAME]);
         },
     },
     {
@@ -1901,18 +1894,26 @@ const definitions = [
             toZigbee_1.default.identify,
             tzLocal.inovelli_led_effect,
             tzLocal.inovelli_individual_led_effect,
-            tzLocal.inovelli_parameters(VZM31_ATTRIBUTES),
-            tzLocal.inovelli_parameters_readOnly(VZM31_ATTRIBUTES),
+            tzLocal.inovelli_parameters(VZM31_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+            tzLocal.inovelli_parameters_readOnly(VZM31_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+        ],
+        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, INOVELLI_CLUSTER_NAME),
         ],
-        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, ['genOnOff', 'genLevelCtrl']);
             await reporting.onOff(endpoint);
+            await chunkedRead(endpoint, Object.keys(VZM31_ATTRIBUTES), INOVELLI_CLUSTER_NAME);
             // Bind for Button Event Reporting
             const endpoint2 = device.getEndpoint(2);
-            await reporting.bind(endpoint2, coordinatorEndpoint, ['manuSpecificInovelli']);
+            await reporting.bind(endpoint2, coordinatorEndpoint, [INOVELLI_CLUSTER_NAME]);
         },
     },
     {
@@ -1920,16 +1921,16 @@ const definitions = [
         model: 'VZM35-SN',
         vendor: 'Inovelli',
         description: 'Fan controller',
-        fromZigbee: [fzLocal.fan_state, fzLocal.fan_mode(1), fzLocal.breeze_mode, fzLocal.inovelli(VZM35_ATTRIBUTES)],
+        fromZigbee: [fzLocal.fan_state, fzLocal.fan_mode(1), fzLocal.breeze_mode(1), fzLocal.inovelli(VZM35_ATTRIBUTES, INOVELLI_CLUSTER_NAME)],
         toZigbee: [
             toZigbee_1.default.identify,
             tzLocal.fan_state,
             tzLocal.fan_mode(1),
             tzLocal.inovelli_led_effect,
             tzLocal.inovelli_individual_led_effect,
-            tzLocal.inovelli_parameters(VZM35_ATTRIBUTES),
-            tzLocal.inovelli_parameters_readOnly(VZM35_ATTRIBUTES),
-            tzLocal.breezeMode,
+            tzLocal.inovelli_parameters(VZM35_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+            tzLocal.inovelli_parameters_readOnly(VZM35_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+            tzLocal.breezeMode(1),
         ],
         exposes: exposesListVZM35.concat(m.identify().exposes),
         extend: [inovelliExtend.addCustomClusterInovelli()],
@@ -1937,9 +1938,10 @@ const definitions = [
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await chunkedRead(endpoint, Object.keys(VZM35_ATTRIBUTES), INOVELLI_CLUSTER_NAME);
             // Bind for Button Event Reporting
             const endpoint2 = device.getEndpoint(2);
-            await reporting.bind(endpoint2, coordinatorEndpoint, ['manuSpecificInovelli']);
+            await reporting.bind(endpoint2, coordinatorEndpoint, [INOVELLI_CLUSTER_NAME]);
         },
     },
     {
@@ -1947,15 +1949,21 @@ const definitions = [
         model: 'VZM36',
         vendor: 'Inovelli',
         description: 'Fan canopy module',
-        fromZigbee: [fzLocal.brightness, fzLocal.vzm36_fan_light_state, fzLocal.fan_mode(2), fzLocal.breeze_mode, fzLocal.inovelli(VZM36_ATTRIBUTES)],
+        fromZigbee: [
+            fzLocal.brightness,
+            fzLocal.vzm36_fan_light_state,
+            fzLocal.fan_mode(2),
+            fzLocal.breeze_mode(2),
+            fzLocal.inovelli(VZM36_ATTRIBUTES, INOVELLI_CLUSTER_NAME, true),
+        ],
         toZigbee: [
             toZigbee_1.default.identify,
             tzLocal.vzm36_fan_on_off, // 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),
-            tzLocal.vzm36_breezeMode,
+            tzLocal.inovelli_parameters(VZM36_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+            tzLocal.inovelli_parameters_readOnly(VZM36_ATTRIBUTES, INOVELLI_CLUSTER_NAME),
+            tzLocal.breezeMode(2),
         ],
         exposes: exposesListVZM36.concat(m.identify().exposes),
         extend: [inovelliExtend.addCustomClusterInovelli()],
@@ -1966,9 +1974,28 @@ const definitions = [
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint);
+            await chunkedRead(endpoint, Object.keys(VZM36_ATTRIBUTES).flatMap((key) => {
+                const keysplit = key.split('_');
+                if (keysplit.length === 2) {
+                    if (Number(keysplit[1]) == 1) {
+                        return [keysplit[0]];
+                    }
+                    return [];
+                }
+                return [key];
+            }), INOVELLI_CLUSTER_NAME);
             const endpoint2 = device.getEndpoint(2);
             await reporting.bind(endpoint2, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint2);
+            await chunkedRead(endpoint2, Object.keys(VZM36_ATTRIBUTES).flatMap((key) => {
+                const keysplit = key.split('_');
+                if (keysplit.length === 2) {
+                    if (Number(keysplit[1]) == 2) {
+                        return [keysplit[0]];
+                    }
+                }
+                return [];
+            }), INOVELLI_CLUSTER_NAME);
         },
     },
 ];