Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Nov 29, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36b2296
Fix Matter 1.3 certifiction TC-LWM-1.1 case that feature-map should be 0
Jul 8, 2024
ef7d582
Update laundry washer ZAP file to pass TC-IDM-10.2/10.4/10.5 during M…
Oct 15, 2024
4cc42a1
Update RW/RT device types ZAP files to align with latest root node co…
crlonxp Nov 28, 2024
9666db6
Update RT1060 RTOS laundry washer app to aligh with rw61x and rt1170 …
Oct 22, 2024
808caf3
Restyled by clang-format
restyled-commits Nov 28, 2024
c80613c
Restyled by gn
restyled-commits Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions examples/laundry-washer-app/nxp/common/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
120 changes: 0 additions & 120 deletions examples/laundry-washer-app/nxp/common/main/include/operational-state-delegate-impl.h
View file
Open in desktop

This file was deleted.

142 changes: 0 additions & 142 deletions examples/laundry-washer-app/nxp/common/main/operational-state-delegate-impl.cpp
View file
Open in desktop

This file was deleted.

23 changes: 21 additions & 2 deletions examples/laundry-washer-app/nxp/rt/rt1060/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ declare_args() {

# Setup discriminator as argument
setup_discriminator = 3840

chip_with_diag_logs_demo = true
}

example_platform_dir =
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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) {
Expand Down
23 changes: 21 additions & 2 deletions examples/laundry-washer-app/nxp/rt/rt1170/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ declare_args() {

# Setup discriminator as argument
setup_discriminator = 3840

chip_with_diag_logs_demo = true
}

example_platform_dir =
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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) {
Expand Down
Loading
Loading