Address review comments and modify the file structures accordingly

arun-silabs · arun-silabs · commit 5ab6a75f691e · 2025-10-23T09:47:04.000+05:30
diff --git a/examples/oven-app/oven-app-common/include/CookSurfaceEndpoint.h b/examples/oven-app/oven-app-common/include/CookSurfaceEndpoint.h
@@ -18,10 +18,7 @@
 
 #pragma once
 
-#include <AppSupportedTemperatureLevelsDelegate.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app/clusters/on-off-server/on-off-server.h>
-#include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/DataModelTypes.h>
 
@@ -33,7 +30,7 @@ namespace CookSurface {
 class CookSurfaceEndpoint
 {
 public:
-    CookSurfaceEndpoint(EndpointId endpointId) : mEndpoint(endpointId) {}
+    CookSurfaceEndpoint(EndpointId endpointId) {}
 
     /**
      * @brief Initialize the CookSurface endpoint.
@@ -43,11 +40,7 @@ class CookSurfaceEndpoint
     /**
      * @brief Handle the "off" command for the CookSurface.
      */
-    void offCommand();
-
-private:
-    EndpointId mEndpoint = kInvalidEndpointId;
-    TemperatureControlledCabinet::AppSupportedTemperatureLevelsDelegate mTemperatureControlDelegate;
+    void HandleOffCommand();
 };
 
 } // namespace CookSurface
diff --git a/examples/oven-app/oven-app-common/include/CookTopEndpoint.h b/examples/oven-app/oven-app-common/include/CookTopEndpoint.h
@@ -29,24 +29,20 @@ namespace CookTop {
 class CookTopEndpoint
 {
 public:
-    CookTopEndpoint(EndpointId endpointId) : mEndpoint(endpointId) {}
+    CookTopEndpoint(EndpointId endpointId) {}
 
     /**
      * @brief Initialize the cooktop endpoint.
      *
-     * This function sets up the cooktop endpoint, preparing it for operation.
-     *
      * @return CHIP_ERROR indicating success or failure of the initialization.
      */
     CHIP_ERROR Init();
 
     /**
      * @brief Handle the "off" command for the cooktop.
      */
-    void offCommand();
+    void HandleOffCommand();
 
-private:
-    EndpointId mEndpoint = kInvalidEndpointId;
 };
 
 } // namespace CookTop
diff --git a/examples/oven-app/oven-app-common/include/OvenEndpoint.h b/examples/oven-app/oven-app-common/include/OvenEndpoint.h
@@ -33,19 +33,15 @@ namespace Oven {
 class OvenEndpoint
 {
 public:
-    OvenEndpoint(EndpointId endpointId) : mEndpoint(endpointId) {}
+    OvenEndpoint(EndpointId endpointId) {}
 
     /**
      * @brief Initialize the oven endpoint.
      *
-     * This function sets up the oven endpoint, preparing it for operation.
-     *
      * @return CHIP_ERROR indicating success or failure of the initialization.
      */
     CHIP_ERROR Init();
 
-private:
-    EndpointId mEndpoint = kInvalidEndpointId;
 };
 
 } // namespace Oven
diff --git a/examples/oven-app/oven-app-common/include/OvenModeDelegate.h b/examples/oven-app/oven-app-common/include/OvenModeDelegate.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app-common/zap-generated/cluster-objects.h> // provides detail::Structs::ModeTagStruct::Type and ModeOptionStruct::Type
+#include <app-common/zap-generated/cluster-objects.h>
 #include <app/clusters/mode-base-server/mode-base-server.h>
 #include <app/data-model/List.h>
 #include <lib/core/CHIPError.h>
