Use the PowerAsNumber and PowerNumberLimits features instead of PowerInWatts for the MicrowaveOvenControl cluster, and handle the PowerSetting field in SetCookingParameters accordingly

Author: Luligu

CHANGELOG.md

@@ -44,6 +44,7 @@ If you like this project and find it useful, please consider giving it a star on
 ### Fixed
 
 - [irrigationSystem]: Remove the non-functional `singleZone` option; single-zone systems must now use `addZone` like any other zone.
+- [microwaveOven]: Use the `PowerAsNumber` and `PowerNumberLimits` features instead of `PowerInWatts` for the `MicrowaveOvenControl` cluster, and handle the `PowerSetting` field in `SetCookingParameters` accordingly.
 
 <a href="https://www.buymeacoffee.com/luligugithub"><img src="https://matterbridge.io/assets/bmc-button.svg" alt="Buy me a coffee" width="80"></a>
 

docs/CHANGELOG.html

@@ -165,6 +165,7 @@ <h3 id="changed">Changed</h3>
 <h3 id="fixed">Fixed</h3>
 <ul>
 <li>[irrigationSystem]: Remove the non-functional <code>singleZone</code> option; single-zone systems must now use <code>addZone</code> like any other zone.</li>
+<li>[microwaveOven]: Use the <code>PowerAsNumber</code> and <code>PowerNumberLimits</code> features instead of <code>PowerInWatts</code> for the <code>MicrowaveOvenControl</code> cluster, and handle the <code>PowerSetting</code> field in <code>SetCookingParameters</code> accordingly.</li>
 </ul>
 <p><a href="https://www.buymeacoffee.com/luligugithub"><img src="https://matterbridge.io/assets/bmc-button.svg" alt="Buy me a coffee" width="80"></a></p>
 <h2 id="3104-2026-08-07">[3.10.4] - 2026-08-07</h2>

packages/core/src/devices/microwaveOven.ts

