Updated logic to schedulelambda from apptask and remove unnessary chiplocks

Author: sabollim-silabs

examples/closure-app/silabs/include/ClosureManager.h

@@ -156,14 +156,6 @@ class ClosureManager
      */
     const Action_t & GetCurrentAction() const { return mCurrentAction; }
 
-    /**
-     * @brief Retrieves the complete current state of the closure control endpoint.
-     *
-     * @param currentState Reference to store the retrieved current state.
-     * @return CHIP_ERROR Returns CHIP_NO_ERROR on success, or an error code if retrieval fails.
-     */
-    CHIP_ERROR GetClosureControlCurrentState(
-        chip::app::DataModel::Nullable<chip::app::Clusters::ClosureControl::GenericOverallCurrentState> & currentState);
 
     /**
      * @brief Checks if a MoveTo action is currently in progress.
@@ -172,6 +164,16 @@ class ClosureManager
      */
     bool IsClosureControlMotionInProgress() const;
 
+    /**
+     * @brief Gets the ClosureControlEndpoint logic for direct access.
+     *
+     * This allows direct access to the cluster logic methods (e.g., HandleMoveTo)
+     * when called from chip task context (e.g., via ScheduleWork).
+     *
+     * @return Reference to the ClosureControlEndpoint logic.
+     */
+    chip::app::Clusters::ClosureControl::ClusterLogic & GetClosureControlLogic() { return mClosureEndpoint1.GetLogic(); }
+
     /**
      * @brief Sets the initial state for the ClosureControlEndpoint.
      *

examples/closure-app/silabs/src/AppTask.cpp

@@ -154,66 +154,75 @@ void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
 
 void AppTask::ClosureButtonActionEventHandler(AppEvent * aEvent)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
     if (aEvent->Type == AppEvent::kEventType_Button)
     {
-        // Check if an action is already in progress
-        if (ClosureManager::GetInstance().IsClosureControlMotionInProgress())
-        {
-            // Stop the current action
-            auto status = ClosureManager::GetInstance().OnStopCommand();
-            if (status != Protocols::InteractionModel::Status::Success)
+        // Schedule work on the chip stack thread to ensure all CHIP API calls are safe
+        chip::DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) {
+            // Check if an action is already in progress
+            if (ClosureManager::GetInstance().IsClosureControlMotionInProgress())
             {
-                ChipLogError(AppServer, "Failed to stop closure action");
+                // Stop the current action
+                auto status = ClosureManager::GetInstance().GetClosureControlLogic().HandleStop();
+                if (status != Protocols::InteractionModel::Status::Success)
+                {
+                    ChipLogError(AppServer, "Failed to stop closure action: %u", to_underlying(status));
+                }
             }
-        }
-        else
-        {
-            // Fetch the complete current state of closure with proper locking
-            chip::DeviceLayer::PlatformMgr().LockChipStack();
-            DataModel::Nullable<ClosureControl::GenericOverallCurrentState> currentState;
-            CHIP_ERROR err = ClosureManager::GetInstance().GetClosureControlCurrentState(currentState);
-            chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-
-            if (err != CHIP_NO_ERROR || currentState.IsNull() || !currentState.Value().position.HasValue() ||
-                currentState.Value().position.Value().IsNull())
+            else
             {
-                ChipLogError(AppServer, "Failed to get current closure state");
-                return;
-            }
-
-            // Get current position and determine target position (toggle)
-            auto currentPosition = currentState.Value().position.Value().Value();
-            ClosureControl::TargetPositionEnum targetPosition =
+                DataModel::Nullable<ClosureControl::GenericOverallCurrentState> currentState;
+                CHIP_ERROR err = ClosureManager::GetInstance().GetClosureControlLogic().GetOverallCurrentState(currentState);
+
+                if (err != CHIP_NO_ERROR)
+                {
+                    ChipLogError(AppServer, "Failed to get current closure state: %s", chip::ErrorStr(err));
+                    return;
+                }
+                if (currentState.IsNull())
+                {
+                    ChipLogError(AppServer, "Failed to get current closure state: currentState is null");
+                    return;
+                }
+                if (!currentState.Value().position.HasValue() || currentState.Value().position.Value().IsNull())
+                {
+                    ChipLogError(AppServer, "Failed to get current closure state: position is null");
+                    return;
+                }
+
+                // Get current position and determine target position (toggle)
+                auto currentPosition = currentState.Value().position.Value().Value();
+                ChipLogProgress(AppServer, "Current state - Position: %d", to_underlying(currentPosition));
+
+                ClosureControl::TargetPositionEnum targetPosition =
                 (currentPosition == ClosureControl::CurrentPositionEnum::kFullyOpened)
                 ? ClosureControl::TargetPositionEnum::kMoveToFullyClosed
                 : ClosureControl::TargetPositionEnum::kMoveToFullyOpen;
-
-            // Get latch and speed from current state to preserve them in target state
-            Optional<bool> latch = chip::NullOptional;
-            if (currentState.Value().latch.HasValue() && !currentState.Value().latch.Value().IsNull())
-            {
-                latch = MakeOptional(currentState.Value().latch.Value().Value());
-            }
-
-            Optional<Globals::ThreeLevelAutoEnum> speed = NullOptional;
-            if (currentState.Value().speed.HasValue())
-            {
-                speed = chip::MakeOptional(currentState.Value().speed.Value());
+                ChipLogProgress(AppServer, "Target position: %d", to_underlying(targetPosition));
+                
+                Optional<bool> latch = chip::NullOptional;
+                if (currentState.Value().latch.HasValue() && !currentState.Value().latch.Value().IsNull())
+                {
+                    latch = MakeOptional(false);
+                }
+
+                Optional<Globals::ThreeLevelAutoEnum> speed = NullOptional;
+                if (currentState.Value().speed.HasValue())
+                {
+                    speed = chip::MakeOptional(currentState.Value().speed.Value());
+                }
+
+                // Move to the target position with latch set to false and preserved speed value
+                auto status = ClosureManager::GetInstance().GetClosureControlLogic().HandleMoveTo(
+                    MakeOptional(targetPosition), latch, speed);
+                if (status != Protocols::InteractionModel::Status::Success)
+                {
+                    ChipLogError(AppServer, "Failed to move closure to target position: %u", to_underlying(status));
+                }
             }
-
-            // Move to the target position with preserved latch and speed values
-            auto status = ClosureManager::GetInstance().OnMoveToCommand(MakeOptional(targetPosition), latch, speed);
-            if (status != Protocols::InteractionModel::Status::Success)
-            {
-                ChipLogError(AppServer, "Failed to move closure to target position");
-            }
-        }
+        }, 0);
     }
     else
     {
-        err = APP_ERROR_UNHANDLED_EVENT;
         ChipLogError(AppServer, "Unhandled event type in ClosureButtonActionEventHandler");
     }
 }

examples/closure-app/silabs/src/ClosureManager.cpp

@@ -632,26 +632,20 @@ chip::Protocols::InteractionModel::Status ClosureManager::OnMoveToCommand(const
         }
     }
 
-    // Lock the chip stack before calling SetTargetState to prevent assertion failures
-    DeviceLayer::PlatformMgr().LockChipStack();
-
     if (mClosurePanelEndpoint2.GetLogic().SetTargetState(DataModel::MakeNullable(mClosurePanelEndpoint2Target)) != CHIP_NO_ERROR)
     {
-        DeviceLayer::PlatformMgr().UnlockChipStack();
         ChipLogError(AppServer, "Failed to set target for Endpoint 2");
         return Status::Failure;
     }
 
     if (mClosurePanelEndpoint3.GetLogic().SetTargetState(DataModel::MakeNullable(mClosurePanelEndpoint3Target)) != CHIP_NO_ERROR)
     {
-        DeviceLayer::PlatformMgr().UnlockChipStack();
         ChipLogError(AppServer, "Failed to set target for Endpoint 3");
         return Status::Failure;
     }
 
     if (mClosureEndpoint1.GetLogic().SetCountdownTimeFromDelegate(kDefaultCountdownTimeSeconds) != CHIP_NO_ERROR)
     {
-        DeviceLayer::PlatformMgr().UnlockChipStack();
         ChipLogError(AppServer, "Failed to set countdown time for move to command on Endpoint 1");
         return Status::Failure;
     }
@@ -668,7 +662,6 @@ chip::Protocols::InteractionModel::Status ClosureManager::OnMoveToCommand(const
         SetCurrentAction(MOVE_TO_ACTION);
     }
     mIsMoveToInProgress = true;
-    DeviceLayer::PlatformMgr().UnlockChipStack();
 
     // Post an event to initiate the move to action asynchronously.
     // MoveTo Command can only be initiated from Closure Control Endpoint (Endpoint 1).
@@ -827,18 +820,13 @@ chip::Protocols::InteractionModel::Status ClosureManager::OnSetTargetCommand(con
                                                                              const Optional<Globals::ThreeLevelAutoEnum> & speed,
                                                                              const chip::EndpointId endpointId)
 {
-    // Lock chip stack to safely access cluster state
-    DeviceLayer::PlatformMgr().LockChipStack();
-
     MainStateEnum mClosureEndpoint1MainState;
     if (mClosureEndpoint1.GetLogic().GetMainState(mClosureEndpoint1MainState) != CHIP_NO_ERROR)
     {
-        DeviceLayer::PlatformMgr().UnlockChipStack();
         ChipLogError(AppServer, "Failed to get main state for SetTarget command on Endpoint 1");
         return Status::Failure;
     }
 
-    DeviceLayer::PlatformMgr().UnlockChipStack();
 
     // If this command is received while the MainState attribute is currently either in Disengaged, Protected, Calibrating,
     //  SetupRequired or Error, then a status code of INVALID_IN_STATE shall be returned.
@@ -1315,12 +1303,6 @@ bool ClosureManager::GetPanelNextPosition(const GenericDimensionStateStruct & cu
     }
     return true;
 }
-
-CHIP_ERROR ClosureManager::GetClosureControlCurrentState(DataModel::Nullable<GenericOverallCurrentState> & currentState)
-{
-    return mClosureEndpoint1.GetLogic().GetOverallCurrentState(currentState);
-}
-
 bool ClosureManager::IsClosureControlMotionInProgress() const
 {
     return mIsMoveToInProgress;