Handle review comments

Author: arun-silabs

examples/oven-app/oven-app-common/include/CookSurfaceEndpoint.h

@@ -42,6 +42,14 @@ class CookSurfaceEndpoint
     /**
      * @brief Gets the current On/Off state from server.
      * @param state Reference to store the current On/Off state.
+     *
+     * Note: This helper reads the OnOff attribute from the CHIP attribute storage and
+     * therefore must be invoked from the CHIP/DeviceLayer task context or while holding
+     * the CHIP stack lock (DeviceLayer::PlatformMgr().LockChipStack()). Calling this
+     * API from an arbitrary thread can cause asserts / crashes in the CHIP stack.
+     * If you are not in the CHIP task, schedule work onto the CHIP task using
+     * PlatformMgr().ScheduleWork(...) and call this helper from there.
+     *
      * @return Returns Status::Success on success, or an error code on failure.
      */
 
@@ -50,6 +58,14 @@ class CookSurfaceEndpoint
     /**
      * @brief Set On/Off state for the CookSurface.
      * @param state Desired On/Off state.
+     * 
+     * Note: This helper writes the OnOff attribute to the CHIP attribute storage and
+     * therefore must be invoked from the CHIP/DeviceLayer task context or while holding
+     * the CHIP stack lock (DeviceLayer::PlatformMgr().LockChipStack()). Calling this
+     * API from an arbitrary thread can cause asserts / crashes in the CHIP stack.
+     * If you are not in the CHIP task, schedule work onto the CHIP task using
+     * PlatformMgr().ScheduleWork(...) and call this helper from there.
+     * 
      * @return Returns Status::Success on success, or an error code on failure.
      */
     chip::Protocols::InteractionModel::Status SetOnOffState(bool state);

examples/oven-app/oven-app-common/include/CookTopEndpoint.h

@@ -41,6 +41,14 @@ class CookTopEndpoint
     /**
      * @brief Set On/Off state for the CookSurface.
      * @param state Desired On/Off state.
+     *
+     * Note: This helper writes the OnOff attribute to the CHIP attribute storage and
+     * therefore must be invoked from the CHIP/DeviceLayer task context or while holding
+     * the CHIP stack lock (DeviceLayer::PlatformMgr().LockChipStack()). Calling this
+     * API from an arbitrary thread can cause asserts / crashes in the CHIP stack.
+     * If you are not in the CHIP task, schedule work onto the CHIP task using
+     * PlatformMgr().ScheduleWork(...) and call this helper from there.
+     * 
      * @return Returns Status::Success on success, or an error code on failure.
      */
     chip::Protocols::InteractionModel::Status SetOnOffState(bool state);

examples/oven-app/silabs/include/AppEvent.h

@@ -29,6 +29,7 @@ struct AppEvent : public BaseAppEvent
         kEventType_CookTop,
         kEventType_CookSurface,
         kEventType_Install,
+        kEventType_UIUpdate,
     };
 
     union

examples/oven-app/silabs/include/AppTask.h

@@ -82,22 +82,10 @@ class AppTask : public BaseApplication
 private:
     static AppTask sAppTask;
 
-    static void ActionInitiated(OvenManager::Action_t aAction, int32_t aActor, uint8_t * value);
-    static void ActionCompleted(OvenManager::Action_t aAction);
-
     /**
      * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
     CHIP_ERROR AppInit() override;
-
-    /**
-     * @brief PB0 Button event processing function
-     *        Press and hold will trigger a factory reset timer start
-     *        Press and release will restart BLEAdvertising if not commissioned
-     *
-     * @param aEvent button event being processed
-     */
-    static void ButtonHandler(AppEvent * aEvent);
 };

examples/oven-app/silabs/include/OvenManager.h

