Address review comments

Author: arun-silabs

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

@@ -40,15 +40,19 @@ class CookSurfaceEndpoint
     CHIP_ERROR Init();
 
     /**
-     * @brief Returns the current On/Off state.
+     * @brief Gets the current On/Off state from server.
+     * @param state Reference to store the current On/Off state.
+     * @return Returns Status::Success on success, or an error code on failure.
      */
 
-    bool GetOnOffState();
+    chip::Protocols::InteractionModel::Status GetOnOffState(bool &state);
 
     /**
      * @brief Set On/Off state for the CookSurface.
+     * @param state Desired On/Off state.
+     * @return Returns Status::Success on success, or an error code on failure.
      */
-    void SetOnOffState(bool state);
+    chip::Protocols::InteractionModel::Status SetOnOffState(bool state);
 
     EndpointId GetEndpointId() const { return mEndpointId; }
 

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

@@ -39,9 +39,11 @@ class CookTopEndpoint
     CHIP_ERROR Init();
 
     /**
-     * @brief Handle the "off" command for the cooktop.
+     * @brief Set On/Off state for the CookSurface.
+     * @param state Desired On/Off state.
+     * @return Returns Status::Success on success, or an error code on failure.
      */
-    void SetOnOffState(bool state);
+    chip::Protocols::InteractionModel::Status SetOnOffState(bool state);
 
 private:
     bool currentOnOffState = false;

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

@@ -57,8 +57,13 @@ class OvenModeDelegate : public ModeBase::Delegate
     CHIP_ERROR GetModeValueByIndex(uint8_t modeIndex, uint8_t & value) override;
     CHIP_ERROR GetModeTagsByIndex(uint8_t modeIndex, DataModel::List<detail::Structs::ModeTagStruct::Type> & tags) override;
 
-    // Public helper to query support status without exposing internal tables
-    static bool IsSupportedMode(uint8_t mode);
+    /**
+     * @brief Checks if the provided mode is supported.
+     *
+     * @param mode The mode to check.
+     * @return true if the mode is supported, false otherwise.
+     */
+    bool IsSupportedMode(uint8_t mode);
 
 private:
     EndpointId mEndpointId;

examples/oven-app/oven-app-common/src/CookSurfaceEndpoint.cpp

@@ -26,24 +26,22 @@ using namespace chip::app::Clusters::CookSurface;
 
 CHIP_ERROR CookSurfaceEndpoint::Init()
 {
-    bool state = false;
-    OnOffServer::Instance().getOnOffValue(mEndpointId, &state);
     return CHIP_NO_ERROR;
 }
 
-bool CookSurfaceEndpoint::GetOnOffState()
+chip::Protocols::InteractionModel::Status CookSurfaceEndpoint::GetOnOffState(bool &state)
 {
-    bool state = false;
-    OnOffServer::Instance().getOnOffValue(mEndpointId, &state);
-    return state;
+    auto status = OnOffServer::Instance().getOnOffValue(mEndpointId, &state);
+    VerifyOrReturnValue(status == Protocols::InteractionModel::Status::Success, status, 
+                        ChipLogError(AppServer, "ERR: reading on/off %x", to_underlying(status)));
+    return status;
 }
 
-void CookSurfaceEndpoint::SetOnOffState(bool state)
+chip::Protocols::InteractionModel::Status CookSurfaceEndpoint::SetOnOffState(bool state)
 {
     CommandId commandId = state ? OnOff::Commands::On::Id : OnOff::Commands::Off::Id;
     auto status         = OnOffServer::Instance().setOnOffValue(mEndpointId, commandId, false);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(AppServer, "ERR: updating on/off %x", to_underlying(status));
-    }
+    VerifyOrReturnValue(status == Protocols::InteractionModel::Status::Success, status, 
+                        ChipLogError(AppServer, "ERR: updating on/off %x", to_underlying(status)));
+    return status;
 }

examples/oven-app/oven-app-common/src/CookTopEndpoint.cpp

@@ -27,13 +27,11 @@ CHIP_ERROR CookTopEndpoint::Init()
     return CHIP_NO_ERROR;
 }
 
-void CookTopEndpoint::SetOnOffState(bool state)
+chip::Protocols::InteractionModel::Status CookTopEndpoint::SetOnOffState(bool state)
 {
     CommandId commandId = state ? OnOff::Commands::On::Id : OnOff::Commands::Off::Id;
     auto status         = OnOffServer::Instance().setOnOffValue(mEndpointId, commandId, false);
-    if (status == chip::Protocols::InteractionModel::Status::Success)
-    {
-        currentOnOffState = state;
-    }
-    return;
+    VerifyOrReturnValue(status == Protocols::InteractionModel::Status::Success, status, 
+                        ChipLogError(AppServer, "ERR: updating on/off %x", to_underlying(status)));
+    return status;
 }

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

