[LevelControl] Level Control Recall null level behavior (#30554)

* Fixed behavior of the RecallScene for the Default scene handler in the level control cluster * Added explicit check for null value instead of relying on movetoLevel
project-chip · Mar 26, 2024 · 1295144 · 1295144
1 parent c6f0520
commit 1295144
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
@@ -238,17 +238,15 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl
 
         // TODO : Implement action on frequency when frequency not provisional anymore
         // if(LevelControlHasFeature(endpoint, LevelControl::Feature::kFrequency)){}
-        Status status;
-        CommandId command = LevelControlHasFeature(endpoint, LevelControl::Feature::kOnOff) ? Commands::MoveToLevelWithOnOff::Id
-                                                                                            : Commands::MoveToLevel::Id;
 
-        status = moveToLevelHandler(endpoint, command, level, app::DataModel::MakeNullable(static_cast<uint16_t>(timeMs / 100)),
-                                    chip::Optional<BitMask<OptionsBitmap>>(), chip::Optional<BitMask<OptionsBitmap>>(),
-                                    INVALID_STORED_LEVEL);
-
-        if (status != Status::Success)
+        if (!chip::app::NumericAttributeTraits<uint8_t>::IsNullValue(level))
         {
-            return CHIP_ERROR_READ_FAILED;
+            CommandId command = LevelControlHasFeature(endpoint, LevelControl::Feature::kOnOff) ? Commands::MoveToLevelWithOnOff::Id
+                                                                                                : Commands::MoveToLevel::Id;
+
+            moveToLevelHandler(endpoint, command, level, app::DataModel::MakeNullable(static_cast<uint16_t>(timeMs / 100)),
+                               chip::Optional<BitMask<OptionsBitmap>>(), chip::Optional<BitMask<OptionsBitmap>>(),
+                               INVALID_STORED_LEVEL);
         }
 
         return CHIP_NO_ERROR;