Sync latest commits of the laundry-washer-app in nxp rw61x platform (#…

…36664) * Fix Matter 1.3 certifiction TC-LWM-1.1 case that feature-map should be 0 Signed-off-by: Chin-Ran Lo <[email protected]> (cherry picked from commit 21c40394dd0df65b1dd07e6cf9545f9d5cb1af25) * Update laundry washer ZAP file to pass TC-IDM-10.2/10.4/10.5 during Matter 1.4 SVE Signed-off-by: Oliver Fan <[email protected]> [nxp toup][laundry-washer-app][common] Update laundry washer to pass TC-OPSTATE-2.6 during Matter 1.4 SVE Signed-off-by: Oliver Fan <[email protected]> [nxp toup][laundry-washer-app][RW612][RTOS] Update RW612 RTOS laundry washer app to pass TC-OPSTATE-2.6 during Matter 1.4 SVE Signed-off-by: Oliver Fan <[email protected]> [nxp toup][laundry-washer-app][RT1170][RTOS] Update RT1170+IW612 RTOS laundry washer app to pass TC-OPSTATE-2.6 during Matter 1.4 SVE Signed-off-by: Oliver Fan <[email protected]> [nxp toup][laundry-washer-app][RW612][Zephyr] Update laundry washer to pass TC-OPSTATE-2.6, TC-IDM-10.2/10.4/10.5 during Matter 1.4 SVE Signed-off-by: Oliver Fan <[email protected]> * Update RW/RT device types ZAP files to align with latest root node configuration updates done in thermostat zap configuration Signed-off-by: Lo,Chin-Ran <[email protected]> * Update RT1060 RTOS laundry washer app to aligh with rw61x and rt1170 to pass TC-OPSTATE-2.6 Signed-off-by: Oliver Fan <[email protected]> * Restyled by clang-format * Restyled by gn --------- Signed-off-by: Oliver Fan <[email protected]> Signed-off-by: Lo,Chin-Ran <[email protected]> Co-authored-by: Chin-Ran Lo <[email protected]> Co-authored-by: Oliver Fan <[email protected]> Co-authored-by: Restyled.io <[email protected]>
project-chip · Nov 29, 2024 · 19cbdf4 · 19cbdf4
1 parent b3e074c
commit 19cbdf4
Show file tree

Hide file tree

Showing 9 changed files with 1,510 additions and 1,706 deletions.
diff --git a/examples/laundry-washer-app/nxp/common/main/AppTask.cpp b/examples/laundry-washer-app/nxp/common/main/AppTask.cpp
@@ -22,6 +22,7 @@
 #include "CHIPDeviceManager.h"
 #include "ICDUtil.h"
 #include <app/InteractionModelEngine.h>
+#include <app/clusters/operational-state-server/operational-state-cluster-objects.h>
 #include <app/util/attribute-storage.h>
 
 #include "static-supported-temperature-levels.h"