@@ -56,6 +56,8 @@ class OvenManager
         kState_OffCompleted,
         kState_OnInitiated,
         kState_OnCompleted,
+        kState_ActionInProgress,
+        kState_NoAction,
     } State;
 
     bool InitiateAction(int32_t aActor, Action_t aAction, uint8_t * aValue);

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

@@ -57,21 +57,6 @@ void OvenManager::Init()
 
     VerifyOrReturn(mCookTopEndpoint.Init() == CHIP_NO_ERROR, ChipLogError(AppServer, "CookTopEndpoint Init failed"));
 
-    // Initialize TemperatureControl cluster numeric temperature attributes for endpoint 2 (silent on failure)
-    {
-        Status tcStatus = TemperatureControl::Attributes::TemperatureSetpoint::Set(kTemperatureControlledCabinetEndpoint2, 0);
-        VerifyOrReturn(tcStatus == Status::Success, ChipLogError(AppServer, "Endpoint2 TemperatureSetpoint init failed"));
-
-        tcStatus = TemperatureControl::Attributes::MinTemperature::Set(kTemperatureControlledCabinetEndpoint2, 0);
-        VerifyOrReturn(tcStatus == Status::Success, ChipLogError(AppServer, "Endpoint2 MinTemperature init failed"));
-
-        tcStatus = TemperatureControl::Attributes::MaxTemperature::Set(kTemperatureControlledCabinetEndpoint2, 30000);
-        VerifyOrReturn(tcStatus == Status::Success, ChipLogError(AppServer, "Endpoint2 MaxTemperature init failed"));
-
-        tcStatus = TemperatureControl::Attributes::Step::Set(kTemperatureControlledCabinetEndpoint2, 500);
-        VerifyOrReturn(tcStatus == Status::Success, ChipLogError(AppServer, "Endpoint2 Step init failed"));
-    }
-
     // Register the shared TemperatureLevelsDelegate for all the cooksurface endpoints
     TemperatureControl::SetInstance(&mTemperatureControlDelegate);
 
@@ -167,35 +152,42 @@ CHIP_ERROR OvenManager::SetTemperatureControlledCabinetInitialState(EndpointId t
 
 void OvenManager::TempCtrlAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value, uint16_t size)
 {
-    if (endpointId == kTemperatureControlledCabinetEndpoint2)
+    switch (endpointId)
     {
+    case kTemperatureControlledCabinetEndpoint:
         // TODO: Update the LCD with the new Temperature Control attribute value
+        break;
+    default:
+        break;
     }
-    return;
 }
 
 void OvenManager::OnOffAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value, uint16_t size)
 {
-    if (endpointId == kCookTopEndpoint3)
+    switch (endpointId)
     {
+    case kCookTopEndpoint3:
         InitiateAction(AppEvent::kEventType_Oven, *value ? OvenManager::ON_ACTION : OvenManager::OFF_ACTION, value);
-
         // Update CookSurface states accordingly
-        mCookSurfaceEndpoint4.SetOnOffState(*value);
-        mCookSurfaceEndpoint5.SetOnOffState(*value);
-    }
-    else if (endpointId == kCookSurfaceEndpoint4 || endpointId == kCookSurfaceEndpoint5)
-    {
+        mCookSurfaceEndpoint1.SetOnOffState(*value);
+        mCookSurfaceEndpoint2.SetOnOffState(*value);
+        break;
+    case kCookSurfaceEndpoint1:
+    case kCookSurfaceEndpoint2:
         // Handle On/Off attribute changes for the cook surface endpoints
-        bool cookSurfaceEndpoint4State = mCookSurfaceEndpoint4.GetOnOffState();
-        bool cookSurfaceEndpoint5State = mCookSurfaceEndpoint5.GetOnOffState();
-        // Check if both cooksurfaces are off. If yes, turn off the cooktop (call cooktop.TurnOffCookTop)
-        if (cookSurfaceEndpoint4State == false && cookSurfaceEndpoint5State == false)
         {
-            mCookTopEndpoint3.SetOnOffState(false);
+            bool cookSurfaceEndpoint1State = mCookSurfaceEndpoint1.GetOnOffState();
+            bool cookSurfaceEndpoint2State = mCookSurfaceEndpoint2.GetOnOffState();
+            // Check if both cooksurfaces are off. If yes, turn off the cooktop (call cooktop.TurnOffCookTop)
+            if (cookSurfaceEndpoint1State == false  && cookSurfaceEndpoint2State == false)
+            {
+                mCookTopEndpoint3.SetOnOffState(false);
+            }
         }
+        break;
+    default:
+        break;
     }
-    return;
 }
 
 void OvenManager::OvenModeAttributeChangeHandler(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value,