@@ -43,35 +43,15 @@
 
 class OvenManager
 {
-public:
-    enum Action_t
-    {
-        ON_ACTION = 0,
-        OFF_ACTION,
-
-        INVALID_ACTION
-    } Action;
 
+public:
     enum State_t
     {
-        kCookTopState_OffInitiated = 0,
-        kCookTopState_OffCompleted,
-        kCookTopState_OnInitiated,
-        kCookTopState_OnCompleted,
-
-        // Cook Surface states
-        kCookSurfaceState_OffInitiated,
-        kCookSurfaceState_OffCompleted,
-        kCookSurfaceState_OnInitiated,
-        kCookSurfaceState_OnCompleted,
-        kCookSurfaceState_ActionInProgress,
-        kCookSurfaceState_NoAction,
-    } State;
-
-    bool InitiateAction(int32_t aActor, Action_t aAction, uint8_t * aValue, chip::EndpointId endpointId = kCookTopEndpoint);
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor, uint8_t * value);
-    typedef void (*Callback_fn_completed)(Action_t);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
+        kCookTopState_Off = 0,
+        kCookTopState_On,
+        kCookSurfaceState_Off,
+        kCookSurfaceState_On
+    };
 
     /**
      * @brief Initializes the OvenManager and its associated resources.
@@ -152,10 +132,12 @@ class OvenManager
     State_t mCookSurfaceState1;
     State_t mCookSurfaceState2;
 
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    static void ActuatorMovementHandler(AppEvent * aEvent);
+    /**
+     * @brief Updates the oven hardware state and UI (LEDs, LCD) in response to an event.
+     *
+     * @param aEvent Pointer to the event structure.
+     */
+    static void OvenActionHandler(AppEvent * aEvent);
 
     // Define the endpoint ID for the Oven
     static constexpr chip::EndpointId kOvenEndpoint                         = 1;

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

@@ -72,7 +72,6 @@ CHIP_ERROR AppTask::AppInit()
 
     // Initialization of Oven Manager and endpoints of oven.
     OvenManager::GetInstance().Init();
-    OvenManager::GetInstance().SetCallbacks(ActionInitiated, ActionCompleted);
 // Update the LCD with the Stored value. Show QR Code if not provisioned
 #ifdef DISPLAY_ENABLED
     GetLCD().WriteDemoUI(false);
@@ -130,47 +129,3 @@ void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
     AppTask::GetAppTask().PostEvent(&button_event);
 }
 
-void AppTask::ActionInitiated(OvenManager::Action_t aAction, int32_t aActor, uint8_t * aValue)
-{
-    if (aActor == AppEvent::kEventType_CookTop)
-    {
-        bool lightOn = aAction == OvenManager::ON_ACTION;
-        ChipLogProgress(AppServer, "Turning CookTop %s", (lightOn) ? "On" : "Off");
-
-        // TODO: Update LED state
-
-#ifdef DISPLAY_ENABLED
-        sAppTask.GetLCD().WriteDemoUI(lightOn);
-#endif
-    }
-
-    if (aActor == AppEvent::kEventType_CookSurface)
-    {
-        bool lightOn = aAction == OvenManager::ON_ACTION;
-        ChipLogProgress(AppServer, "Turning CookSurface %s", (lightOn) ? "On" : "Off");
-    }
-
-    if (aActor == AppEvent::kEventType_Button)
-    {
-        sAppTask.mSyncClusterToButtonAction = true;
-    }
-}
-
-void AppTask::ActionCompleted(OvenManager::Action_t aAction)
-{
-    // Action has been completed on the oven
-    if (aAction == OvenManager::ON_ACTION)
-    {
-        ChipLogProgress(AppServer, "ON action completed");
-    }
-    else if (aAction == OvenManager::OFF_ACTION)
-    {
-        ChipLogProgress(AppServer, "OFF action completed");
-    }
-
-    if (sAppTask.mSyncClusterToButtonAction)
-    {
-        // TODO: Schedule work to Update CookTop and CookSurfaceEndpoints (turn on/off)
-        sAppTask.mSyncClusterToButtonAction = false;
-    }
-}