Reverts MoveToLevel workaround from 0.11.4 (#1389)

project-chip · Nov 12, 2024 · eb222f7 · eb222f7
1 parent 34a59c5
commit eb222f7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,18 +13,21 @@ The main work (all changes without a GitHub username in brackets in the below li
 
 -   @matter/node
     - Enhancement: The `with` functions on endpoint and cluster behavior types now alias to `withBehaviors` and `withFeatures` respectively to make their function more explicit
-    - Fix: Trigger CommissioningServer#initiateCommissioning when server restarts outside of factory reset
+    - Fix: Triggers CommissioningServer#initiateCommissioning when server restarts outside of factory reset
 
 -   @matter/nodejs
     - Feature: New export @matter/nodejs/config allows for fine-grained configuration of Node.js bootstrap logic
 
 -   @matter/create
-    - Feature: Add command line option "--verbose" to enable informational NPM messages during initialization
-    - Feature: Add template "contributor" to bootstrap dev environment for working on matter.js itself
+    - Feature: Added command line option "--verbose" to enable informational NPM messages during initialization
+    - Feature: Added template "contributor" to bootstrap dev environment for working on matter.js itself
 
 -   @matter/tools
     - Multi-project test runs now use a single process to improve performance
 
+-   Matter cluster definitions and implementations
+    - Fix: Reverts MoveToLevel workaround from 0.11.4
+
 -   matter.js git repository
     - Feature: We've added project configuration for VS code including recommended extensions, code snippets and launch configurations
 

diff --git a/models/src/local/LevelControlOverrides.ts b/models/src/local/LevelControlOverrides.ts
@@ -16,17 +16,5 @@ LocalMatter.children.push({
         { tag: "command", id: 5, name: "MoveWithOnOff", type: "Move" },
         { tag: "command", id: 6, name: "StepWithOnOff", type: "Step" },
         { tag: "command", id: 7, name: "StopWithOnOff", type: "Stop" },
-
-        // Temporarily declare OptionsMask as optional fields because current matter sdk implementation handles
-        // them optionally. Might be adjusted back once clarified in detail
-        {
-            tag: "command",
-            id: 0,
-            name: "MoveToLevel",
-            children: [
-                { tag: "field", id: 2, name: "OptionsMask", conformance: "O" },
-                { tag: "field", id: 3, name: "OptionsOverride", conformance: "O" },
-            ],
-        },
     ],
 });
diff --git a/packages/model/src/standard/elements/LevelControl.ts b/packages/model/src/standard/elements/LevelControl.ts
diff --git a/packages/node/src/behaviors/level-control/LevelControlServer.ts b/packages/node/src/behaviors/level-control/LevelControlServer.ts
@@ -137,7 +137,7 @@ export class LevelControlServerLogic extends LevelControlLogicBase {
      * If you want to implement own logic just override {@link moveToLevelLogic} with is also used for {@link moveToLevelWithOnOff}.
      */
     override moveToLevel({ level, transitionTime, optionsMask, optionsOverride }: LevelControl.MoveToLevelRequest) {
-        const effectiveOptions = this.#calculateEffectiveOptions(optionsMask ?? {}, optionsOverride ?? {});
+        const effectiveOptions = this.#calculateEffectiveOptions(optionsMask, optionsOverride);
         if (!this.#optionsAllowExecution(effectiveOptions)) {
             return;
         }

diff --git a/packages/types/src/clusters/level-control.ts b/packages/types/src/clusters/level-control.ts