@@ -49,8 +49,10 @@ export class MicrowaveOven extends MatterbridgeEndpoint {
    * @param {string} serial - The serial number of the microwave oven.
    * @param {number} currentMode - The current mode of the microwave oven. Default is 1 = Auto.
    * @param {MicrowaveOvenMode.ModeOption[]} supportedModes - The supported modes of the microwave oven. Default is an array of all modes.
-   * @param {number} selectedWattIndex - The selected wattage index. Default is 5 (600W).
-   * @param {number[]} supportedWatts - The supported wattages. Default is an array of all standard microwave wattages.
+   * @param {number} powerSetting - The power level associated with the operation of the device. Default is 100.
+   * @param {number} minPower - The minimum value to which the PowerSetting attribute can be set. Default is 10.
+   * @param {number} maxPower - The maximum value to which the PowerSetting attribute can be set. Default is 100.
+   * @param {number} powerStep - The increment of power that can be set on the server. Default is 10.
    * @param {number} cookTime - The initial cook time in seconds. Default is 60 seconds.
    * @param {number} maxCookTime - The maximum cook time in seconds. Default is 3600 seconds (1 hour).
    *
@@ -72,8 +74,10 @@ export class MicrowaveOven extends MatterbridgeEndpoint {
       { label: 'Normal', mode: 6, modeTags: [{ value: MicrowaveOvenMode.ModeTag.Normal }] },
       { label: 'Defrost', mode: 7, modeTags: [{ value: MicrowaveOvenMode.ModeTag.Defrost }] },
     ],
-    selectedWattIndex: number = 5,
-    supportedWatts: number[] = [100, 200, 300, 400, 500, 600, 700, 800, 900, 1000],
+    powerSetting: number = 100,
+    minPower: number = 10,
+    maxPower: number = 100,
+    powerStep: number = 10,
     cookTime: number = 60, // 1 minute
     maxCookTime: number = 3600, // 1 hour
   ) {
@@ -83,7 +87,7 @@ export class MicrowaveOven extends MatterbridgeEndpoint {
     this.createDefaultPowerSourceWiredClusterServer();
     this.createDefaultOperationalStateClusterServer(OperationalState.OperationalStateEnum.Stopped);
     this.createDefaultMicrowaveOvenModeClusterServer(currentMode, supportedModes);
-    this.createDefaultMicrowaveOvenControlClusterServer(selectedWattIndex, supportedWatts, cookTime, maxCookTime);
+    this.createDefaultMicrowaveOvenControlClusterServer(powerSetting, minPower, maxPower, powerStep, cookTime, maxCookTime);
   }
 
   /**
@@ -114,22 +118,26 @@ export class MicrowaveOven extends MatterbridgeEndpoint {
   /**
    * Creates a default MicrowaveOvenControl Cluster Server.
    *
-   * @param {number} selectedWattIndex - The selected watt index.
-   * @param {number[]} supportedWatts - The supported watt values.
+   * @param {number} powerSetting - The power level associated with the operation of the device.
+   * @param {number} minPower - The minimum value to which the PowerSetting attribute can be set.
+   * @param {number} maxPower - The maximum value to which the PowerSetting attribute can be set.
+   * @param {number} powerStep - The increment of power that can be set on the server.
    * @param {number} cookTime - The initial cook time.
    * @param {number} maxCookTime - The maximum cook time.
    *
    * @returns {this} The current MatterbridgeEndpoint instance for chaining.
    *
    * @remarks
    * - 8.13. Microwave Oven Control Cluster
-   * - the supported watt values are fixed and cannot be changed at runtime.
+   * - minPower, maxPower and powerStep are fixed attributes and cannot be changed at runtime.
    * - the maxCookTime is a fixed attribute and cannot be changed at runtime.
    */
-  createDefaultMicrowaveOvenControlClusterServer(selectedWattIndex: number, supportedWatts: number[], cookTime: number, maxCookTime: number): this {
-    this.behaviors.require(MatterbridgeMicrowaveOvenControlServer.with(MicrowaveOvenControl.Feature.PowerInWatts), {
-      supportedWatts, // Fixed attribute
-      selectedWattIndex,
+  createDefaultMicrowaveOvenControlClusterServer(powerSetting: number, minPower: number, maxPower: number, powerStep: number, cookTime: number, maxCookTime: number): this {
+    this.behaviors.require(MatterbridgeMicrowaveOvenControlServer.with(MicrowaveOvenControl.Feature.PowerAsNumber, MicrowaveOvenControl.Feature.PowerNumberLimits), {
+      powerSetting,
+      minPower, // Fixed attribute
+      maxPower, // Fixed attribute
+      powerStep, // Fixed attribute
       cookTime,
       maxCookTime, // Fixed attribute
     });
@@ -140,7 +148,10 @@ export class MicrowaveOven extends MatterbridgeEndpoint {
 /**
  * Matterbridge Microwave Oven Control Server
  */
-export class MatterbridgeMicrowaveOvenControlServer extends MicrowaveOvenControlServer.with(MicrowaveOvenControl.Feature.PowerInWatts) {
+export class MatterbridgeMicrowaveOvenControlServer extends MicrowaveOvenControlServer.with(
+  MicrowaveOvenControl.Feature.PowerAsNumber,
+  MicrowaveOvenControl.Feature.PowerNumberLimits,
+) {
   /**
    * Initializes the server.
    */
@@ -187,13 +198,13 @@ export class MatterbridgeMicrowaveOvenControlServer extends MicrowaveOvenControl
       this.state.cookTime = 30;
     }
 
-    // 8.13.6.2.4. WattSettingIndex Field. Default the highest Watt setting for the selected CookMode.
-    if (request.wattSettingIndex !== undefined && request.wattSettingIndex >= 0 && request.wattSettingIndex < this.state.supportedWatts.length) {
-      device.log.info(`MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting selectedWattIndex to ${request.wattSettingIndex}`);
-      this.state.selectedWattIndex = request.wattSettingIndex;
+    // 8.13.6.2.3. PowerSetting Field. Default to MaxPower if not present.
+    if (request.powerSetting !== undefined && request.powerSetting >= this.state.minPower && request.powerSetting <= this.state.maxPower) {
+      device.log.info(`MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting powerSetting to ${request.powerSetting}`);
+      this.state.powerSetting = request.powerSetting;
     } else {
-      device.log.info(`MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no wattSettingIndex so set to the highest Watt setting for the selected CookMode`);
-      this.state.selectedWattIndex = this.state.supportedWatts.length - 1;
+      device.log.info(`MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no powerSetting so set to maxPower`);
+      this.state.powerSetting = this.state.maxPower;
     }
 
     // 8.13.6.2.5. StartAfterSetting Field. Default to false.

packages/core/vitest/devices/microwaveOven.test.ts

@@ -148,14 +148,16 @@ describe('Matterbridge ' + NAME, () => {
         'identify(0x3).identifyTime(0x0)=0',
         'identify(0x3).identifyType(0x1)=0',
         'microwaveOvenControl(0x5f).acceptedCommandList(0xfff9)=[ 0, 1 ]',
-        'microwaveOvenControl(0x5f).attributeList(0xfffb)=[ 0, 1, 6, 7, 65528, 65529, 65531, 65532, 65533 ]',
+        'microwaveOvenControl(0x5f).attributeList(0xfffb)=[ 0, 1, 2, 3, 4, 5, 65528, 65529, 65531, 65532, 65533 ]',
         'microwaveOvenControl(0x5f).clusterRevision(0xfffd)=1',
         'microwaveOvenControl(0x5f).cookTime(0x0)=60',
-        'microwaveOvenControl(0x5f).featureMap(0xfffc)={ powerAsNumber: false, powerInWatts: true, powerNumberLimits: false }',
+        'microwaveOvenControl(0x5f).featureMap(0xfffc)={ powerAsNumber: true, powerInWatts: false, powerNumberLimits: true }',
         'microwaveOvenControl(0x5f).generatedCommandList(0xfff8)=[  ]',
         'microwaveOvenControl(0x5f).maxCookTime(0x1)=3600',
-        'microwaveOvenControl(0x5f).selectedWattIndex(0x7)=5',
-        'microwaveOvenControl(0x5f).supportedWatts(0x6)=[ 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000 ]',
+        'microwaveOvenControl(0x5f).maxPower(0x4)=100',
+        'microwaveOvenControl(0x5f).minPower(0x3)=10',
+        'microwaveOvenControl(0x5f).powerSetting(0x2)=100',
+        'microwaveOvenControl(0x5f).powerStep(0x5)=10',
         'microwaveOvenMode(0x5e).acceptedCommandList(0xfff9)=[  ]',
         'microwaveOvenMode(0x5e).attributeList(0xfffb)=[ 0, 1, 65528, 65529, 65531, 65532, 65533 ]',
         'microwaveOvenMode(0x5e).clusterRevision(0xfffd)=2',
@@ -210,61 +212,49 @@ describe('Matterbridge ' + NAME, () => {
     await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', {});
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no cookMode so set to Normal`);
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no cookTime so set to 30sec.`);
-    expect(loggerLogSpy).toHaveBeenCalledWith(
-      LogLevel.INFO,
-      `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no wattSettingIndex so set to the highest Watt setting for the selected CookMode`,
-    );
+    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no powerSetting so set to maxPower`);
 
     // Test setCookingParameters - valid cookMode only
     vi.clearAllMocks();
     await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookMode: 2 });
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting cookMode to 2`);
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no cookTime so set to 30sec.`);
-    expect(loggerLogSpy).toHaveBeenCalledWith(
-      LogLevel.INFO,
-      `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no wattSettingIndex so set to the highest Watt setting for the selected CookMode`,
-    );
+    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no powerSetting so set to maxPower`);
 
-    // Test setCookingParameters - no cookMode provided but valid cookTime and wattSettingIndex
+    // Test setCookingParameters - no cookMode provided but valid cookTime and powerSetting
     vi.clearAllMocks();
-    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookTime: 120, wattSettingIndex: 3 });
+    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookTime: 120, powerSetting: 30 });
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no cookMode so set to Normal`);
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting cookTime to 120`);
-    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting selectedWattIndex to 3`);
+    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting powerSetting to 30`);
 
     // Test setCookingParameters - invalid cookTime (<0) -> default to 30sec
     vi.clearAllMocks();
-    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookMode: 7, cookTime: -5, wattSettingIndex: 0 });
+    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookMode: 7, cookTime: -5, powerSetting: 10 });
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting cookMode to 7`);
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no cookTime so set to 30sec.`);
-    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting selectedWattIndex to 0`);
+    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting powerSetting to 10`);
 
     // Test setCookingParameters - cookTime > maxCookTime -> default to 30sec
     vi.clearAllMocks();
     await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookTime: 5000 });
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no cookMode so set to Normal`);
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no cookTime so set to 30sec.`);
-    expect(loggerLogSpy).toHaveBeenCalledWith(
-      LogLevel.INFO,
-      `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no wattSettingIndex so set to the highest Watt setting for the selected CookMode`,
-    );
+    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no powerSetting so set to maxPower`);
 
-    // Test setCookingParameters - invalid wattSettingIndex (out of range) -> default to highest supported index
+    // Test setCookingParameters - invalid powerSetting (out of range) -> default to maxPower
     vi.clearAllMocks();
-    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookMode: 3, cookTime: 45, wattSettingIndex: 100 });
+    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookMode: 3, cookTime: 45, powerSetting: 150 });
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting cookMode to 3`);
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting cookTime to 45`);
-    expect(loggerLogSpy).toHaveBeenCalledWith(
-      LogLevel.INFO,
-      `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no wattSettingIndex so set to the highest Watt setting for the selected CookMode`,
-    );
+    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called with no powerSetting so set to maxPower`);
 
     // Test setCookingParameters - all valid values
     vi.clearAllMocks();
-    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookMode: 4, cookTime: 90, wattSettingIndex: 2 });
+    await device.invokeBehaviorCommand('microwaveOvenControl', 'setCookingParameters', { cookMode: 4, cookTime: 90, powerSetting: 50 });
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting cookMode to 4`);
     expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting cookTime to 90`);
-    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting selectedWattIndex to 2`);
+    expect(loggerLogSpy).toHaveBeenCalledWith(LogLevel.INFO, `MatterbridgeMicrowaveOvenControlServer: setCookingParameters called setting powerSetting to 50`);
 
     // Test setCookingParameters - startAfterSetting false (no change expected)
     vi.clearAllMocks();