@@ -85,8 +86,15 @@ static CHIP_ERROR cliOpState(int argc, char * argv[])
 
     if (map_cmd_opstate.find(argv[0]) != map_cmd_opstate.end())
     {
-        OperationalState::GetOperationalStateInstance()->SetOperationalState(map_cmd_opstate.at(argv[0]));
-        ChipLogDetail(Shell, "OpSState : Set to %s state", argv[0]);
+        auto error = OperationalState::GetOperationalStateInstance()->SetOperationalState(map_cmd_opstate.at(argv[0]));
+        ChipLogDetail(Shell, "OpSState : Set to %s state & CountdownTime", argv[0]);
+        if ((error == CHIP_NO_ERROR) &&
+            (map_cmd_opstate.at(argv[0]) == to_underlying(chip::app::Clusters::OperationalState::OperationalStateEnum::kRunning)))
+        {
+            chip::app::Clusters::OperationalState::GenericOperationalError err(
+                to_underlying(chip::app::Clusters::OperationalState::ErrorStateEnum::kNoError));
+            OperationalState::GetOperationalStateDelegate()->HandleStartStateCallback(err);
+        }
         if (!strcmp(argv[0], "error") && argc == 2)
         {
             OperationalState::Structs::ErrorStateStruct::Type err;

diff --git a/examples/laundry-washer-app/nxp/common/main/include/operational-state-delegate-impl.h b/examples/laundry-washer-app/nxp/common/main/include/operational-state-delegate-impl.h
diff --git a/examples/laundry-washer-app/nxp/common/main/operational-state-delegate-impl.cpp b/examples/laundry-washer-app/nxp/common/main/operational-state-delegate-impl.cpp
diff --git a/examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn b/examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn
@@ -44,6 +44,8 @@ declare_args() {
 
   # Setup discriminator as argument
   setup_discriminator = 3840
+
+  chip_with_diag_logs_demo = true
 }
 
 example_platform_dir =
@@ -116,6 +118,13 @@ rt_executable("laundry-washer") {
     defines += [ "CONFIG_NET_L2_OPENTHREAD=1" ]
   }
 
+  if (chip_with_diag_logs_demo) {
+    defines += [
+      "CONFIG_DIAG_LOGS_DEMO=1",
+      "CHIP_DEVICE_CONFIG_MAX_DIAG_LOG_SIZE=1024",
+    ]
+  }
+
   include_dirs = [
     "../../common/main/include",
     "../../common/main",
@@ -135,6 +144,17 @@ rt_executable("laundry-washer") {
     "../../common/main/main.cpp",
   ]
 
+  if (chip_with_diag_logs_demo) {
+    include_dirs += [
+      "${common_example_dir}/diagnostic_logs/include",
+      "${chip_root}",
+    ]
+    sources += [
+      "${common_example_dir}/diagnostic_logs/source/DiagnosticLogsDemo.cpp",
+      "${common_example_dir}/diagnostic_logs/source/DiagnosticLogsProviderDelegateImpl.cpp",
+    ]
+  }
+
   # App common files
   include_dirs += [
     "${common_example_dir}/icd/include",
@@ -163,11 +183,10 @@ rt_executable("laundry-washer") {
   sources += [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/laundry-washer-controls-delegate-impl.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/operational-state-delegate-impl.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
     "../../common/main/laundry-washer-mode.cpp",
-    "../../common/main/operational-state-delegate-impl.cpp",
   ]
 
   if (nxp_enable_matter_cli) {

diff --git a/examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn b/examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn
@@ -41,6 +41,8 @@ declare_args() {
 
   # Setup discriminator as argument
   setup_discriminator = 3840
+
+  chip_with_diag_logs_demo = true
 }
 
 example_platform_dir =
@@ -106,6 +108,13 @@ rt_executable("laundry-washer-app") {
     defines += [ "CONFIG_NET_L2_OPENTHREAD=1" ]
   }
 
+  if (chip_with_diag_logs_demo) {
+    defines += [
+      "CONFIG_DIAG_LOGS_DEMO=1",
+      "CHIP_DEVICE_CONFIG_MAX_DIAG_LOG_SIZE=1024",
+    ]
+  }
+
   include_dirs = [
     "../../common/main/include",
     "../../common/main",
@@ -125,6 +134,17 @@ rt_executable("laundry-washer-app") {
     "../../common/main/main.cpp",
   ]
 
+  if (chip_with_diag_logs_demo) {
+    include_dirs += [
+      "${common_example_dir}/diagnostic_logs/include",
+      "${chip_root}",
+    ]
+    sources += [
+      "${common_example_dir}/diagnostic_logs/source/DiagnosticLogsDemo.cpp",
+      "${common_example_dir}/diagnostic_logs/source/DiagnosticLogsProviderDelegateImpl.cpp",
+    ]
+  }
+
   # App common files
   include_dirs += [
     "${common_example_dir}/icd/include",
@@ -151,11 +171,10 @@ rt_executable("laundry-washer-app") {
   sources += [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/laundry-washer-controls-delegate-impl.cpp",
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/operational-state-delegate-impl.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
     "../../common/main/laundry-washer-mode.cpp",
-    "../../common/main/operational-state-delegate-impl.cpp",
   ]
 
   if (nxp_enable_matter_cli) {