@@ -30,7 +30,6 @@ namespace app {
 namespace Clusters {
 namespace TemperatureControlledCabinet {
 
-/// This is an application level delegate to handle Oven commands according to the specific business logic.
 class OvenModeDelegate : public ModeBase::Delegate
 {
 public:
diff --git a/examples/oven-app/oven-app-common/oven-app.matter b/examples/oven-app/oven-app-common/oven-app.matter
@@ -2360,10 +2360,10 @@ endpoint 2 {
   }
 
   server cluster TemperatureControl {
-    ram      attribute temperatureSetpoint;
-    ram      attribute minTemperature;
-    ram      attribute maxTemperature;
-    ram      attribute step;
+    ram      attribute temperatureSetpoint default = 0;
+    ram      attribute minTemperature default = 0;
+    ram      attribute maxTemperature default = 10000;
+    ram      attribute step default = 50;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
diff --git a/examples/oven-app/oven-app-common/oven-app.zap b/examples/oven-app/oven-app-common/oven-app.zap
@@ -3979,10 +3979,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3995,10 +3995,10 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4682,7 +4682,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4698,7 +4698,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4714,7 +4714,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "10000",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4730,7 +4730,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "50",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/oven-app/oven-app-common/src/CookSurfaceEndpoint.cpp b/examples/oven-app/oven-app-common/src/CookSurfaceEndpoint.cpp
@@ -17,29 +17,20 @@
  */
 
 #include "CookSurfaceEndpoint.h"
-#include <app-common/zap-generated/cluster-objects.h>
-#include <app/clusters/on-off-server/on-off-server.h>
-#include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
 #include <lib/core/CHIPError.h>
-#include <lib/core/DataModelTypes.h>
 
 using namespace chip;
 using namespace chip::app::Clusters::CookSurface;
-using namespace chip::app::DataModel;
-using namespace chip::app::Clusters;
 
 CHIP_ERROR CookSurfaceEndpoint::Init()
 {
-    ChipLogProgress(AppServer, "CookSurfaceEndpoint::Init() called for endpoint %d", mEndpoint);
-
-    // Temperature Control Delegate set
-    TemperatureControl::SetInstance(&mTemperatureControlDelegate);
-    ChipLogProgress(AppServer, "Temperature control delegate set for CookSurfaceEndpoint");
-
+    ChipLogProgress(AppServer, "CookSurfaceEndpoint::Init()");
+    // TODO: Add Endpoint initialization logic
     return CHIP_NO_ERROR;
 }
 
-void CookSurfaceEndpoint::offCommand()
+void CookSurfaceEndpoint::HandleOffCommand()
 {
+    // TODO: Implement the logic to handle the "off" command
     return;
 }
diff --git a/examples/oven-app/oven-app-common/src/CookTopEndpoint.cpp b/examples/oven-app/oven-app-common/src/CookTopEndpoint.cpp
@@ -17,24 +17,19 @@
  */
 
 #include "CookTopEndpoint.h"
-#include <app-common/zap-generated/cluster-objects.h>
 #include <lib/core/CHIPError.h>
-#include <lib/core/DataModelTypes.h>
 
 using namespace chip;
 using namespace chip::app::Clusters::CookTop;
-using namespace chip::app::DataModel;
-using namespace ::chip::app::Clusters;
-using namespace ::chip::app::Clusters::OnOff;
 
 CHIP_ERROR CookTopEndpoint::Init()
 {
-    // Initialization logic
+    // TODO: Add CookTop Endpoint Initialization logic
     return CHIP_NO_ERROR;
 }
 
-void CookTopEndpoint::offCommand()
+void CookTopEndpoint::HandleOffCommand()
 {
-    // Handle off command
+    // TODO: Implement the logic to handle the "off" command
     return;
 }
diff --git a/examples/oven-app/oven-app-common/src/OvenEndpoint.cpp b/examples/oven-app/oven-app-common/src/OvenEndpoint.cpp
@@ -24,6 +24,6 @@ using namespace chip::app::Clusters::Oven;
 
 CHIP_ERROR OvenEndpoint::Init()
 {
-    // Initialization logic
+    // TODO: Add Initialization logic (if needed)
     return CHIP_NO_ERROR;
 }
diff --git a/examples/oven-app/oven-app-common/src/TemperatureControlledCabinetEndpoint.cpp b/examples/oven-app/oven-app-common/src/TemperatureControlledCabinetEndpoint.cpp
@@ -19,52 +19,16 @@
 #include "TemperatureControlledCabinetEndpoint.h"
 #include "OvenModeDelegate.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app-common/zap-generated/cluster-enums.h>
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
-#include <protocols/interaction_model/StatusCode.h>
 
 using namespace chip;
 using namespace chip::app::Clusters::TemperatureControlledCabinet;
-using namespace chip::app::DataModel;
-using namespace chip::app::Clusters;
-
-using Protocols::InteractionModel::Status;
 
 CHIP_ERROR TemperatureControlledCabinetEndpoint::Init()
 {
     // Initialize the Oven Mode instance and delegate
     ReturnErrorOnFailure(mOvenModeInstance.Init());
     ReturnErrorOnFailure(mOvenModeDelegate.Init());
 
-    // Set the TemperatureControl cluster min and max temperature values
-    // Temperature values are in hundredths of degrees Celsius (0°C = 0, 100°C = 10000)
-    using namespace chip::app::Clusters::TemperatureControl::Attributes;
-
-    auto status = MinTemperature::Set(mEndpointId, 0); // 0°C
-    if (status != chip::Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(AppServer, "Failed to set MinTemperature: %d", static_cast<int>(status));
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    status = MaxTemperature::Set(mEndpointId, 10000); // 100°C
-    if (status != chip::Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(AppServer, "Failed to set MaxTemperature: %d", static_cast<int>(status));
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    // Set temperature step to 5°C (500 in hundredths of degrees)
-    status = Step::Set(mEndpointId, 500); // 5°C step
-    if (status != chip::Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(AppServer, "Failed to set temperature Step: %d", static_cast<int>(status));
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    ChipLogProgress(AppServer,
-                    "TemperatureControlledCabinetEndpoint initialized with MinTemperature=0°C, MaxTemperature=100°C, Step=5°C");
-
     return CHIP_NO_ERROR;
 }
diff --git a/examples/oven-app/silabs/BUILD.gn b/examples/oven-app/silabs/BUILD.gn
@@ -139,7 +139,6 @@ silabs_executable("oven_app") {
   }
 
   sources = [
-    "${example_oven_dir}/oven-app-common/src/AppSupportedTemperatureLevelsDelegate.cpp",
     "${example_oven_dir}/oven-app-common/src/CookSurfaceEndpoint.cpp",
     "${example_oven_dir}/oven-app-common/src/CookTopEndpoint.cpp",
     "${example_oven_dir}/oven-app-common/src/OvenEndpoint.cpp",
@@ -149,6 +148,7 @@ silabs_executable("oven_app") {
     "src/AppTask.cpp",
     "src/DataModelCallbacks.cpp",
     "src/OvenManager.cpp",
+    "src/AppSupportedTemperatureLevelsDelegate.cpp",
   ]
 
   deps = [ ":sdk" ]
diff --git a/examples/oven-app/silabs/build_for_wifi_args.gni b/examples/oven-app/silabs/build_for_wifi_args.gni
@@ -17,6 +17,6 @@ silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 chip_enable_openthread = false
 import("${chip_root}/src/platform/silabs/wifi/args.gni")
 
-sl_enable_test_event_trigger = true
+sl_enable_test_event_trigger = false
 chip_enable_ota_requestor = false
 app_data_model = "${chip_root}/examples/oven-app/oven-app-common"
diff --git a/examples/oven-app/silabs/include/AppSupportedTemperatureLevelsDelegate.h b/examples/oven-app/silabs/include/AppSupportedTemperatureLevelsDelegate.h
@@ -25,38 +25,45 @@
 namespace chip {
 namespace app {
 namespace Clusters {
-namespace TemperatureControlledCabinet {
+
+/**
+ * @brief Endpoint to temperature levels mapping. The endpoint must have a temperature control cluster.
+ * Represents a pair of endpoints and temperature levels supported by that endpoint.
+ */
+struct EndpointPair
+{
+    /// An endpoint having temperature control cluster.
+    EndpointId mEndpointId;
+    /// Temperature levels supported by the temperature control cluster in this endpoint.
+    CharSpan * mTemperatureLevels;
+    /// Size of the temperature levels array.
+    uint8_t mSize;
+    
+    EndpointPair(EndpointId aEndpointId, CharSpan * aTemperatureLevels, uint8_t aSize) :
+    mEndpointId(aEndpointId), mTemperatureLevels(aTemperatureLevels), mSize(aSize)
+    {}
+};
 
 /**
  * Implementation of SupportedTemperatureLevelsIteratorDelegate for the oven app.
  * This class provides supported temperature levels for temperature control clusters.
  */
 class AppSupportedTemperatureLevelsDelegate : public TemperatureControl::SupportedTemperatureLevelsIteratorDelegate
 {
-    struct EndpointPair
-    {
-        EndpointId mEndpointId;
-        CharSpan * mTemperatureLevels;
-        uint8_t mSize;
-
-        EndpointPair(EndpointId aEndpointId, CharSpan * aTemperatureLevels, uint8_t aSize) :
-            mEndpointId(aEndpointId), mTemperatureLevels(aTemperatureLevels), mSize(aSize)
-        {}
-    };
-
-    static CharSpan temperatureLevelOptions[3];
-
 public:
     // Use a fixed size for oven app (cook-surface multiple endpoints: 4, 5)
     static constexpr size_t kNumCookSurfaceEndpoints = 2;
+    // Number of supported temperature levels
+    static constexpr size_t kNumTemperatureLevels = 3;
+
+    static CharSpan temperatureLevelOptions[kNumTemperatureLevels];
     static const EndpointPair supportedOptionsByEndpoints[kNumCookSurfaceEndpoints];
 
     uint8_t Size() override;
 
     CHIP_ERROR Next(MutableCharSpan & item) override;
 };
 
-} // namespace TemperatureControlledCabinet
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/examples/oven-app/silabs/include/OvenManager.h b/examples/oven-app/silabs/include/OvenManager.h
@@ -30,6 +30,7 @@
 #include "CookTopEndpoint.h"
 #include "OvenEndpoint.h"
 #include "TemperatureControlledCabinetEndpoint.h"
+#include "AppSupportedTemperatureLevelsDelegate.h"
 #include <lib/core/DataModelTypes.h>
 
 class OvenManager
@@ -50,6 +51,7 @@ class OvenManager
 
 private:
     static OvenManager sOvenMgr;
+    chip::app::Clusters::AppSupportedTemperatureLevelsDelegate mTemperatureControlDelegate;
 
     // Define the endpoint ID for the Oven
     static constexpr chip::EndpointId kOvenEndpoint1                         = 1;
diff --git a/examples/oven-app/silabs/openthread.gni b/examples/oven-app/silabs/openthread.gni
diff --git a/examples/oven-app/silabs/src/AppSupportedTemperatureLevelsDelegate.cpp b/examples/oven-app/silabs/src/AppSupportedTemperatureLevelsDelegate.cpp
diff --git a/examples/oven-app/silabs/src/OvenManager.cpp b/examples/oven-app/silabs/src/OvenManager.cpp

Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,19 @@`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`#include "CookTopEndpoint.h"`
`20`		`-#include <app-common/zap-generated/cluster-objects.h>`
`21`	`20`	`#include <lib/core/CHIPError.h>`
`22`		`-#include <lib/core/DataModelTypes.h>`
`23`	`21`
`24`	`22`	`using namespace chip;`
`25`	`23`	`using namespace chip::app::Clusters::CookTop;`
`26`		`-using namespace chip::app::DataModel;`
`27`		`-using namespace ::chip::app::Clusters;`
`28`		`-using namespace ::chip::app::Clusters::OnOff;`
`29`	`24`
`30`	`25`	`CHIP_ERROR CookTopEndpoint::Init()`
`31`	`26`	`{`
`32`		`- // Initialization logic`
	`27`	`+ // TODO: Add CookTop Endpoint Initialization logic`
`33`	`28`	`return CHIP_NO_ERROR;`
`34`	`29`	`}`
`35`	`30`
`36`		`-void CookTopEndpoint::offCommand()`
	`31`	`+void CookTopEndpoint::HandleOffCommand()`
`37`	`32`	`{`
`38`		`- // Handle off command`
	`33`	`+ // TODO: Implement the logic to handle the "off" command`
`39`	`34`	`return;`
`40`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ using namespace chip::app::Clusters::Oven;`
`24`	`24`
`25`	`25`	`CHIP_ERROR OvenEndpoint::Init()`
`26`	`26`	`{`
`27`		`- // Initialization logic`
	`27`	`+ // TODO: Add Initialization logic (if needed)`
`28`	`28`	`return CHIP_NO_ERROR;`
`29`	`29`	`}`