diff --git a/examples/ota-provider-app/linux/main.cpp b/examples/ota-provider-app/linux/main.cpp index d68064852b26a5..2b951f81e6461d 100644 --- a/examples/ota-provider-app/linux/main.cpp +++ b/examples/ota-provider-app/linux/main.cpp @@ -39,7 +39,7 @@ #include using chip::BitFlags; -using chip::app::clusters::OTAProviderDelegate; +using chip::app::Clusters::OTAProviderDelegate; using chip::ArgParser::HelpOptions; using chip::ArgParser::OptionDef; using chip::ArgParser::OptionSet; @@ -184,7 +184,7 @@ int main(int argc, char * argv[]) otaProvider.SetQueryImageBehavior(gQueryImageBehavior); otaProvider.SetDelayedActionTimeSec(gDelayedActionTimeSec); - chip::app::clusters::OTAProvider::SetDelegate(kOtaProviderEndpoint, &otaProvider); + chip::app::Clusters::OTAProvider::SetDelegate(kOtaProviderEndpoint, &otaProvider); BitFlags bdxFlags; bdxFlags.Set(TransferControlFlags::kReceiverDrive); diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp index dfade8b2ec8d0b..ea8d06a62c409c 100644 --- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp +++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp @@ -34,7 +34,7 @@ using chip::ByteSpan; using chip::Span; using chip::app::CommandPathFlags; using chip::app::CommandPathParams; -using chip::app::clusters::OTAProviderDelegate; +using chip::app::Clusters::OTAProviderDelegate; using chip::TLV::ContextTag; using chip::TLV::TLVWriter; diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h index e1a4e645105187..f5107b34e5aee9 100644 --- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h +++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h @@ -21,12 +21,10 @@ #include #include -using chip::app::clusters::OTAProviderDelegate; - /** * A reference implementation for an OTA Provider. Includes a method for providing a path to a local OTA file to serve. */ -class OTAProviderExample : public OTAProviderDelegate +class OTAProviderExample : public chip::app::Clusters::OTAProviderDelegate { public: OTAProviderExample(); diff --git a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp index 93af324b5a30b1..70ad28ca0edf02 100644 --- a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp @@ -36,7 +36,7 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(EndpointId endpo ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs) { - EmberAfNetworkCommissioningError err = app::clusters::NetworkCommissioning::OnAddThreadNetworkCommandCallbackInternal( + EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnAddThreadNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), operationalDataset, breadcrumb, timeoutMs); emberAfSendImmediateDefaultResponse(err == EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE); @@ -46,7 +46,7 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(EndpointId endpo bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, ByteSpan ssid, ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs) { - EmberAfNetworkCommissioningError err = app::clusters::NetworkCommissioning::OnAddWiFiNetworkCommandCallbackInternal( + EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnAddWiFiNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), ssid, credentials, breadcrumb, timeoutMs); emberAfSendImmediateDefaultResponse(err == EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE); @@ -56,7 +56,7 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(EndpointId endpoin bool emberAfNetworkCommissioningClusterEnableNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs) { - EmberAfNetworkCommissioningError err = app::clusters::NetworkCommissioning::OnEnableNetworkCommandCallbackInternal( + EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnEnableNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), networkID, breadcrumb, timeoutMs); emberAfSendImmediateDefaultResponse(err == EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE); diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp index 1f7db5ae0ba3fe..f8da0e6f7369b4 100644 --- a/src/app/clusters/network-commissioning/network-commissioning.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning.cpp @@ -48,12 +48,10 @@ using namespace chip; using namespace chip::app; -using namespace chip::app::clusters; -using namespace chip::app::clusters::NetworkCommissioning; namespace chip { namespace app { -namespace clusters { +namespace Clusters { namespace NetworkCommissioning { constexpr uint8_t kMaxNetworkIDLen = 32; @@ -291,6 +289,6 @@ EmberAfNetworkCommissioningError OnEnableNetworkCommandCallbackInternal(app::Com } } // namespace NetworkCommissioning -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/clusters/network-commissioning/network-commissioning.h b/src/app/clusters/network-commissioning/network-commissioning.h index f63f2d3e640642..7db189d71e3225 100644 --- a/src/app/clusters/network-commissioning/network-commissioning.h +++ b/src/app/clusters/network-commissioning/network-commissioning.h @@ -25,7 +25,7 @@ namespace chip { namespace app { -namespace clusters { +namespace Clusters { namespace NetworkCommissioning { EmberAfNetworkCommissioningError OnAddThreadNetworkCommandCallbackInternal(app::CommandHandler *, EndpointId, ByteSpan operationalDataset, uint64_t breadcrumb, @@ -37,6 +37,6 @@ EmberAfNetworkCommissioningError OnEnableNetworkCommandCallbackInternal(app::Com uint64_t breadcrumb, uint32_t timeoutMs); } // namespace NetworkCommissioning -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/clusters/ota-provider/ota-provider-delegate.h b/src/app/clusters/ota-provider/ota-provider-delegate.h index f476ce983607c4..b9e2d82935c0f9 100644 --- a/src/app/clusters/ota-provider/ota-provider-delegate.h +++ b/src/app/clusters/ota-provider/ota-provider-delegate.h @@ -24,8 +24,9 @@ namespace chip { namespace app { -namespace clusters { +namespace Clusters { +// TODO: Should this be OTAProvider::Delegate? /** @brief * Defines methods for implementing application-specific logic for the OTA Provider Cluster. */ @@ -46,6 +47,6 @@ class OTAProviderDelegate virtual ~OTAProviderDelegate() = default; }; -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp index c343661a0af912..5e7142d5373170 100644 --- a/src/app/clusters/ota-provider/ota-provider.cpp +++ b/src/app/clusters/ota-provider/ota-provider.cpp @@ -32,7 +32,7 @@ #include "ota-provider.h" using namespace chip; -using chip::app::clusters::OTAProviderDelegate; +using chip::app::Clusters::OTAProviderDelegate; namespace { constexpr size_t kMaxMetadataLen = 512; // The maximum length of Metadata in any OTA Provider command @@ -190,9 +190,10 @@ bool emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(chip::EndpointId namespace chip { namespace app { -namespace clusters { +namespace Clusters { +namespace OTAProvider { -void OTAProvider::SetDelegate(EndpointId endpoint, OTAProviderDelegate * delegate) +void SetDelegate(EndpointId endpoint, OTAProviderDelegate * delegate) { uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ZCL_OTA_PROVIDER_CLUSTER_ID); if (ep != 0xFFFF) @@ -201,6 +202,7 @@ void OTAProvider::SetDelegate(EndpointId endpoint, OTAProviderDelegate * delegat } } -} // namespace clusters +} // namespace OTAProvider +} // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/clusters/ota-provider/ota-provider.h b/src/app/clusters/ota-provider/ota-provider.h index 1e307401105a94..234f1fcec4189a 100644 --- a/src/app/clusters/ota-provider/ota-provider.h +++ b/src/app/clusters/ota-provider/ota-provider.h @@ -22,12 +22,12 @@ namespace chip { namespace app { -namespace clusters { +namespace Clusters { namespace OTAProvider { void SetDelegate(chip::EndpointId endpointId, OTAProviderDelegate * delegate); } -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/tests/TestDataModelSerialization.cpp b/src/app/tests/TestDataModelSerialization.cpp index f35cd4b4075a0e..c57f43c6e4aeef 100644 --- a/src/app/tests/TestDataModelSerialization.cpp +++ b/src/app/tests/TestDataModelSerialization.cpp @@ -32,6 +32,7 @@ using namespace chip; using namespace chip::app; +using namespace chip::app::Clusters; class TestDataModelSerialization { @@ -156,13 +157,13 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecSimpleStruc // Encode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; uint8_t buf[4] = { 0, 1, 2, 3 }; char strbuf[10] = "chip"; t.a = 20; t.b = true; - t.c = clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; + t.c = TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; t.d = buf; t.e = Span{ strbuf, strlen(strbuf) }; @@ -180,7 +181,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecSimpleStruc // Decode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; _this->SetupReader(); @@ -189,7 +190,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecSimpleStruc NL_TEST_ASSERT(apSuite, t.a == 20); NL_TEST_ASSERT(apSuite, t.b == true); - NL_TEST_ASSERT(apSuite, t.c == clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A); + NL_TEST_ASSERT(apSuite, t.c == TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A); NL_TEST_ASSERT(apSuite, t.d.size() == 4); @@ -214,7 +215,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecNestedStruc // Encode // { - clusters::TestCluster::NestedStruct::Type t; + TestCluster::NestedStruct::Type t; uint8_t buf[4] = { 0, 1, 2, 3 }; char strbuf[10] = "chip"; @@ -222,7 +223,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecNestedStruc t.b = true; t.c.a = 11; t.c.b = true; - t.c.c = clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B; + t.c.c = TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B; t.c.d = buf; t.c.e = Span{ strbuf, strlen(strbuf) }; @@ -240,7 +241,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecNestedStruc // Decode // { - clusters::TestCluster::NestedStruct::Type t; + TestCluster::NestedStruct::Type t; _this->SetupReader(); @@ -251,7 +252,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecNestedStruc NL_TEST_ASSERT(apSuite, t.b == true); NL_TEST_ASSERT(apSuite, t.c.a == 11); NL_TEST_ASSERT(apSuite, t.c.b == true); - NL_TEST_ASSERT(apSuite, t.c.c == clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B); + NL_TEST_ASSERT(apSuite, t.c.c == TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B); NL_TEST_ASSERT(apSuite, t.c.d.size() == 4); @@ -277,11 +278,11 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecDecodableNe // Encode // { - clusters::TestCluster::NestedStructList::Type t; + TestCluster::NestedStructList::Type t; uint8_t buf[4] = { 0, 1, 2, 3 }; uint32_t intBuf[4] = { 10000, 10001, 10002, 10003 }; char strbuf[10] = "chip"; - clusters::TestCluster::SimpleStruct::Type structList[4]; + TestCluster::SimpleStruct::Type structList[4]; uint8_t i = 0; ByteSpan spanList[4]; @@ -289,7 +290,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecDecodableNe t.b = true; t.c.a = 11; t.c.b = true; - t.c.c = clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B; + t.c.c = TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B; t.c.d = buf; t.e = intBuf; @@ -325,7 +326,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecDecodableNe // Decode // { - clusters::TestCluster::NestedStructList::DecodableType t; + TestCluster::NestedStructList::DecodableType t; int i; _this->SetupReader(); @@ -337,7 +338,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecDecodableNe NL_TEST_ASSERT(apSuite, t.b == true); NL_TEST_ASSERT(apSuite, t.c.a == 11); NL_TEST_ASSERT(apSuite, t.c.b == true); - NL_TEST_ASSERT(apSuite, t.c.c == clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B); + NL_TEST_ASSERT(apSuite, t.c.c == TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_B); NL_TEST_ASSERT(apSuite, StringMatches(t.c.e, "chip")); { @@ -421,9 +422,9 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecDecodableDo // Encode // { - clusters::TestCluster::DoubleNestedStructList::Type t; - clusters::TestCluster::NestedStructList::Type n[4]; - clusters::TestCluster::SimpleStruct::Type structList[4]; + TestCluster::DoubleNestedStructList::Type t; + TestCluster::NestedStructList::Type n[4]; + TestCluster::SimpleStruct::Type structList[4]; uint8_t i; t.a = n; @@ -453,7 +454,7 @@ void TestDataModelSerialization::TestDataModelSerialization_EncAndDecDecodableDo // Decode // { - clusters::TestCluster::DoubleNestedStructList::DecodableType t; + TestCluster::DoubleNestedStructList::DecodableType t; _this->SetupReader(); @@ -498,13 +499,13 @@ void TestDataModelSerialization::TestDataModelSerialization_OptionalFields(nlTes // Encode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; uint8_t buf[4] = { 0, 1, 2, 3 }; char strbuf[10] = "chip"; t.a = 20; t.b = true; - t.c = clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; + t.c = TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; t.d = buf; t.e = Span{ strbuf, strlen(strbuf) }; @@ -512,10 +513,10 @@ void TestDataModelSerialization::TestDataModelSerialization_OptionalFields(nlTes // Encode every field manually except a. { err = EncodeStruct(_this->mWriter, TLV::AnonymousTag, - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kBFieldId), t.b), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kCFieldId), t.c), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kDFieldId), t.d), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kEFieldId), t.e)); + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kBFieldId), t.b), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kCFieldId), t.c), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kDFieldId), t.d), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kEFieldId), t.e)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); } @@ -529,7 +530,7 @@ void TestDataModelSerialization::TestDataModelSerialization_OptionalFields(nlTes // Decode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; _this->SetupReader(); @@ -543,7 +544,7 @@ void TestDataModelSerialization::TestDataModelSerialization_OptionalFields(nlTes NL_TEST_ASSERT(apSuite, t.a == 150); NL_TEST_ASSERT(apSuite, t.b == true); - NL_TEST_ASSERT(apSuite, t.c == clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A); + NL_TEST_ASSERT(apSuite, t.c == TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A); NL_TEST_ASSERT(apSuite, t.d.size() == 4); @@ -568,13 +569,13 @@ void TestDataModelSerialization::TestDataModelSerialization_ExtraField(nlTestSui // Encode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; uint8_t buf[4] = { 0, 1, 2, 3 }; char strbuf[10] = "chip"; t.a = 20; t.b = true; - t.c = clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; + t.c = TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; t.d = buf; t.e = Span{ strbuf, strlen(strbuf) }; @@ -582,12 +583,12 @@ void TestDataModelSerialization::TestDataModelSerialization_ExtraField(nlTestSui // Encode every field + an extra field. { err = EncodeStruct(_this->mWriter, TLV::AnonymousTag, - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kAFieldId), t.a), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kBFieldId), t.b), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kCFieldId), t.c), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kDFieldId), t.d), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kEFieldId), t.e), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kEFieldId + 1), t.a)); + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kAFieldId), t.a), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kBFieldId), t.b), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kCFieldId), t.c), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kDFieldId), t.d), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kEFieldId), t.e), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kEFieldId + 1), t.a)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); } @@ -601,7 +602,7 @@ void TestDataModelSerialization::TestDataModelSerialization_ExtraField(nlTestSui // Decode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; _this->SetupReader(); @@ -611,7 +612,7 @@ void TestDataModelSerialization::TestDataModelSerialization_ExtraField(nlTestSui NL_TEST_ASSERT(apSuite, t.a == 20); NL_TEST_ASSERT(apSuite, t.b == true); - NL_TEST_ASSERT(apSuite, t.c == clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A); + NL_TEST_ASSERT(apSuite, t.c == TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A); NL_TEST_ASSERT(apSuite, t.d.size() == 4); @@ -640,13 +641,13 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidSimpleFieldTy // Encode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; uint8_t buf[4] = { 0, 1, 2, 3 }; char strbuf[10] = "chip"; t.a = 20; t.b = true; - t.c = clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; + t.c = TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; t.d = buf; t.e = Span{ strbuf, strlen(strbuf) }; @@ -654,11 +655,11 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidSimpleFieldTy // Encode every field manually except a. { err = EncodeStruct(_this->mWriter, TLV::AnonymousTag, - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kAFieldId), t.b), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kBFieldId), t.b), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kCFieldId), t.c), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kDFieldId), t.d), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kEFieldId), t.e)); + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kAFieldId), t.b), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kBFieldId), t.b), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kCFieldId), t.c), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kDFieldId), t.d), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kEFieldId), t.e)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); } @@ -672,7 +673,7 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidSimpleFieldTy // Decode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; _this->SetupReader(); @@ -691,13 +692,13 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidSimpleFieldTy // Encode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; uint8_t buf[4] = { 0, 1, 2, 3 }; char strbuf[10] = "chip"; t.a = 20; t.b = true; - t.c = clusters::TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; + t.c = TestCluster::SimpleEnum::SIMPLE_ENUM_VALUE_A; t.d = buf; t.e = Span{ strbuf, strlen(strbuf) }; @@ -705,11 +706,11 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidSimpleFieldTy // Encode every field manually except a. { err = EncodeStruct(_this->mWriter, TLV::AnonymousTag, - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kAFieldId), t.a), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kBFieldId), t.b), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kCFieldId), t.c), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kDFieldId), t.e), - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::SimpleStruct::kEFieldId), t.e)); + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kAFieldId), t.a), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kBFieldId), t.b), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kCFieldId), t.c), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kDFieldId), t.e), + MakeTagValuePair(TLV::ContextTag(TestCluster::SimpleStruct::kEFieldId), t.e)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); } @@ -723,7 +724,7 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidSimpleFieldTy // Decode // { - clusters::TestCluster::SimpleStruct::Type t; + TestCluster::SimpleStruct::Type t; _this->SetupReader(); @@ -745,7 +746,7 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidListType(nlTe // Encode // { - clusters::TestCluster::NestedStructList::Type t; + TestCluster::NestedStructList::Type t; uint32_t intBuf[4] = { 10000, 10001, 10002, 10003 }; t.e = intBuf; @@ -753,7 +754,7 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidListType(nlTe // Encode a list of integers for field d instead of a list of structs. { err = EncodeStruct(_this->mWriter, TLV::AnonymousTag, - MakeTagValuePair(TLV::ContextTag(clusters::TestCluster::NestedStructList::kDFieldId), t.e)); + MakeTagValuePair(TLV::ContextTag(TestCluster::NestedStructList::kDFieldId), t.e)); NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); } @@ -767,7 +768,7 @@ void TestDataModelSerialization::TestDataModelSerialization_InvalidListType(nlTe // Decode // { - clusters::TestCluster::NestedStructList::DecodableType t; + TestCluster::NestedStructList::DecodableType t; _this->SetupReader(); diff --git a/src/app/zap-templates/templates/app/cluster-objects-src.zapt b/src/app/zap-templates/templates/app/cluster-objects-src.zapt index fea41f4781bf48..ab6c00d6565aa9 100644 --- a/src/app/zap-templates/templates/app/cluster-objects-src.zapt +++ b/src/app/zap-templates/templates/app/cluster-objects-src.zapt @@ -6,7 +6,7 @@ namespace chip { namespace app { -namespace clusters { +namespace Clusters { {{#zcl_clusters}} namespace {{asUpperCamelCase name}} { {{#zcl_structs}} @@ -92,6 +92,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) { {{/zcl_clusters}} -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt index d6f5f79ed29849..103ca07d40b822 100644 --- a/src/app/zap-templates/templates/app/cluster-objects.zapt +++ b/src/app/zap-templates/templates/app/cluster-objects.zapt @@ -10,7 +10,7 @@ namespace chip { namespace app { -namespace clusters { +namespace Clusters { {{#zcl_clusters}} namespace {{asUpperCamelCase name}} { @@ -66,6 +66,6 @@ namespace {{name}} { } // namespace {{asUpperCamelCase name}} {{/zcl_clusters}} -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt index afd30d77acba53..5397687945bb46 100644 --- a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt +++ b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt @@ -33,7 +33,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { {{#all_user_clusters}} {{#if (user_cluster_has_enabled_command name side)}} @@ -57,14 +57,14 @@ void Dispatch{{asUpperCamelCase side}}Command({{#if (isServer side)}}CommandHand switch (aCommandId) { {{/first}} - case Clusters::{{asUpperCamelCase parent.name}}::Commands::{{asUpperCamelCase name}}::Id: { + case Commands::{{asUpperCamelCase name}}::Id: { {{> im_command_handler_cluster_commands}} break; } {{#last}} default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::{{asUpperCamelCase parent.name}}::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, {{asUpperCamelCase parent.name}}::Id, aCommandId); return; } } @@ -74,7 +74,7 @@ void Dispatch{{asUpperCamelCase side}}Command({{#if (isServer side)}}CommandHand { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::{{asUpperCamelCase parent.name}}::Id, + {{asUpperCamelCase parent.name}}::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, @@ -87,7 +87,7 @@ void Dispatch{{asUpperCamelCase side}}Command({{#if (isServer side)}}CommandHand } {{/last}} {{else}} - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::{{asUpperCamelCase parent.name}}::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, {{asUpperCamelCase parent.name}}::Id, aCommandId); {{/chip_available_cluster_commands}} } @@ -96,7 +96,7 @@ void Dispatch{{asUpperCamelCase side}}Command({{#if (isServer side)}}CommandHand {{/if}} {{/all_user_clusters}} -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -111,7 +111,7 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En {{#chip_server_clusters}} {{#if (user_cluster_has_enabled_command name side)}} case Clusters::{{asUpperCamelCase name}}::Id: - clusters::{{asUpperCamelCase name}}::Dispatch{{asUpperCamelCase side}}Command(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::{{asUpperCamelCase name}}::Dispatch{{asUpperCamelCase side}}Command(apCommandObj, aCommandId, aEndPointId, aReader); break; {{/if}} {{/chip_server_clusters}} @@ -145,7 +145,7 @@ void DispatchSingleClusterResponseCommand(ClusterId aClusterId, CommandId aComma {{#chip_client_clusters}} {{#if (user_cluster_has_enabled_command name side)}} case Clusters::{{asUpperCamelCase name}}::Id: - clusters::{{asUpperCamelCase name}}::Dispatch{{asUpperCamelCase side}}Command(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::{{asUpperCamelCase name}}::Dispatch{{asUpperCamelCase side}}Command(apCommandObj, aCommandId, aEndPointId, aReader); break; {{/if}} {{/chip_client_clusters}} diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp index 80045f37c8c2cb..9f3e0eb3b7703c 100644 --- a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Id: { + case Commands::BarrierControlGoToPercent::Id: { expectArgumentCount = 1; uint8_t percentOpen; bool argExists[1]; @@ -315,14 +314,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::BarrierControl::Commands::BarrierControlStop::Id: { + case Commands::BarrierControlStop::Id: { wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::BarrierControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, BarrierControl::Id, aCommandId); return; } } @@ -332,7 +331,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::BarrierControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + BarrierControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -352,7 +351,7 @@ namespace Basic { void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, EndpointId aEndpointId, TLV::TLVReader & aDataTlv) { - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Basic::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Basic::Id, aCommandId); } } // namespace Basic @@ -374,7 +373,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Binding::Commands::Bind::Id: { + case Commands::Bind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -444,7 +443,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Binding::Commands::Unbind::Id: { + case Commands::Unbind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -516,7 +515,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Binding::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Binding::Id, aCommandId); return; } } @@ -526,7 +525,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -559,7 +558,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ColorControl::Commands::ColorLoopSet::Id: { + case Commands::ColorLoopSet::Id: { expectArgumentCount = 7; uint8_t updateFlags; uint8_t action; @@ -642,7 +641,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedMoveHue::Id: { + case Commands::EnhancedMoveHue::Id: { expectArgumentCount = 4; uint8_t moveMode; uint16_t rate; @@ -713,7 +712,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedMoveToHue::Id: { + case Commands::EnhancedMoveToHue::Id: { expectArgumentCount = 5; uint16_t enhancedHue; uint8_t direction; @@ -788,7 +787,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Id: { + case Commands::EnhancedMoveToHueAndSaturation::Id: { expectArgumentCount = 5; uint16_t enhancedHue; uint8_t saturation; @@ -863,7 +862,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedStepHue::Id: { + case Commands::EnhancedStepHue::Id: { expectArgumentCount = 5; uint8_t stepMode; uint16_t stepSize; @@ -938,7 +937,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveColor::Id: { + case Commands::MoveColor::Id: { expectArgumentCount = 4; int16_t rateX; int16_t rateY; @@ -1009,7 +1008,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveColorTemperature::Id: { + case Commands::MoveColorTemperature::Id: { expectArgumentCount = 6; uint8_t moveMode; uint16_t rate; @@ -1089,7 +1088,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveHue::Id: { + case Commands::MoveHue::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -1160,7 +1159,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveSaturation::Id: { + case Commands::MoveSaturation::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -1231,7 +1230,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColor::Id: { + case Commands::MoveToColor::Id: { expectArgumentCount = 5; uint16_t colorX; uint16_t colorY; @@ -1306,7 +1305,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColorTemperature::Id: { + case Commands::MoveToColorTemperature::Id: { expectArgumentCount = 4; uint16_t colorTemperature; uint16_t transitionTime; @@ -1377,7 +1376,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHue::Id: { + case Commands::MoveToHue::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t direction; @@ -1452,7 +1451,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id: { + case Commands::MoveToHueAndSaturation::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t saturation; @@ -1527,7 +1526,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToSaturation::Id: { + case Commands::MoveToSaturation::Id: { expectArgumentCount = 4; uint8_t saturation; uint16_t transitionTime; @@ -1598,7 +1597,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColor::Id: { + case Commands::StepColor::Id: { expectArgumentCount = 5; int16_t stepX; int16_t stepY; @@ -1673,7 +1672,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColorTemperature::Id: { + case Commands::StepColorTemperature::Id: { expectArgumentCount = 7; uint8_t stepMode; uint16_t stepSize; @@ -1757,7 +1756,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepHue::Id: { + case Commands::StepHue::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1832,7 +1831,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepSaturation::Id: { + case Commands::StepSaturation::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1907,7 +1906,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StopMoveStep::Id: { + case Commands::StopMoveStep::Id: { expectArgumentCount = 2; uint8_t optionsMask; uint8_t optionsOverride; @@ -1972,7 +1971,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ColorControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ColorControl::Id, aCommandId); return; } } @@ -1982,7 +1981,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2015,7 +2014,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -2084,7 +2083,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -2094,7 +2093,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2127,17 +2126,17 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DoorLock::Commands::ClearAllPins::Id: { + case Commands::ClearAllPins::Id: { wasHandled = emberAfDoorLockClusterClearAllPinsCallback(aEndpointId, apCommandObj); break; } - case Clusters::DoorLock::Commands::ClearAllRfids::Id: { + case Commands::ClearAllRfids::Id: { wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(aEndpointId, apCommandObj); break; } - case Clusters::DoorLock::Commands::ClearHolidaySchedule::Id: { + case Commands::ClearHolidaySchedule::Id: { expectArgumentCount = 1; uint8_t scheduleId; bool argExists[1]; @@ -2195,7 +2194,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearPin::Id: { + case Commands::ClearPin::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2253,7 +2252,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearRfid::Id: { + case Commands::ClearRfid::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2311,7 +2310,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearWeekdaySchedule::Id: { + case Commands::ClearWeekdaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2373,7 +2372,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearYeardaySchedule::Id: { + case Commands::ClearYeardaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2435,7 +2434,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetHolidaySchedule::Id: { + case Commands::GetHolidaySchedule::Id: { expectArgumentCount = 1; uint8_t scheduleId; bool argExists[1]; @@ -2493,7 +2492,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetLogRecord::Id: { + case Commands::GetLogRecord::Id: { expectArgumentCount = 1; uint16_t logIndex; bool argExists[1]; @@ -2551,7 +2550,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetPin::Id: { + case Commands::GetPin::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2609,7 +2608,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetRfid::Id: { + case Commands::GetRfid::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2667,7 +2666,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetUserType::Id: { + case Commands::GetUserType::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2725,7 +2724,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetWeekdaySchedule::Id: { + case Commands::GetWeekdaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2787,7 +2786,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetYeardaySchedule::Id: { + case Commands::GetYeardaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2849,7 +2848,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::LockDoor::Id: { + case Commands::LockDoor::Id: { expectArgumentCount = 1; const uint8_t * PIN; bool argExists[1]; @@ -2908,7 +2907,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetHolidaySchedule::Id: { + case Commands::SetHolidaySchedule::Id: { expectArgumentCount = 4; uint8_t scheduleId; uint32_t localStartTime; @@ -2979,7 +2978,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetPin::Id: { + case Commands::SetPin::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -3051,7 +3050,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetRfid::Id: { + case Commands::SetRfid::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -3123,7 +3122,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetUserType::Id: { + case Commands::SetUserType::Id: { expectArgumentCount = 2; uint16_t userId; uint8_t userType; @@ -3185,7 +3184,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetWeekdaySchedule::Id: { + case Commands::SetWeekdaySchedule::Id: { expectArgumentCount = 7; uint8_t scheduleId; uint16_t userId; @@ -3268,7 +3267,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetYeardaySchedule::Id: { + case Commands::SetYeardaySchedule::Id: { expectArgumentCount = 4; uint8_t scheduleId; uint16_t userId; @@ -3339,7 +3338,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::UnlockDoor::Id: { + case Commands::UnlockDoor::Id: { expectArgumentCount = 1; const uint8_t * PIN; bool argExists[1]; @@ -3398,7 +3397,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::UnlockWithTimeout::Id: { + case Commands::UnlockWithTimeout::Id: { expectArgumentCount = 2; uint16_t timeoutInSeconds; const uint8_t * pin; @@ -3464,7 +3463,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DoorLock::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DoorLock::Id, aCommandId); return; } } @@ -3474,7 +3473,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3507,14 +3506,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::EthernetNetworkDiagnostics::Commands::ResetCounts::Id: { + case Commands::ResetCounts::Id: { wasHandled = emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::EthernetNetworkDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, EthernetNetworkDiagnostics::Id, aCommandId); return; } } @@ -3524,8 +3523,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::EthernetNetworkDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + EthernetNetworkDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3558,7 +3556,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -3625,12 +3623,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -3704,7 +3702,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -3714,8 +3712,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3748,7 +3745,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Groups::Commands::AddGroup::Id: { + case Commands::AddGroup::Id: { expectArgumentCount = 2; uint16_t groupId; const uint8_t * groupName; @@ -3812,7 +3809,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::AddGroupIfIdentifying::Id: { + case Commands::AddGroupIfIdentifying::Id: { expectArgumentCount = 2; uint16_t groupId; const uint8_t * groupName; @@ -3876,7 +3873,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::GetGroupMembership::Id: { + case Commands::GetGroupMembership::Id: { expectArgumentCount = 2; uint8_t groupCount; /* TYPE WARNING: array array defaults to */ uint8_t * groupList; @@ -3939,12 +3936,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::RemoveAllGroups::Id: { + case Commands::RemoveAllGroups::Id: { wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(aEndpointId, apCommandObj); break; } - case Clusters::Groups::Commands::RemoveGroup::Id: { + case Commands::RemoveGroup::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -4002,7 +3999,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::ViewGroup::Id: { + case Commands::ViewGroup::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -4062,7 +4059,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Groups::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Groups::Id, aCommandId); return; } } @@ -4072,7 +4069,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4105,7 +4102,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::IasZone::Commands::ZoneEnrollResponse::Id: { + case Commands::ZoneEnrollResponse::Id: { expectArgumentCount = 2; uint8_t enrollResponseCode; uint8_t zoneId; @@ -4169,7 +4166,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::IasZone::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, IasZone::Id, aCommandId); return; } } @@ -4179,7 +4176,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::IasZone::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + IasZone::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4212,7 +4209,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Identify::Commands::Identify::Id: { + case Commands::Identify::Id: { expectArgumentCount = 1; uint16_t identifyTime; bool argExists[1]; @@ -4270,14 +4267,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Identify::Commands::IdentifyQuery::Id: { + case Commands::IdentifyQuery::Id: { wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Identify::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Identify::Id, aCommandId); return; } } @@ -4287,7 +4284,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4320,7 +4317,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LevelControl::Commands::Move::Id: { + case Commands::Move::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -4391,7 +4388,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevel::Id: { + case Commands::MoveToLevel::Id: { expectArgumentCount = 4; uint8_t level; uint16_t transitionTime; @@ -4462,7 +4459,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: { + case Commands::MoveToLevelWithOnOff::Id: { expectArgumentCount = 2; uint8_t level; uint16_t transitionTime; @@ -4525,7 +4522,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveWithOnOff::Id: { + case Commands::MoveWithOnOff::Id: { expectArgumentCount = 2; uint8_t moveMode; uint8_t rate; @@ -4587,7 +4584,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Step::Id: { + case Commands::Step::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -4662,7 +4659,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StepWithOnOff::Id: { + case Commands::StepWithOnOff::Id: { expectArgumentCount = 3; uint8_t stepMode; uint8_t stepSize; @@ -4729,7 +4726,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Stop::Id: { + case Commands::Stop::Id: { expectArgumentCount = 2; uint8_t optionMask; uint8_t optionOverride; @@ -4791,14 +4788,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StopWithOnOff::Id: { + case Commands::StopWithOnOff::Id: { wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LevelControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LevelControl::Id, aCommandId); return; } } @@ -4808,7 +4805,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4841,14 +4838,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LowPower::Commands::Sleep::Id: { + case Commands::Sleep::Id: { wasHandled = emberAfLowPowerClusterSleepCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LowPower::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LowPower::Id, aCommandId); return; } } @@ -4858,7 +4855,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LowPower::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LowPower::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4891,7 +4888,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -4958,7 +4955,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -5029,7 +5026,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -5096,7 +5093,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -5163,7 +5160,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -5222,7 +5219,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -5289,7 +5286,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -5356,7 +5353,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -5423,7 +5420,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -5496,7 +5493,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -5506,8 +5503,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5540,7 +5536,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id: { + case Commands::ApplyUpdateRequest::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t newVersion; @@ -5603,7 +5599,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id: { + case Commands::NotifyUpdateApplied::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t softwareVersion; @@ -5666,7 +5662,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Id: { + case Commands::QueryImage::Id: { expectArgumentCount = 8; uint16_t vendorId; uint16_t productId; @@ -5757,7 +5753,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OtaSoftwareUpdateProvider::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OtaSoftwareUpdateProvider::Id, aCommandId); return; } } @@ -5767,8 +5763,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OtaSoftwareUpdateProvider::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OtaSoftwareUpdateProvider::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5801,24 +5796,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -5828,7 +5823,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5861,7 +5856,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -5936,7 +5931,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -5995,7 +5990,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -6054,7 +6049,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -6113,7 +6108,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -6171,7 +6166,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -6229,7 +6224,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -6288,7 +6283,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -6348,7 +6343,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -6412,7 +6407,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -6422,8 +6417,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6456,7 +6450,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Scenes::Commands::AddScene::Id: { + case Commands::AddScene::Id: { expectArgumentCount = 5; uint16_t groupId; uint8_t sceneId; @@ -6533,7 +6527,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::GetSceneMembership::Id: { + case Commands::GetSceneMembership::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -6591,7 +6585,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RecallScene::Id: { + case Commands::RecallScene::Id: { expectArgumentCount = 3; uint16_t groupId; uint8_t sceneId; @@ -6657,7 +6651,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RemoveAllScenes::Id: { + case Commands::RemoveAllScenes::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -6715,7 +6709,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RemoveScene::Id: { + case Commands::RemoveScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6777,7 +6771,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::StoreScene::Id: { + case Commands::StoreScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6839,7 +6833,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::ViewScene::Id: { + case Commands::ViewScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6903,7 +6897,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Scenes::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Scenes::Id, aCommandId); return; } } @@ -6913,7 +6907,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6946,14 +6940,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::SoftwareDiagnostics::Commands::ResetWatermarks::Id: { + case Commands::ResetWatermarks::Id: { wasHandled = emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::SoftwareDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, SoftwareDiagnostics::Id, aCommandId); return; } } @@ -6963,8 +6957,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::SoftwareDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + SoftwareDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6997,12 +6990,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::TestCluster::Commands::Test::Id: { + case Commands::Test::Id: { wasHandled = emberAfTestClusterClusterTestCallback(aEndpointId, apCommandObj); break; } - case Clusters::TestCluster::Commands::TestAddArguments::Id: { + case Commands::TestAddArguments::Id: { expectArgumentCount = 2; uint8_t arg1; uint8_t arg2; @@ -7064,19 +7057,19 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::TestCluster::Commands::TestNotHandled::Id: { + case Commands::TestNotHandled::Id: { wasHandled = emberAfTestClusterClusterTestNotHandledCallback(aEndpointId, apCommandObj); break; } - case Clusters::TestCluster::Commands::TestSpecific::Id: { + case Commands::TestSpecific::Id: { wasHandled = emberAfTestClusterClusterTestSpecificCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TestCluster::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TestCluster::Id, aCommandId); return; } } @@ -7086,7 +7079,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -7119,14 +7112,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ThreadNetworkDiagnostics::Commands::ResetCounts::Id: { + case Commands::ResetCounts::Id: { wasHandled = emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ThreadNetworkDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ThreadNetworkDiagnostics::Id, aCommandId); return; } } @@ -7136,8 +7129,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ThreadNetworkDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + ThreadNetworkDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -7170,14 +7162,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::WiFiNetworkDiagnostics::Commands::ResetCounts::Id: { + case Commands::ResetCounts::Id: { wasHandled = emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::WiFiNetworkDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, WiFiNetworkDiagnostics::Id, aCommandId); return; } } @@ -7187,8 +7179,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::WiFiNetworkDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + WiFiNetworkDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -7221,24 +7212,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::WindowCovering::Commands::DownOrClose::Id: { + case Commands::DownOrClose::Id: { wasHandled = emberAfWindowCoveringClusterDownOrCloseCallback(aEndpointId, apCommandObj); break; } - case Clusters::WindowCovering::Commands::StopMotion::Id: { + case Commands::StopMotion::Id: { wasHandled = emberAfWindowCoveringClusterStopMotionCallback(aEndpointId, apCommandObj); break; } - case Clusters::WindowCovering::Commands::UpOrOpen::Id: { + case Commands::UpOrOpen::Id: { wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::WindowCovering::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, WindowCovering::Id, aCommandId); return; } } @@ -7248,7 +7239,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::WindowCovering::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + WindowCovering::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -7264,7 +7255,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace WindowCovering -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -7277,76 +7268,76 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::BarrierControl::Id: - clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Basic::Id: - clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Binding::Id: - clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ColorControl::Id: - clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DoorLock::Id: - clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::EthernetNetworkDiagnostics::Id: - clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Groups::Id: - clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::IasZone::Id: - clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Identify::Id: - clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LevelControl::Id: - clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LowPower::Id: - clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OtaSoftwareUpdateProvider::Id: - clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Scenes::Id: - clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::SoftwareDiagnostics::Id: - clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TestCluster::Id: - clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ThreadNetworkDiagnostics::Id: - clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::WiFiNetworkDiagnostics::Id: - clusters::WiFiNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::WiFiNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::WindowCovering::Id: - clusters::WindowCovering::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::WindowCovering::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 93fe9619535aff..751ea570cf0604 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -23,7 +23,7 @@ namespace chip { namespace app { -namespace clusters { +namespace Clusters { namespace PowerConfiguration { } @@ -1892,6 +1892,6 @@ namespace SampleMfgSpecificCluster { namespace SampleMfgSpecificCluster2 { } -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index c56ada631a2b73..a89b28037604df 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -27,7 +27,7 @@ namespace chip { namespace app { -namespace clusters { +namespace Clusters { namespace PowerConfiguration { @@ -1743,6 +1743,6 @@ namespace SampleMfgSpecificCluster2 { } // namespace SampleMfgSpecificCluster2 -} // namespace clusters +} // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp index 36366d440319e3..4b0af6524a33f4 100644 --- a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -326,7 +325,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -336,7 +335,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -369,7 +368,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -436,12 +435,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -515,7 +514,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -525,8 +524,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -559,7 +557,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LevelControl::Commands::Move::Id: { + case Commands::Move::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -630,7 +628,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevel::Id: { + case Commands::MoveToLevel::Id: { expectArgumentCount = 4; uint8_t level; uint16_t transitionTime; @@ -701,7 +699,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: { + case Commands::MoveToLevelWithOnOff::Id: { expectArgumentCount = 2; uint8_t level; uint16_t transitionTime; @@ -764,7 +762,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveWithOnOff::Id: { + case Commands::MoveWithOnOff::Id: { expectArgumentCount = 2; uint8_t moveMode; uint8_t rate; @@ -826,7 +824,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Step::Id: { + case Commands::Step::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -901,7 +899,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StepWithOnOff::Id: { + case Commands::StepWithOnOff::Id: { expectArgumentCount = 3; uint8_t stepMode; uint8_t stepSize; @@ -968,7 +966,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Stop::Id: { + case Commands::Stop::Id: { expectArgumentCount = 2; uint8_t optionMask; uint8_t optionOverride; @@ -1030,14 +1028,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StopWithOnOff::Id: { + case Commands::StopWithOnOff::Id: { wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LevelControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LevelControl::Id, aCommandId); return; } } @@ -1047,7 +1045,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1080,7 +1078,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -1147,7 +1145,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1218,7 +1216,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -1285,7 +1283,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -1352,7 +1350,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -1411,7 +1409,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -1478,7 +1476,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -1545,7 +1543,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -1612,7 +1610,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1685,7 +1683,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -1695,8 +1693,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1729,24 +1726,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -1756,7 +1753,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1789,7 +1786,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1864,7 +1861,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -1923,7 +1920,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -1982,7 +1979,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -2041,7 +2038,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -2099,7 +2096,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -2157,7 +2154,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -2216,7 +2213,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -2276,7 +2273,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -2340,7 +2337,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -2350,8 +2347,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2367,7 +2363,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace OperationalCredentials -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -2380,25 +2376,25 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LevelControl::Id: - clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index d8f71327a0e957..83a6fb8209c0e1 100644 --- a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AccountLogin { @@ -68,7 +68,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::AccountLogin::Commands::GetSetupPINResponse::Id: { + case Commands::GetSetupPINResponse::Id: { expectArgumentCount = 1; const uint8_t * setupPIN; bool argExists[1]; @@ -130,7 +130,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AccountLogin::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AccountLogin::Id, aCommandId); return; } } @@ -140,7 +140,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AccountLogin::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + AccountLogin::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -173,7 +173,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::ApplicationLauncher::Commands::LaunchAppResponse::Id: { + case Commands::LaunchAppResponse::Id: { expectArgumentCount = 2; uint8_t status; const uint8_t * data; @@ -239,7 +239,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ApplicationLauncher::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ApplicationLauncher::Id, aCommandId); return; } } @@ -249,8 +249,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ApplicationLauncher::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + ApplicationLauncher::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -283,7 +282,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::ContentLauncher::Commands::LaunchContentResponse::Id: { + case Commands::LaunchContentResponse::Id: { expectArgumentCount = 2; const uint8_t * data; uint8_t contentLaunchStatus; @@ -347,7 +346,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::ContentLauncher::Commands::LaunchURLResponse::Id: { + case Commands::LaunchURLResponse::Id: { expectArgumentCount = 2; const uint8_t * data; uint8_t contentLaunchStatus; @@ -413,7 +412,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ContentLauncher::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ContentLauncher::Id, aCommandId); return; } } @@ -423,7 +422,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ContentLauncher::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + ContentLauncher::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -456,7 +455,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::DoorLock::Commands::ClearAllPinsResponse::Id: { + case Commands::ClearAllPinsResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -514,7 +513,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::ClearAllRfidsResponse::Id: { + case Commands::ClearAllRfidsResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -572,7 +571,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::Id: { + case Commands::ClearHolidayScheduleResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -630,7 +629,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::ClearPinResponse::Id: { + case Commands::ClearPinResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -688,7 +687,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::ClearRfidResponse::Id: { + case Commands::ClearRfidResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -746,7 +745,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::Id: { + case Commands::ClearWeekdayScheduleResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -804,7 +803,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::Id: { + case Commands::ClearYeardayScheduleResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -862,7 +861,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::GetHolidayScheduleResponse::Id: { + case Commands::GetHolidayScheduleResponse::Id: { expectArgumentCount = 5; uint8_t scheduleId; uint8_t status; @@ -937,7 +936,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::GetLogRecordResponse::Id: { + case Commands::GetLogRecordResponse::Id: { expectArgumentCount = 7; uint16_t logEntryId; uint32_t timestamp; @@ -1022,7 +1021,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::GetPinResponse::Id: { + case Commands::GetPinResponse::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -1094,7 +1093,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::GetRfidResponse::Id: { + case Commands::GetRfidResponse::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -1166,7 +1165,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::GetUserTypeResponse::Id: { + case Commands::GetUserTypeResponse::Id: { expectArgumentCount = 2; uint16_t userId; uint8_t userType; @@ -1228,7 +1227,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::Id: { + case Commands::GetWeekdayScheduleResponse::Id: { expectArgumentCount = 8; uint8_t scheduleId; uint16_t userId; @@ -1315,7 +1314,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::GetYeardayScheduleResponse::Id: { + case Commands::GetYeardayScheduleResponse::Id: { expectArgumentCount = 5; uint8_t scheduleId; uint16_t userId; @@ -1390,7 +1389,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::LockDoorResponse::Id: { + case Commands::LockDoorResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1448,7 +1447,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::SetHolidayScheduleResponse::Id: { + case Commands::SetHolidayScheduleResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1506,7 +1505,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::SetPinResponse::Id: { + case Commands::SetPinResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1564,7 +1563,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::SetRfidResponse::Id: { + case Commands::SetRfidResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1622,7 +1621,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::SetUserTypeResponse::Id: { + case Commands::SetUserTypeResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1680,7 +1679,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::Id: { + case Commands::SetWeekdayScheduleResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1738,7 +1737,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::SetYeardayScheduleResponse::Id: { + case Commands::SetYeardayScheduleResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1796,7 +1795,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::UnlockDoorResponse::Id: { + case Commands::UnlockDoorResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1854,7 +1853,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::Id: { + case Commands::UnlockWithTimeoutResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -1914,7 +1913,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DoorLock::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DoorLock::Id, aCommandId); return; } } @@ -1924,7 +1923,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1957,7 +1956,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::Id: { + case Commands::ArmFailSafeResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -2021,7 +2020,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::Id: { + case Commands::CommissioningCompleteResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -2085,7 +2084,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id: { + case Commands::SetRegulatoryConfigResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -2151,7 +2150,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -2161,8 +2160,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2195,7 +2193,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::Groups::Commands::AddGroupResponse::Id: { + case Commands::AddGroupResponse::Id: { expectArgumentCount = 2; uint8_t status; uint16_t groupId; @@ -2257,7 +2255,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Groups::Commands::GetGroupMembershipResponse::Id: { + case Commands::GetGroupMembershipResponse::Id: { expectArgumentCount = 3; uint8_t capacity; uint8_t groupCount; @@ -2325,7 +2323,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Groups::Commands::RemoveGroupResponse::Id: { + case Commands::RemoveGroupResponse::Id: { expectArgumentCount = 2; uint8_t status; uint16_t groupId; @@ -2387,7 +2385,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Groups::Commands::ViewGroupResponse::Id: { + case Commands::ViewGroupResponse::Id: { expectArgumentCount = 3; uint8_t status; uint16_t groupId; @@ -2457,7 +2455,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Groups::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Groups::Id, aCommandId); return; } } @@ -2467,7 +2465,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2500,7 +2498,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::Identify::Commands::IdentifyQueryResponse::Id: { + case Commands::IdentifyQueryResponse::Id: { expectArgumentCount = 1; uint16_t timeout; bool argExists[1]; @@ -2560,7 +2558,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Identify::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Identify::Id, aCommandId); return; } } @@ -2570,7 +2568,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2603,7 +2601,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::KeypadInput::Commands::SendKeyResponse::Id: { + case Commands::SendKeyResponse::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -2663,7 +2661,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::KeypadInput::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, KeypadInput::Id, aCommandId); return; } } @@ -2673,7 +2671,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::KeypadInput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + KeypadInput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2706,7 +2704,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::MediaPlayback::Commands::MediaFastForwardResponse::Id: { + case Commands::MediaFastForwardResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -2765,7 +2763,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaNextResponse::Id: { + case Commands::MediaNextResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -2823,7 +2821,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaPauseResponse::Id: { + case Commands::MediaPauseResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -2881,7 +2879,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaPlayResponse::Id: { + case Commands::MediaPlayResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -2939,7 +2937,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaPreviousResponse::Id: { + case Commands::MediaPreviousResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -2998,7 +2996,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaRewindResponse::Id: { + case Commands::MediaRewindResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -3056,7 +3054,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaSeekResponse::Id: { + case Commands::MediaSeekResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -3114,7 +3112,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::Id: { + case Commands::MediaSkipBackwardResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -3173,7 +3171,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::Id: { + case Commands::MediaSkipForwardResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -3232,7 +3230,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaStartOverResponse::Id: { + case Commands::MediaStartOverResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -3291,7 +3289,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::MediaPlayback::Commands::MediaStopResponse::Id: { + case Commands::MediaStopResponse::Id: { expectArgumentCount = 1; uint8_t mediaPlaybackStatus; bool argExists[1]; @@ -3351,7 +3349,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::MediaPlayback::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, MediaPlayback::Id, aCommandId); return; } } @@ -3361,7 +3359,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::MediaPlayback::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + MediaPlayback::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3394,7 +3392,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetworkResponse::Id: { + case Commands::AddThreadNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3458,7 +3456,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetworkResponse::Id: { + case Commands::AddWiFiNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3522,7 +3520,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetworkResponse::Id: { + case Commands::DisableNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3586,7 +3584,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetworkResponse::Id: { + case Commands::EnableNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3650,7 +3648,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetworkResponse::Id: { + case Commands::RemoveNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3714,7 +3712,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::Id: { + case Commands::ScanNetworksResponse::Id: { expectArgumentCount = 4; uint8_t errorCode; const uint8_t * debugText; @@ -3788,7 +3786,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetworkResponse::Id: { + case Commands::UpdateThreadNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3852,7 +3850,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetworkResponse::Id: { + case Commands::UpdateWiFiNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3918,7 +3916,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -3928,8 +3926,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3962,7 +3959,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequestResponse::Id: { + case Commands::ApplyUpdateRequestResponse::Id: { expectArgumentCount = 2; uint8_t action; uint32_t delayedActionTime; @@ -4025,7 +4022,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id: { + case Commands::QueryImageResponse::Id: { expectArgumentCount = 8; uint8_t status; uint32_t delayedActionTime; @@ -4117,7 +4114,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OtaSoftwareUpdateProvider::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OtaSoftwareUpdateProvider::Id, aCommandId); return; } } @@ -4127,8 +4124,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OtaSoftwareUpdateProvider::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OtaSoftwareUpdateProvider::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4161,7 +4157,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AttestationResponse::Id: { + case Commands::AttestationResponse::Id: { expectArgumentCount = 2; chip::ByteSpan AttestationElements; chip::ByteSpan Signature; @@ -4224,7 +4220,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainResponse::Id: { + case Commands::CertificateChainResponse::Id: { expectArgumentCount = 1; chip::ByteSpan Certificate; bool argExists[1]; @@ -4283,7 +4279,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OperationalCredentials::Commands::NOCResponse::Id: { + case Commands::NOCResponse::Id: { expectArgumentCount = 3; uint8_t StatusCode; uint8_t FabricIndex; @@ -4350,7 +4346,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OperationalCredentials::Commands::OpCSRResponse::Id: { + case Commands::OpCSRResponse::Id: { expectArgumentCount = 2; chip::ByteSpan NOCSRElements; chip::ByteSpan AttestationSignature; @@ -4415,7 +4411,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -4425,8 +4421,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4459,7 +4454,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::Scenes::Commands::AddSceneResponse::Id: { + case Commands::AddSceneResponse::Id: { expectArgumentCount = 3; uint8_t status; uint16_t groupId; @@ -4525,7 +4520,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Scenes::Commands::GetSceneMembershipResponse::Id: { + case Commands::GetSceneMembershipResponse::Id: { expectArgumentCount = 5; uint8_t status; uint8_t capacity; @@ -4601,7 +4596,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Scenes::Commands::RemoveAllScenesResponse::Id: { + case Commands::RemoveAllScenesResponse::Id: { expectArgumentCount = 2; uint8_t status; uint16_t groupId; @@ -4663,7 +4658,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Scenes::Commands::RemoveSceneResponse::Id: { + case Commands::RemoveSceneResponse::Id: { expectArgumentCount = 3; uint8_t status; uint16_t groupId; @@ -4729,7 +4724,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Scenes::Commands::StoreSceneResponse::Id: { + case Commands::StoreSceneResponse::Id: { expectArgumentCount = 3; uint8_t status; uint16_t groupId; @@ -4795,7 +4790,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::Scenes::Commands::ViewSceneResponse::Id: { + case Commands::ViewSceneResponse::Id: { expectArgumentCount = 6; uint8_t status; uint16_t groupId; @@ -4879,7 +4874,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Scenes::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Scenes::Id, aCommandId); return; } } @@ -4889,7 +4884,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4922,7 +4917,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::TvChannel::Commands::ChangeChannelResponse::Id: { + case Commands::ChangeChannelResponse::Id: { expectArgumentCount = 2; /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch; uint8_t ErrorType; @@ -4988,7 +4983,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TvChannel::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TvChannel::Id, aCommandId); return; } } @@ -4998,7 +4993,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TvChannel::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TvChannel::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5031,7 +5026,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::TargetNavigator::Commands::NavigateTargetResponse::Id: { + case Commands::NavigateTargetResponse::Id: { expectArgumentCount = 2; uint8_t status; const uint8_t * data; @@ -5097,7 +5092,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TargetNavigator::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TargetNavigator::Id, aCommandId); return; } } @@ -5107,7 +5102,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TargetNavigator::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TargetNavigator::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5140,7 +5135,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::TestCluster::Commands::TestAddArgumentsResponse::Id: { + case Commands::TestAddArgumentsResponse::Id: { expectArgumentCount = 1; uint8_t returnValue; bool argExists[1]; @@ -5198,7 +5193,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::TestCluster::Commands::TestSpecificResponse::Id: { + case Commands::TestSpecificResponse::Id: { expectArgumentCount = 1; uint8_t returnValue; bool argExists[1]; @@ -5258,7 +5253,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TestCluster::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TestCluster::Id, aCommandId); return; } } @@ -5268,7 +5263,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5284,7 +5279,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } // namespace TestCluster -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -5322,52 +5317,52 @@ void DispatchSingleClusterResponseCommand(ClusterId aClusterId, CommandId aComma switch (aClusterId) { case Clusters::AccountLogin::Id: - clusters::AccountLogin::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AccountLogin::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ApplicationLauncher::Id: - clusters::ApplicationLauncher::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ApplicationLauncher::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ContentLauncher::Id: - clusters::ContentLauncher::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ContentLauncher::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DoorLock::Id: - clusters::DoorLock::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DoorLock::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Groups::Id: - clusters::Groups::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Groups::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Identify::Id: - clusters::Identify::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Identify::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::KeypadInput::Id: - clusters::KeypadInput::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::KeypadInput::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::MediaPlayback::Id: - clusters::MediaPlayback::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::MediaPlayback::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OtaSoftwareUpdateProvider::Id: - clusters::OtaSoftwareUpdateProvider::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OtaSoftwareUpdateProvider::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Scenes::Id: - clusters::Scenes::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Scenes::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TvChannel::Id: - clusters::TvChannel::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TvChannel::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TargetNavigator::Id: - clusters::TargetNavigator::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TargetNavigator::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TestCluster::Id: - clusters::TestCluster::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TestCluster::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp index 654285a03478e0..6a15f05bdc8a3f 100644 --- a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ColorControl::Commands::ColorLoopSet::Id: { + case Commands::ColorLoopSet::Id: { expectArgumentCount = 7; uint8_t updateFlags; uint8_t action; @@ -340,7 +339,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedMoveHue::Id: { + case Commands::EnhancedMoveHue::Id: { expectArgumentCount = 4; uint8_t moveMode; uint16_t rate; @@ -411,7 +410,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedMoveToHue::Id: { + case Commands::EnhancedMoveToHue::Id: { expectArgumentCount = 5; uint16_t enhancedHue; uint8_t direction; @@ -486,7 +485,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedMoveToHueAndSaturation::Id: { + case Commands::EnhancedMoveToHueAndSaturation::Id: { expectArgumentCount = 5; uint16_t enhancedHue; uint8_t saturation; @@ -561,7 +560,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::EnhancedStepHue::Id: { + case Commands::EnhancedStepHue::Id: { expectArgumentCount = 5; uint8_t stepMode; uint16_t stepSize; @@ -636,7 +635,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveColor::Id: { + case Commands::MoveColor::Id: { expectArgumentCount = 4; int16_t rateX; int16_t rateY; @@ -707,7 +706,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveColorTemperature::Id: { + case Commands::MoveColorTemperature::Id: { expectArgumentCount = 6; uint8_t moveMode; uint16_t rate; @@ -787,7 +786,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveHue::Id: { + case Commands::MoveHue::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -858,7 +857,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveSaturation::Id: { + case Commands::MoveSaturation::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -929,7 +928,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColor::Id: { + case Commands::MoveToColor::Id: { expectArgumentCount = 5; uint16_t colorX; uint16_t colorY; @@ -1004,7 +1003,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColorTemperature::Id: { + case Commands::MoveToColorTemperature::Id: { expectArgumentCount = 4; uint16_t colorTemperature; uint16_t transitionTime; @@ -1075,7 +1074,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHue::Id: { + case Commands::MoveToHue::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t direction; @@ -1150,7 +1149,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id: { + case Commands::MoveToHueAndSaturation::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t saturation; @@ -1225,7 +1224,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToSaturation::Id: { + case Commands::MoveToSaturation::Id: { expectArgumentCount = 4; uint8_t saturation; uint16_t transitionTime; @@ -1296,7 +1295,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColor::Id: { + case Commands::StepColor::Id: { expectArgumentCount = 5; int16_t stepX; int16_t stepY; @@ -1371,7 +1370,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColorTemperature::Id: { + case Commands::StepColorTemperature::Id: { expectArgumentCount = 7; uint8_t stepMode; uint16_t stepSize; @@ -1455,7 +1454,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepHue::Id: { + case Commands::StepHue::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1530,7 +1529,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepSaturation::Id: { + case Commands::StepSaturation::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1605,7 +1604,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StopMoveStep::Id: { + case Commands::StopMoveStep::Id: { expectArgumentCount = 2; uint8_t optionsMask; uint8_t optionsOverride; @@ -1670,7 +1669,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ColorControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ColorControl::Id, aCommandId); return; } } @@ -1680,7 +1679,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1713,7 +1712,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -1782,7 +1781,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -1792,7 +1791,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1825,14 +1824,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::EthernetNetworkDiagnostics::Commands::ResetCounts::Id: { + case Commands::ResetCounts::Id: { wasHandled = emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::EthernetNetworkDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, EthernetNetworkDiagnostics::Id, aCommandId); return; } } @@ -1842,8 +1841,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::EthernetNetworkDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + EthernetNetworkDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1876,7 +1874,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -1943,12 +1941,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -2022,7 +2020,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -2032,8 +2030,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2066,7 +2063,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LevelControl::Commands::Move::Id: { + case Commands::Move::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -2137,7 +2134,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevel::Id: { + case Commands::MoveToLevel::Id: { expectArgumentCount = 4; uint8_t level; uint16_t transitionTime; @@ -2208,7 +2205,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: { + case Commands::MoveToLevelWithOnOff::Id: { expectArgumentCount = 2; uint8_t level; uint16_t transitionTime; @@ -2271,7 +2268,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveWithOnOff::Id: { + case Commands::MoveWithOnOff::Id: { expectArgumentCount = 2; uint8_t moveMode; uint8_t rate; @@ -2333,7 +2330,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Step::Id: { + case Commands::Step::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -2408,7 +2405,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StepWithOnOff::Id: { + case Commands::StepWithOnOff::Id: { expectArgumentCount = 3; uint8_t stepMode; uint8_t stepSize; @@ -2475,7 +2472,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Stop::Id: { + case Commands::Stop::Id: { expectArgumentCount = 2; uint8_t optionMask; uint8_t optionOverride; @@ -2537,14 +2534,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StopWithOnOff::Id: { + case Commands::StopWithOnOff::Id: { wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LevelControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LevelControl::Id, aCommandId); return; } } @@ -2554,7 +2551,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2587,7 +2584,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -2654,7 +2651,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -2725,7 +2722,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -2792,7 +2789,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -2859,7 +2856,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -2918,7 +2915,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -2985,7 +2982,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -3052,7 +3049,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -3119,7 +3116,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -3192,7 +3189,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -3202,8 +3199,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3236,24 +3232,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -3263,7 +3259,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3296,7 +3292,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -3371,7 +3367,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -3430,7 +3426,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -3489,7 +3485,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -3548,7 +3544,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -3606,7 +3602,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -3664,7 +3660,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -3723,7 +3719,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -3783,7 +3779,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -3847,7 +3843,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -3857,8 +3853,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3891,14 +3886,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::SoftwareDiagnostics::Commands::ResetWatermarks::Id: { + case Commands::ResetWatermarks::Id: { wasHandled = emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::SoftwareDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, SoftwareDiagnostics::Id, aCommandId); return; } } @@ -3908,8 +3903,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::SoftwareDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + SoftwareDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3942,14 +3936,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ThreadNetworkDiagnostics::Commands::ResetCounts::Id: { + case Commands::ResetCounts::Id: { wasHandled = emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ThreadNetworkDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ThreadNetworkDiagnostics::Id, aCommandId); return; } } @@ -3959,8 +3953,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ThreadNetworkDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + ThreadNetworkDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3993,14 +3986,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::WiFiNetworkDiagnostics::Commands::ResetCounts::Id: { + case Commands::ResetCounts::Id: { wasHandled = emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::WiFiNetworkDiagnostics::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, WiFiNetworkDiagnostics::Id, aCommandId); return; } } @@ -4010,8 +4003,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::WiFiNetworkDiagnostics::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + WiFiNetworkDiagnostics::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4027,7 +4019,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace WiFiNetworkDiagnostics -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -4040,40 +4032,40 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ColorControl::Id: - clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::EthernetNetworkDiagnostics::Id: - clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::EthernetNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LevelControl::Id: - clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::SoftwareDiagnostics::Id: - clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::SoftwareDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ThreadNetworkDiagnostics::Id: - clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::WiFiNetworkDiagnostics::Id: - clusters::WiFiNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::WiFiNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp index 322bf947de73b6..d1f7ee59af1472 100644 --- a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -326,7 +325,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -336,7 +335,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -369,7 +368,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -436,12 +435,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -515,7 +514,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -525,8 +524,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -559,7 +557,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -626,7 +624,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -697,7 +695,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -764,7 +762,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -831,7 +829,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -890,7 +888,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -957,7 +955,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -1024,7 +1022,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -1091,7 +1089,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1164,7 +1162,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -1174,8 +1172,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1208,24 +1205,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -1235,7 +1232,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1268,7 +1265,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1343,7 +1340,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -1402,7 +1399,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -1461,7 +1458,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -1520,7 +1517,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -1578,7 +1575,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -1636,7 +1633,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -1695,7 +1692,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -1755,7 +1752,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1819,7 +1816,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -1829,8 +1826,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1846,7 +1842,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace OperationalCredentials -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -1859,22 +1855,22 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp index 477230707aff5f..1cf66c0f03eb99 100644 --- a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace OtaSoftwareUpdateProvider { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id: { + case Commands::ApplyUpdateRequest::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t newVersion; @@ -131,7 +131,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id: { + case Commands::NotifyUpdateApplied::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t softwareVersion; @@ -194,7 +194,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Id: { + case Commands::QueryImage::Id: { expectArgumentCount = 8; uint16_t vendorId; uint16_t productId; @@ -285,7 +285,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OtaSoftwareUpdateProvider::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OtaSoftwareUpdateProvider::Id, aCommandId); return; } } @@ -295,8 +295,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OtaSoftwareUpdateProvider::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OtaSoftwareUpdateProvider::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -329,7 +328,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -404,7 +403,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -463,7 +462,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -522,7 +521,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -581,7 +580,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -639,7 +638,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -697,7 +696,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -759,7 +758,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -769,8 +768,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -786,7 +784,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace OperationalCredentials -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -799,10 +797,10 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::OtaSoftwareUpdateProvider::Id: - clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp index dd52171c8d6559..41a808c8b86353 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace OtaSoftwareUpdateProvider { @@ -68,7 +68,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequestResponse::Id: { + case Commands::ApplyUpdateRequestResponse::Id: { expectArgumentCount = 2; uint8_t action; uint32_t delayedActionTime; @@ -131,7 +131,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id: { + case Commands::QueryImageResponse::Id: { expectArgumentCount = 8; uint8_t status; uint32_t delayedActionTime; @@ -223,7 +223,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OtaSoftwareUpdateProvider::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OtaSoftwareUpdateProvider::Id, aCommandId); return; } } @@ -233,8 +233,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OtaSoftwareUpdateProvider::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OtaSoftwareUpdateProvider::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -250,7 +249,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } // namespace OtaSoftwareUpdateProvider -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -288,7 +287,7 @@ void DispatchSingleClusterResponseCommand(ClusterId aClusterId, CommandId aComma switch (aClusterId) { case Clusters::OtaSoftwareUpdateProvider::Id: - clusters::OtaSoftwareUpdateProvider::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OtaSoftwareUpdateProvider::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp index aff545b3f90409..a8fcbbec904d92 100644 --- a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -244,7 +243,7 @@ namespace Basic { void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, EndpointId aEndpointId, TLV::TLVReader & aDataTlv) { - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Basic::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Basic::Id, aCommandId); } } // namespace Basic @@ -266,7 +265,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -335,7 +334,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -345,7 +344,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -378,7 +377,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -445,12 +444,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -524,7 +523,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -534,8 +533,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -568,7 +566,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LevelControl::Commands::Move::Id: { + case Commands::Move::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -639,7 +637,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevel::Id: { + case Commands::MoveToLevel::Id: { expectArgumentCount = 4; uint8_t level; uint16_t transitionTime; @@ -710,7 +708,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: { + case Commands::MoveToLevelWithOnOff::Id: { expectArgumentCount = 2; uint8_t level; uint16_t transitionTime; @@ -773,7 +771,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveWithOnOff::Id: { + case Commands::MoveWithOnOff::Id: { expectArgumentCount = 2; uint8_t moveMode; uint8_t rate; @@ -835,7 +833,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Step::Id: { + case Commands::Step::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -910,7 +908,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StepWithOnOff::Id: { + case Commands::StepWithOnOff::Id: { expectArgumentCount = 3; uint8_t stepMode; uint8_t stepSize; @@ -977,7 +975,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Stop::Id: { + case Commands::Stop::Id: { expectArgumentCount = 2; uint8_t optionMask; uint8_t optionOverride; @@ -1039,14 +1037,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StopWithOnOff::Id: { + case Commands::StopWithOnOff::Id: { wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LevelControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LevelControl::Id, aCommandId); return; } } @@ -1056,7 +1054,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1089,7 +1087,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -1156,7 +1154,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1227,7 +1225,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -1294,7 +1292,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -1361,7 +1359,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -1428,7 +1426,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -1495,7 +1493,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -1562,7 +1560,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1635,7 +1633,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -1645,8 +1643,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1679,24 +1676,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -1706,7 +1703,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1739,7 +1736,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1814,7 +1811,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -1873,7 +1870,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -1932,7 +1929,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -1991,7 +1988,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -2049,7 +2046,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -2107,7 +2104,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -2166,7 +2163,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -2226,7 +2223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -2290,7 +2287,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -2300,8 +2297,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2317,7 +2313,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace OperationalCredentials -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -2330,28 +2326,28 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Basic::Id: - clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LevelControl::Id: - clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp index bc7200a82f75ca..f2c0f561703d04 100644 --- a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -244,7 +243,7 @@ namespace Basic { void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, EndpointId aEndpointId, TLV::TLVReader & aDataTlv) { - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Basic::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Basic::Id, aCommandId); } } // namespace Basic @@ -266,7 +265,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -335,7 +334,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -345,7 +344,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -378,7 +377,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -445,12 +444,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -524,7 +523,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -534,8 +533,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -568,7 +566,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -635,7 +633,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -706,7 +704,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -773,7 +771,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -840,7 +838,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -899,7 +897,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -966,7 +964,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -1033,7 +1031,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -1100,7 +1098,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1173,7 +1171,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -1183,8 +1181,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1217,7 +1214,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1292,7 +1289,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -1351,7 +1348,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -1410,7 +1407,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -1469,7 +1466,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -1527,7 +1524,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -1585,7 +1582,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -1644,7 +1641,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -1704,7 +1701,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1768,7 +1765,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -1778,8 +1775,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1795,7 +1791,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace OperationalCredentials -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -1808,22 +1804,22 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Basic::Id: - clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp index 4363ffa871d8ee..34645539f7dbde 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -326,7 +325,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -336,7 +335,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -369,7 +368,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -436,12 +435,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -515,7 +514,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -525,8 +524,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -559,7 +557,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -630,7 +628,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -697,7 +695,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -764,7 +762,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -823,7 +821,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -890,7 +888,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -957,7 +955,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1030,7 +1028,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -1040,8 +1038,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1074,7 +1071,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1149,7 +1146,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -1208,7 +1205,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -1267,7 +1264,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -1326,7 +1323,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -1384,7 +1381,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -1442,7 +1439,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -1501,7 +1498,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -1561,7 +1558,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1625,7 +1622,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -1635,8 +1632,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1652,7 +1648,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace OperationalCredentials -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -1665,19 +1661,19 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp index 3763b576ee7c31..310dcaea64c1bc 100644 --- a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Id: { + case Commands::BarrierControlGoToPercent::Id: { expectArgumentCount = 1; uint8_t percentOpen; bool argExists[1]; @@ -315,14 +314,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::BarrierControl::Commands::BarrierControlStop::Id: { + case Commands::BarrierControlStop::Id: { wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::BarrierControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, BarrierControl::Id, aCommandId); return; } } @@ -332,7 +331,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::BarrierControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + BarrierControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -352,7 +351,7 @@ namespace Basic { void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, EndpointId aEndpointId, TLV::TLVReader & aDataTlv) { - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Basic::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Basic::Id, aCommandId); } } // namespace Basic @@ -374,7 +373,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Binding::Commands::Bind::Id: { + case Commands::Bind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -444,7 +443,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Binding::Commands::Unbind::Id: { + case Commands::Unbind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -516,7 +515,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Binding::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Binding::Id, aCommandId); return; } } @@ -526,7 +525,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -559,7 +558,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ColorControl::Commands::MoveColor::Id: { + case Commands::MoveColor::Id: { expectArgumentCount = 4; int16_t rateX; int16_t rateY; @@ -630,7 +629,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveColorTemperature::Id: { + case Commands::MoveColorTemperature::Id: { expectArgumentCount = 6; uint8_t moveMode; uint16_t rate; @@ -710,7 +709,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveHue::Id: { + case Commands::MoveHue::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -781,7 +780,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveSaturation::Id: { + case Commands::MoveSaturation::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -852,7 +851,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColor::Id: { + case Commands::MoveToColor::Id: { expectArgumentCount = 5; uint16_t colorX; uint16_t colorY; @@ -927,7 +926,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColorTemperature::Id: { + case Commands::MoveToColorTemperature::Id: { expectArgumentCount = 4; uint16_t colorTemperature; uint16_t transitionTime; @@ -998,7 +997,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHue::Id: { + case Commands::MoveToHue::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t direction; @@ -1073,7 +1072,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id: { + case Commands::MoveToHueAndSaturation::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t saturation; @@ -1148,7 +1147,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToSaturation::Id: { + case Commands::MoveToSaturation::Id: { expectArgumentCount = 4; uint8_t saturation; uint16_t transitionTime; @@ -1219,7 +1218,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColor::Id: { + case Commands::StepColor::Id: { expectArgumentCount = 5; int16_t stepX; int16_t stepY; @@ -1294,7 +1293,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColorTemperature::Id: { + case Commands::StepColorTemperature::Id: { expectArgumentCount = 7; uint8_t stepMode; uint16_t stepSize; @@ -1378,7 +1377,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepHue::Id: { + case Commands::StepHue::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1453,7 +1452,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepSaturation::Id: { + case Commands::StepSaturation::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1528,7 +1527,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StopMoveStep::Id: { + case Commands::StopMoveStep::Id: { expectArgumentCount = 2; uint8_t optionsMask; uint8_t optionsOverride; @@ -1593,7 +1592,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ColorControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ColorControl::Id, aCommandId); return; } } @@ -1603,7 +1602,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1636,7 +1635,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -1705,7 +1704,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -1715,7 +1714,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1748,17 +1747,17 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DoorLock::Commands::ClearAllPins::Id: { + case Commands::ClearAllPins::Id: { wasHandled = emberAfDoorLockClusterClearAllPinsCallback(aEndpointId, apCommandObj); break; } - case Clusters::DoorLock::Commands::ClearAllRfids::Id: { + case Commands::ClearAllRfids::Id: { wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(aEndpointId, apCommandObj); break; } - case Clusters::DoorLock::Commands::ClearHolidaySchedule::Id: { + case Commands::ClearHolidaySchedule::Id: { expectArgumentCount = 1; uint8_t scheduleId; bool argExists[1]; @@ -1816,7 +1815,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearPin::Id: { + case Commands::ClearPin::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -1874,7 +1873,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearRfid::Id: { + case Commands::ClearRfid::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -1932,7 +1931,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearWeekdaySchedule::Id: { + case Commands::ClearWeekdaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -1994,7 +1993,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearYeardaySchedule::Id: { + case Commands::ClearYeardaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2056,7 +2055,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetHolidaySchedule::Id: { + case Commands::GetHolidaySchedule::Id: { expectArgumentCount = 1; uint8_t scheduleId; bool argExists[1]; @@ -2114,7 +2113,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetLogRecord::Id: { + case Commands::GetLogRecord::Id: { expectArgumentCount = 1; uint16_t logIndex; bool argExists[1]; @@ -2172,7 +2171,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetPin::Id: { + case Commands::GetPin::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2230,7 +2229,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetRfid::Id: { + case Commands::GetRfid::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2288,7 +2287,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetUserType::Id: { + case Commands::GetUserType::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2346,7 +2345,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetWeekdaySchedule::Id: { + case Commands::GetWeekdaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2408,7 +2407,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetYeardaySchedule::Id: { + case Commands::GetYeardaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2470,7 +2469,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::LockDoor::Id: { + case Commands::LockDoor::Id: { expectArgumentCount = 1; const uint8_t * PIN; bool argExists[1]; @@ -2529,7 +2528,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetHolidaySchedule::Id: { + case Commands::SetHolidaySchedule::Id: { expectArgumentCount = 4; uint8_t scheduleId; uint32_t localStartTime; @@ -2600,7 +2599,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetPin::Id: { + case Commands::SetPin::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -2672,7 +2671,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetRfid::Id: { + case Commands::SetRfid::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -2744,7 +2743,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetUserType::Id: { + case Commands::SetUserType::Id: { expectArgumentCount = 2; uint16_t userId; uint8_t userType; @@ -2806,7 +2805,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetWeekdaySchedule::Id: { + case Commands::SetWeekdaySchedule::Id: { expectArgumentCount = 7; uint8_t scheduleId; uint16_t userId; @@ -2889,7 +2888,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetYeardaySchedule::Id: { + case Commands::SetYeardaySchedule::Id: { expectArgumentCount = 4; uint8_t scheduleId; uint16_t userId; @@ -2960,7 +2959,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::UnlockDoor::Id: { + case Commands::UnlockDoor::Id: { expectArgumentCount = 1; const uint8_t * PIN; bool argExists[1]; @@ -3019,7 +3018,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::UnlockWithTimeout::Id: { + case Commands::UnlockWithTimeout::Id: { expectArgumentCount = 2; uint16_t timeoutInSeconds; const uint8_t * pin; @@ -3085,7 +3084,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DoorLock::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DoorLock::Id, aCommandId); return; } } @@ -3095,7 +3094,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3128,7 +3127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -3195,12 +3194,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -3274,7 +3273,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -3284,8 +3283,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3318,7 +3316,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Groups::Commands::AddGroup::Id: { + case Commands::AddGroup::Id: { expectArgumentCount = 2; uint16_t groupId; const uint8_t * groupName; @@ -3382,7 +3380,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::AddGroupIfIdentifying::Id: { + case Commands::AddGroupIfIdentifying::Id: { expectArgumentCount = 2; uint16_t groupId; const uint8_t * groupName; @@ -3446,7 +3444,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::GetGroupMembership::Id: { + case Commands::GetGroupMembership::Id: { expectArgumentCount = 2; uint8_t groupCount; /* TYPE WARNING: array array defaults to */ uint8_t * groupList; @@ -3509,12 +3507,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::RemoveAllGroups::Id: { + case Commands::RemoveAllGroups::Id: { wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(aEndpointId, apCommandObj); break; } - case Clusters::Groups::Commands::RemoveGroup::Id: { + case Commands::RemoveGroup::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -3572,7 +3570,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::ViewGroup::Id: { + case Commands::ViewGroup::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -3632,7 +3630,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Groups::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Groups::Id, aCommandId); return; } } @@ -3642,7 +3640,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3675,7 +3673,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::IasZone::Commands::ZoneEnrollResponse::Id: { + case Commands::ZoneEnrollResponse::Id: { expectArgumentCount = 2; uint8_t enrollResponseCode; uint8_t zoneId; @@ -3739,7 +3737,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::IasZone::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, IasZone::Id, aCommandId); return; } } @@ -3749,7 +3747,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::IasZone::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + IasZone::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3782,7 +3780,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Identify::Commands::Identify::Id: { + case Commands::Identify::Id: { expectArgumentCount = 1; uint16_t identifyTime; bool argExists[1]; @@ -3840,14 +3838,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Identify::Commands::IdentifyQuery::Id: { + case Commands::IdentifyQuery::Id: { wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Identify::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Identify::Id, aCommandId); return; } } @@ -3857,7 +3855,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3890,7 +3888,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LevelControl::Commands::Move::Id: { + case Commands::Move::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -3961,7 +3959,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevel::Id: { + case Commands::MoveToLevel::Id: { expectArgumentCount = 4; uint8_t level; uint16_t transitionTime; @@ -4032,7 +4030,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: { + case Commands::MoveToLevelWithOnOff::Id: { expectArgumentCount = 2; uint8_t level; uint16_t transitionTime; @@ -4095,7 +4093,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveWithOnOff::Id: { + case Commands::MoveWithOnOff::Id: { expectArgumentCount = 2; uint8_t moveMode; uint8_t rate; @@ -4157,7 +4155,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Step::Id: { + case Commands::Step::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -4232,7 +4230,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StepWithOnOff::Id: { + case Commands::StepWithOnOff::Id: { expectArgumentCount = 3; uint8_t stepMode; uint8_t stepSize; @@ -4299,7 +4297,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Stop::Id: { + case Commands::Stop::Id: { expectArgumentCount = 2; uint8_t optionMask; uint8_t optionOverride; @@ -4361,14 +4359,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StopWithOnOff::Id: { + case Commands::StopWithOnOff::Id: { wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LevelControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LevelControl::Id, aCommandId); return; } } @@ -4378,7 +4376,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4411,14 +4409,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LowPower::Commands::Sleep::Id: { + case Commands::Sleep::Id: { wasHandled = emberAfLowPowerClusterSleepCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LowPower::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LowPower::Id, aCommandId); return; } } @@ -4428,7 +4426,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LowPower::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LowPower::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4461,7 +4459,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -4528,7 +4526,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -4599,7 +4597,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -4666,7 +4664,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -4733,7 +4731,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -4792,7 +4790,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -4859,7 +4857,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -4926,7 +4924,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -4993,7 +4991,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -5066,7 +5064,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -5076,8 +5074,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5110,7 +5107,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id: { + case Commands::ApplyUpdateRequest::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t newVersion; @@ -5173,7 +5170,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id: { + case Commands::NotifyUpdateApplied::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t softwareVersion; @@ -5236,7 +5233,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Id: { + case Commands::QueryImage::Id: { expectArgumentCount = 8; uint16_t vendorId; uint16_t productId; @@ -5327,7 +5324,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OtaSoftwareUpdateProvider::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OtaSoftwareUpdateProvider::Id, aCommandId); return; } } @@ -5337,8 +5334,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OtaSoftwareUpdateProvider::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OtaSoftwareUpdateProvider::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5371,24 +5367,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -5398,7 +5394,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5431,7 +5427,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -5506,7 +5502,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -5565,7 +5561,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -5624,7 +5620,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -5683,7 +5679,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -5741,7 +5737,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -5799,7 +5795,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -5858,7 +5854,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -5918,7 +5914,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -5982,7 +5978,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -5992,8 +5988,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6026,7 +6021,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Scenes::Commands::AddScene::Id: { + case Commands::AddScene::Id: { expectArgumentCount = 5; uint16_t groupId; uint8_t sceneId; @@ -6103,7 +6098,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::GetSceneMembership::Id: { + case Commands::GetSceneMembership::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -6161,7 +6156,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RecallScene::Id: { + case Commands::RecallScene::Id: { expectArgumentCount = 3; uint16_t groupId; uint8_t sceneId; @@ -6227,7 +6222,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RemoveAllScenes::Id: { + case Commands::RemoveAllScenes::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -6285,7 +6280,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RemoveScene::Id: { + case Commands::RemoveScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6347,7 +6342,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::StoreScene::Id: { + case Commands::StoreScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6409,7 +6404,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::ViewScene::Id: { + case Commands::ViewScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6473,7 +6468,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Scenes::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Scenes::Id, aCommandId); return; } } @@ -6483,7 +6478,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6516,24 +6511,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::TestCluster::Commands::Test::Id: { + case Commands::Test::Id: { wasHandled = emberAfTestClusterClusterTestCallback(aEndpointId, apCommandObj); break; } - case Clusters::TestCluster::Commands::TestNotHandled::Id: { + case Commands::TestNotHandled::Id: { wasHandled = emberAfTestClusterClusterTestNotHandledCallback(aEndpointId, apCommandObj); break; } - case Clusters::TestCluster::Commands::TestSpecific::Id: { + case Commands::TestSpecific::Id: { wasHandled = emberAfTestClusterClusterTestSpecificCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TestCluster::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TestCluster::Id, aCommandId); return; } } @@ -6543,7 +6538,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6576,12 +6571,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Thermostat::Commands::ClearWeeklySchedule::Id: { + case Commands::ClearWeeklySchedule::Id: { wasHandled = emberAfThermostatClusterClearWeeklyScheduleCallback(aEndpointId, apCommandObj); break; } - case Clusters::Thermostat::Commands::GetWeeklySchedule::Id: { + case Commands::GetWeeklySchedule::Id: { expectArgumentCount = 2; uint8_t daysToReturn; uint8_t modeToReturn; @@ -6644,7 +6639,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Thermostat::Commands::SetWeeklySchedule::Id: { + case Commands::SetWeeklySchedule::Id: { expectArgumentCount = 4; uint8_t numberOfTransitionsForSequence; uint8_t dayOfWeekForSequence; @@ -6716,7 +6711,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Thermostat::Commands::SetpointRaiseLower::Id: { + case Commands::SetpointRaiseLower::Id: { expectArgumentCount = 2; uint8_t mode; int8_t amount; @@ -6780,7 +6775,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Thermostat::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Thermostat::Id, aCommandId); return; } } @@ -6790,7 +6785,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Thermostat::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Thermostat::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6806,7 +6801,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace Thermostat -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -6819,64 +6814,64 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::BarrierControl::Id: - clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Basic::Id: - clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Binding::Id: - clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ColorControl::Id: - clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DoorLock::Id: - clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Groups::Id: - clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::IasZone::Id: - clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Identify::Id: - clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LevelControl::Id: - clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LowPower::Id: - clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OtaSoftwareUpdateProvider::Id: - clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Scenes::Id: - clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TestCluster::Id: - clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Thermostat::Id: - clusters::Thermostat::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Thermostat::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp index 39f52d23f93fb2..1ecb0f8adbeb3a 100644 --- a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AccountLogin { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AccountLogin::Commands::GetSetupPIN::Id: { + case Commands::GetSetupPIN::Id: { expectArgumentCount = 1; const uint8_t * tempAccountIdentifier; bool argExists[1]; @@ -128,7 +128,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AccountLogin::Commands::Login::Id: { + case Commands::Login::Id: { expectArgumentCount = 2; const uint8_t * tempAccountIdentifier; const uint8_t * setupPIN; @@ -195,7 +195,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AccountLogin::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AccountLogin::Id, aCommandId); return; } } @@ -205,7 +205,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AccountLogin::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + AccountLogin::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -238,7 +238,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -297,7 +297,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -376,14 +376,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -393,8 +393,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -427,7 +426,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ApplicationBasic::Commands::ChangeStatus::Id: { + case Commands::ChangeStatus::Id: { expectArgumentCount = 1; uint8_t status; bool argExists[1]; @@ -487,7 +486,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ApplicationBasic::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ApplicationBasic::Id, aCommandId); return; } } @@ -497,7 +496,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ApplicationBasic::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + ApplicationBasic::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -530,7 +529,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ApplicationLauncher::Commands::LaunchApp::Id: { + case Commands::LaunchApp::Id: { expectArgumentCount = 3; const uint8_t * data; uint16_t catalogVendorId; @@ -601,7 +600,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ApplicationLauncher::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ApplicationLauncher::Id, aCommandId); return; } } @@ -611,8 +610,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ApplicationLauncher::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + ApplicationLauncher::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -645,7 +643,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AudioOutput::Commands::RenameOutput::Id: { + case Commands::RenameOutput::Id: { expectArgumentCount = 2; uint8_t index; const uint8_t * name; @@ -709,7 +707,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AudioOutput::Commands::SelectOutput::Id: { + case Commands::SelectOutput::Id: { expectArgumentCount = 1; uint8_t index; bool argExists[1]; @@ -769,7 +767,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AudioOutput::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AudioOutput::Id, aCommandId); return; } } @@ -779,7 +777,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AudioOutput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + AudioOutput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -799,7 +797,7 @@ namespace Basic { void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, EndpointId aEndpointId, TLV::TLVReader & aDataTlv) { - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Basic::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Basic::Id, aCommandId); } } // namespace Basic @@ -821,7 +819,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Binding::Commands::Bind::Id: { + case Commands::Bind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -891,7 +889,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Binding::Commands::Unbind::Id: { + case Commands::Unbind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -963,7 +961,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Binding::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Binding::Id, aCommandId); return; } } @@ -973,7 +971,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1006,7 +1004,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ContentLauncher::Commands::LaunchContent::Id: { + case Commands::LaunchContent::Id: { expectArgumentCount = 2; bool autoPlay; const uint8_t * data; @@ -1070,7 +1068,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ContentLauncher::Commands::LaunchURL::Id: { + case Commands::LaunchURL::Id: { expectArgumentCount = 2; const uint8_t * contentURL; const uint8_t * displayString; @@ -1137,7 +1135,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ContentLauncher::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ContentLauncher::Id, aCommandId); return; } } @@ -1147,7 +1145,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ContentLauncher::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + ContentLauncher::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1180,7 +1178,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -1249,7 +1247,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -1259,7 +1257,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1292,7 +1290,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::Id: { + case Commands::ArmFailSafeResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -1356,7 +1354,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::Id: { + case Commands::CommissioningCompleteResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -1420,7 +1418,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id: { + case Commands::SetRegulatoryConfigResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -1486,7 +1484,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -1496,8 +1494,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1530,7 +1527,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -1597,12 +1594,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -1676,7 +1673,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -1686,8 +1683,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1720,7 +1716,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::KeypadInput::Commands::SendKey::Id: { + case Commands::SendKey::Id: { expectArgumentCount = 1; uint8_t keyCode; bool argExists[1]; @@ -1780,7 +1776,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::KeypadInput::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, KeypadInput::Id, aCommandId); return; } } @@ -1790,7 +1786,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::KeypadInput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + KeypadInput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1823,7 +1819,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LevelControl::Commands::Move::Id: { + case Commands::Move::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -1894,7 +1890,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevel::Id: { + case Commands::MoveToLevel::Id: { expectArgumentCount = 4; uint8_t level; uint16_t transitionTime; @@ -1965,7 +1961,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: { + case Commands::MoveToLevelWithOnOff::Id: { expectArgumentCount = 2; uint8_t level; uint16_t transitionTime; @@ -2028,7 +2024,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveWithOnOff::Id: { + case Commands::MoveWithOnOff::Id: { expectArgumentCount = 2; uint8_t moveMode; uint8_t rate; @@ -2090,7 +2086,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Step::Id: { + case Commands::Step::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -2165,7 +2161,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StepWithOnOff::Id: { + case Commands::StepWithOnOff::Id: { expectArgumentCount = 3; uint8_t stepMode; uint8_t stepSize; @@ -2232,7 +2228,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Stop::Id: { + case Commands::Stop::Id: { expectArgumentCount = 2; uint8_t optionMask; uint8_t optionOverride; @@ -2294,14 +2290,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StopWithOnOff::Id: { + case Commands::StopWithOnOff::Id: { wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LevelControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LevelControl::Id, aCommandId); return; } } @@ -2311,7 +2307,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2344,14 +2340,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LowPower::Commands::Sleep::Id: { + case Commands::Sleep::Id: { wasHandled = emberAfLowPowerClusterSleepCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LowPower::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LowPower::Id, aCommandId); return; } } @@ -2361,7 +2357,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LowPower::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LowPower::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2394,12 +2390,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::MediaInput::Commands::HideInputStatus::Id: { + case Commands::HideInputStatus::Id: { wasHandled = emberAfMediaInputClusterHideInputStatusCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaInput::Commands::RenameInput::Id: { + case Commands::RenameInput::Id: { expectArgumentCount = 2; uint8_t index; const uint8_t * name; @@ -2463,7 +2459,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::MediaInput::Commands::SelectInput::Id: { + case Commands::SelectInput::Id: { expectArgumentCount = 1; uint8_t index; bool argExists[1]; @@ -2521,14 +2517,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::MediaInput::Commands::ShowInputStatus::Id: { + case Commands::ShowInputStatus::Id: { wasHandled = emberAfMediaInputClusterShowInputStatusCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::MediaInput::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, MediaInput::Id, aCommandId); return; } } @@ -2538,7 +2534,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::MediaInput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + MediaInput::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2571,37 +2567,37 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::MediaPlayback::Commands::MediaFastForward::Id: { + case Commands::MediaFastForward::Id: { wasHandled = emberAfMediaPlaybackClusterMediaFastForwardCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaPlayback::Commands::MediaNext::Id: { + case Commands::MediaNext::Id: { wasHandled = emberAfMediaPlaybackClusterMediaNextCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaPlayback::Commands::MediaPause::Id: { + case Commands::MediaPause::Id: { wasHandled = emberAfMediaPlaybackClusterMediaPauseCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaPlayback::Commands::MediaPlay::Id: { + case Commands::MediaPlay::Id: { wasHandled = emberAfMediaPlaybackClusterMediaPlayCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaPlayback::Commands::MediaPrevious::Id: { + case Commands::MediaPrevious::Id: { wasHandled = emberAfMediaPlaybackClusterMediaPreviousCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaPlayback::Commands::MediaRewind::Id: { + case Commands::MediaRewind::Id: { wasHandled = emberAfMediaPlaybackClusterMediaRewindCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaPlayback::Commands::MediaSeek::Id: { + case Commands::MediaSeek::Id: { expectArgumentCount = 1; uint64_t position; bool argExists[1]; @@ -2659,7 +2655,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::MediaPlayback::Commands::MediaSkipBackward::Id: { + case Commands::MediaSkipBackward::Id: { expectArgumentCount = 1; uint64_t deltaPositionMilliseconds; bool argExists[1]; @@ -2718,7 +2714,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::MediaPlayback::Commands::MediaSkipForward::Id: { + case Commands::MediaSkipForward::Id: { expectArgumentCount = 1; uint64_t deltaPositionMilliseconds; bool argExists[1]; @@ -2777,19 +2773,19 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::MediaPlayback::Commands::MediaStartOver::Id: { + case Commands::MediaStartOver::Id: { wasHandled = emberAfMediaPlaybackClusterMediaStartOverCallback(aEndpointId, apCommandObj); break; } - case Clusters::MediaPlayback::Commands::MediaStop::Id: { + case Commands::MediaStop::Id: { wasHandled = emberAfMediaPlaybackClusterMediaStopCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::MediaPlayback::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, MediaPlayback::Id, aCommandId); return; } } @@ -2799,7 +2795,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::MediaPlayback::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + MediaPlayback::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -2832,7 +2828,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetworkResponse::Id: { + case Commands::AddThreadNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -2896,7 +2892,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetworkResponse::Id: { + case Commands::AddWiFiNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -2960,7 +2956,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetworkResponse::Id: { + case Commands::DisableNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3024,7 +3020,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetworkResponse::Id: { + case Commands::EnableNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3088,7 +3084,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetworkResponse::Id: { + case Commands::RemoveNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3152,7 +3148,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::Id: { + case Commands::ScanNetworksResponse::Id: { expectArgumentCount = 4; uint8_t errorCode; const uint8_t * debugText; @@ -3226,7 +3222,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetworkResponse::Id: { + case Commands::UpdateThreadNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3290,7 +3286,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetworkResponse::Id: { + case Commands::UpdateWiFiNetworkResponse::Id: { expectArgumentCount = 2; uint8_t errorCode; const uint8_t * debugText; @@ -3356,7 +3352,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -3366,8 +3362,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3400,7 +3395,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -3467,7 +3462,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -3538,7 +3533,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -3605,7 +3600,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -3672,7 +3667,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -3731,7 +3726,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -3798,7 +3793,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -3865,7 +3860,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -3932,7 +3927,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -4005,7 +4000,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -4015,8 +4010,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4049,7 +4043,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id: { + case Commands::ApplyUpdateRequest::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t newVersion; @@ -4112,7 +4106,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id: { + case Commands::NotifyUpdateApplied::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t softwareVersion; @@ -4175,7 +4169,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Id: { + case Commands::QueryImage::Id: { expectArgumentCount = 8; uint16_t vendorId; uint16_t productId; @@ -4266,7 +4260,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OtaSoftwareUpdateProvider::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OtaSoftwareUpdateProvider::Id, aCommandId); return; } } @@ -4276,8 +4270,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OtaSoftwareUpdateProvider::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OtaSoftwareUpdateProvider::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4310,24 +4303,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -4337,7 +4330,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4370,7 +4363,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AttestationResponse::Id: { + case Commands::AttestationResponse::Id: { expectArgumentCount = 2; chip::ByteSpan AttestationElements; chip::ByteSpan Signature; @@ -4433,7 +4426,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainResponse::Id: { + case Commands::CertificateChainResponse::Id: { expectArgumentCount = 1; chip::ByteSpan Certificate; bool argExists[1]; @@ -4492,7 +4485,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OperationalCredentials::Commands::NOCResponse::Id: { + case Commands::NOCResponse::Id: { expectArgumentCount = 3; uint8_t StatusCode; uint8_t FabricIndex; @@ -4559,7 +4552,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } break; } - case Clusters::OperationalCredentials::Commands::OpCSRResponse::Id: { + case Commands::OpCSRResponse::Id: { expectArgumentCount = 2; chip::ByteSpan NOCSRElements; chip::ByteSpan AttestationSignature; @@ -4624,7 +4617,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -4634,8 +4627,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, CommandId aCommandId, E { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4668,7 +4660,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -4743,7 +4735,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -4802,7 +4794,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -4861,7 +4853,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -4920,7 +4912,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -4978,7 +4970,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -5036,7 +5028,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -5095,7 +5087,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -5155,7 +5147,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -5219,7 +5211,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -5229,8 +5221,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5263,7 +5254,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::TvChannel::Commands::ChangeChannel::Id: { + case Commands::ChangeChannel::Id: { expectArgumentCount = 1; const uint8_t * match; bool argExists[1]; @@ -5322,7 +5313,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::TvChannel::Commands::ChangeChannelByNumber::Id: { + case Commands::ChangeChannelByNumber::Id: { expectArgumentCount = 2; uint16_t majorNumber; uint16_t minorNumber; @@ -5385,7 +5376,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::TvChannel::Commands::SkipChannel::Id: { + case Commands::SkipChannel::Id: { expectArgumentCount = 1; uint16_t Count; bool argExists[1]; @@ -5445,7 +5436,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TvChannel::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TvChannel::Id, aCommandId); return; } } @@ -5455,7 +5446,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TvChannel::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TvChannel::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5488,7 +5479,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::TargetNavigator::Commands::NavigateTarget::Id: { + case Commands::NavigateTarget::Id: { expectArgumentCount = 2; uint8_t target; const uint8_t * data; @@ -5554,7 +5545,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TargetNavigator::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TargetNavigator::Id, aCommandId); return; } } @@ -5564,7 +5555,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TargetNavigator::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TargetNavigator::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5580,7 +5571,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace TargetNavigator -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -5593,67 +5584,67 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AccountLogin::Id: - clusters::AccountLogin::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AccountLogin::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ApplicationBasic::Id: - clusters::ApplicationBasic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ApplicationBasic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ApplicationLauncher::Id: - clusters::ApplicationLauncher::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ApplicationLauncher::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::AudioOutput::Id: - clusters::AudioOutput::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AudioOutput::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Basic::Id: - clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Binding::Id: - clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ContentLauncher::Id: - clusters::ContentLauncher::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ContentLauncher::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::KeypadInput::Id: - clusters::KeypadInput::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::KeypadInput::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LevelControl::Id: - clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LowPower::Id: - clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::MediaInput::Id: - clusters::MediaInput::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::MediaInput::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::MediaPlayback::Id: - clusters::MediaPlayback::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::MediaPlayback::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OtaSoftwareUpdateProvider::Id: - clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TvChannel::Id: - clusters::TvChannel::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TvChannel::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TargetNavigator::Id: - clusters::TargetNavigator::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TargetNavigator::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. @@ -5681,13 +5672,13 @@ void DispatchSingleClusterResponseCommand(ClusterId aClusterId, CommandId aComma switch (aClusterId) { case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchClientCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp index 5bea8537905094..3791ed57d6644d 100644 --- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::BarrierControl::Commands::BarrierControlGoToPercent::Id: { + case Commands::BarrierControlGoToPercent::Id: { expectArgumentCount = 1; uint8_t percentOpen; bool argExists[1]; @@ -315,14 +314,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::BarrierControl::Commands::BarrierControlStop::Id: { + case Commands::BarrierControlStop::Id: { wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::BarrierControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, BarrierControl::Id, aCommandId); return; } } @@ -332,7 +331,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::BarrierControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + BarrierControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -352,7 +351,7 @@ namespace Basic { void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, EndpointId aEndpointId, TLV::TLVReader & aDataTlv) { - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Basic::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Basic::Id, aCommandId); } } // namespace Basic @@ -374,7 +373,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Binding::Commands::Bind::Id: { + case Commands::Bind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -444,7 +443,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Binding::Commands::Unbind::Id: { + case Commands::Unbind::Id: { expectArgumentCount = 4; chip::NodeId nodeId; chip::GroupId groupId; @@ -516,7 +515,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Binding::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Binding::Id, aCommandId); return; } } @@ -526,7 +525,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Binding::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -559,7 +558,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::ColorControl::Commands::MoveColor::Id: { + case Commands::MoveColor::Id: { expectArgumentCount = 4; int16_t rateX; int16_t rateY; @@ -630,7 +629,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveColorTemperature::Id: { + case Commands::MoveColorTemperature::Id: { expectArgumentCount = 6; uint8_t moveMode; uint16_t rate; @@ -710,7 +709,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveHue::Id: { + case Commands::MoveHue::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -781,7 +780,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveSaturation::Id: { + case Commands::MoveSaturation::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -852,7 +851,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColor::Id: { + case Commands::MoveToColor::Id: { expectArgumentCount = 5; uint16_t colorX; uint16_t colorY; @@ -927,7 +926,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToColorTemperature::Id: { + case Commands::MoveToColorTemperature::Id: { expectArgumentCount = 4; uint16_t colorTemperature; uint16_t transitionTime; @@ -998,7 +997,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHue::Id: { + case Commands::MoveToHue::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t direction; @@ -1073,7 +1072,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToHueAndSaturation::Id: { + case Commands::MoveToHueAndSaturation::Id: { expectArgumentCount = 5; uint8_t hue; uint8_t saturation; @@ -1148,7 +1147,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::MoveToSaturation::Id: { + case Commands::MoveToSaturation::Id: { expectArgumentCount = 4; uint8_t saturation; uint16_t transitionTime; @@ -1219,7 +1218,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColor::Id: { + case Commands::StepColor::Id: { expectArgumentCount = 5; int16_t stepX; int16_t stepY; @@ -1294,7 +1293,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepColorTemperature::Id: { + case Commands::StepColorTemperature::Id: { expectArgumentCount = 7; uint8_t stepMode; uint16_t stepSize; @@ -1378,7 +1377,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepHue::Id: { + case Commands::StepHue::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1453,7 +1452,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StepSaturation::Id: { + case Commands::StepSaturation::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -1528,7 +1527,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::ColorControl::Commands::StopMoveStep::Id: { + case Commands::StopMoveStep::Id: { expectArgumentCount = 2; uint8_t optionsMask; uint8_t optionsOverride; @@ -1593,7 +1592,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::ColorControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, ColorControl::Id, aCommandId); return; } } @@ -1603,7 +1602,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + ColorControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1636,7 +1635,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Id: { + case Commands::RetrieveLogsRequest::Id: { expectArgumentCount = 3; uint8_t intent; uint8_t requestedProtocol; @@ -1705,7 +1704,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DiagnosticLogs::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DiagnosticLogs::Id, aCommandId); return; } } @@ -1715,7 +1714,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DiagnosticLogs::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1748,17 +1747,17 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::DoorLock::Commands::ClearAllPins::Id: { + case Commands::ClearAllPins::Id: { wasHandled = emberAfDoorLockClusterClearAllPinsCallback(aEndpointId, apCommandObj); break; } - case Clusters::DoorLock::Commands::ClearAllRfids::Id: { + case Commands::ClearAllRfids::Id: { wasHandled = emberAfDoorLockClusterClearAllRfidsCallback(aEndpointId, apCommandObj); break; } - case Clusters::DoorLock::Commands::ClearHolidaySchedule::Id: { + case Commands::ClearHolidaySchedule::Id: { expectArgumentCount = 1; uint8_t scheduleId; bool argExists[1]; @@ -1816,7 +1815,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearPin::Id: { + case Commands::ClearPin::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -1874,7 +1873,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearRfid::Id: { + case Commands::ClearRfid::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -1932,7 +1931,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearWeekdaySchedule::Id: { + case Commands::ClearWeekdaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -1994,7 +1993,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::ClearYeardaySchedule::Id: { + case Commands::ClearYeardaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2056,7 +2055,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetHolidaySchedule::Id: { + case Commands::GetHolidaySchedule::Id: { expectArgumentCount = 1; uint8_t scheduleId; bool argExists[1]; @@ -2114,7 +2113,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetLogRecord::Id: { + case Commands::GetLogRecord::Id: { expectArgumentCount = 1; uint16_t logIndex; bool argExists[1]; @@ -2172,7 +2171,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetPin::Id: { + case Commands::GetPin::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2230,7 +2229,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetRfid::Id: { + case Commands::GetRfid::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2288,7 +2287,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetUserType::Id: { + case Commands::GetUserType::Id: { expectArgumentCount = 1; uint16_t userId; bool argExists[1]; @@ -2346,7 +2345,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetWeekdaySchedule::Id: { + case Commands::GetWeekdaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2408,7 +2407,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::GetYeardaySchedule::Id: { + case Commands::GetYeardaySchedule::Id: { expectArgumentCount = 2; uint8_t scheduleId; uint16_t userId; @@ -2470,7 +2469,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::LockDoor::Id: { + case Commands::LockDoor::Id: { expectArgumentCount = 1; const uint8_t * PIN; bool argExists[1]; @@ -2529,7 +2528,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetHolidaySchedule::Id: { + case Commands::SetHolidaySchedule::Id: { expectArgumentCount = 4; uint8_t scheduleId; uint32_t localStartTime; @@ -2600,7 +2599,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetPin::Id: { + case Commands::SetPin::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -2672,7 +2671,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetRfid::Id: { + case Commands::SetRfid::Id: { expectArgumentCount = 4; uint16_t userId; uint8_t userStatus; @@ -2744,7 +2743,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetUserType::Id: { + case Commands::SetUserType::Id: { expectArgumentCount = 2; uint16_t userId; uint8_t userType; @@ -2806,7 +2805,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetWeekdaySchedule::Id: { + case Commands::SetWeekdaySchedule::Id: { expectArgumentCount = 7; uint8_t scheduleId; uint16_t userId; @@ -2889,7 +2888,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::SetYeardaySchedule::Id: { + case Commands::SetYeardaySchedule::Id: { expectArgumentCount = 4; uint8_t scheduleId; uint16_t userId; @@ -2960,7 +2959,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::UnlockDoor::Id: { + case Commands::UnlockDoor::Id: { expectArgumentCount = 1; const uint8_t * PIN; bool argExists[1]; @@ -3019,7 +3018,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::DoorLock::Commands::UnlockWithTimeout::Id: { + case Commands::UnlockWithTimeout::Id: { expectArgumentCount = 2; uint16_t timeoutInSeconds; const uint8_t * pin; @@ -3085,7 +3084,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::DoorLock::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, DoorLock::Id, aCommandId); return; } } @@ -3095,7 +3094,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + DoorLock::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3128,7 +3127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -3195,12 +3194,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -3274,7 +3273,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -3284,8 +3283,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3318,7 +3316,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Groups::Commands::AddGroup::Id: { + case Commands::AddGroup::Id: { expectArgumentCount = 2; uint16_t groupId; const uint8_t * groupName; @@ -3382,7 +3380,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::AddGroupIfIdentifying::Id: { + case Commands::AddGroupIfIdentifying::Id: { expectArgumentCount = 2; uint16_t groupId; const uint8_t * groupName; @@ -3446,7 +3444,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::GetGroupMembership::Id: { + case Commands::GetGroupMembership::Id: { expectArgumentCount = 2; uint8_t groupCount; /* TYPE WARNING: array array defaults to */ uint8_t * groupList; @@ -3509,12 +3507,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::RemoveAllGroups::Id: { + case Commands::RemoveAllGroups::Id: { wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback(aEndpointId, apCommandObj); break; } - case Clusters::Groups::Commands::RemoveGroup::Id: { + case Commands::RemoveGroup::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -3572,7 +3570,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Groups::Commands::ViewGroup::Id: { + case Commands::ViewGroup::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -3632,7 +3630,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Groups::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Groups::Id, aCommandId); return; } } @@ -3642,7 +3640,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Groups::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3675,7 +3673,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::IasZone::Commands::ZoneEnrollResponse::Id: { + case Commands::ZoneEnrollResponse::Id: { expectArgumentCount = 2; uint8_t enrollResponseCode; uint8_t zoneId; @@ -3739,7 +3737,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::IasZone::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, IasZone::Id, aCommandId); return; } } @@ -3749,7 +3747,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::IasZone::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + IasZone::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3782,7 +3780,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Identify::Commands::Identify::Id: { + case Commands::Identify::Id: { expectArgumentCount = 1; uint16_t identifyTime; bool argExists[1]; @@ -3840,14 +3838,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Identify::Commands::IdentifyQuery::Id: { + case Commands::IdentifyQuery::Id: { wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Identify::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Identify::Id, aCommandId); return; } } @@ -3857,7 +3855,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Identify::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -3890,7 +3888,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::LevelControl::Commands::Move::Id: { + case Commands::Move::Id: { expectArgumentCount = 4; uint8_t moveMode; uint8_t rate; @@ -3961,7 +3959,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevel::Id: { + case Commands::MoveToLevel::Id: { expectArgumentCount = 4; uint8_t level; uint16_t transitionTime; @@ -4032,7 +4030,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: { + case Commands::MoveToLevelWithOnOff::Id: { expectArgumentCount = 2; uint8_t level; uint16_t transitionTime; @@ -4095,7 +4093,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::MoveWithOnOff::Id: { + case Commands::MoveWithOnOff::Id: { expectArgumentCount = 2; uint8_t moveMode; uint8_t rate; @@ -4157,7 +4155,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Step::Id: { + case Commands::Step::Id: { expectArgumentCount = 5; uint8_t stepMode; uint8_t stepSize; @@ -4232,7 +4230,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StepWithOnOff::Id: { + case Commands::StepWithOnOff::Id: { expectArgumentCount = 3; uint8_t stepMode; uint8_t stepSize; @@ -4299,7 +4297,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::Stop::Id: { + case Commands::Stop::Id: { expectArgumentCount = 2; uint8_t optionMask; uint8_t optionOverride; @@ -4361,14 +4359,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::LevelControl::Commands::StopWithOnOff::Id: { + case Commands::StopWithOnOff::Id: { wasHandled = emberAfLevelControlClusterStopWithOnOffCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::LevelControl::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, LevelControl::Id, aCommandId); return; } } @@ -4378,7 +4376,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + LevelControl::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -4411,7 +4409,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -4478,7 +4476,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -4549,7 +4547,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -4616,7 +4614,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -4683,7 +4681,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -4742,7 +4740,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -4809,7 +4807,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -4876,7 +4874,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -4943,7 +4941,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -5016,7 +5014,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -5026,8 +5024,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5060,7 +5057,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id: { + case Commands::ApplyUpdateRequest::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t newVersion; @@ -5123,7 +5120,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id: { + case Commands::NotifyUpdateApplied::Id: { expectArgumentCount = 2; chip::ByteSpan updateToken; uint32_t softwareVersion; @@ -5186,7 +5183,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OtaSoftwareUpdateProvider::Commands::QueryImage::Id: { + case Commands::QueryImage::Id: { expectArgumentCount = 8; uint16_t vendorId; uint16_t productId; @@ -5277,7 +5274,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OtaSoftwareUpdateProvider::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OtaSoftwareUpdateProvider::Id, aCommandId); return; } } @@ -5287,8 +5284,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OtaSoftwareUpdateProvider::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OtaSoftwareUpdateProvider::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5321,24 +5317,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OnOff::Commands::Off::Id: { + case Commands::Off::Id: { wasHandled = emberAfOnOffClusterOffCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::On::Id: { + case Commands::On::Id: { wasHandled = emberAfOnOffClusterOnCallback(aEndpointId, apCommandObj); break; } - case Clusters::OnOff::Commands::Toggle::Id: { + case Commands::Toggle::Id: { wasHandled = emberAfOnOffClusterToggleCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OnOff::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OnOff::Id, aCommandId); return; } } @@ -5348,7 +5344,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + OnOff::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5381,7 +5377,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -5456,7 +5452,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -5515,7 +5511,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -5574,7 +5570,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -5633,7 +5629,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -5691,7 +5687,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -5749,7 +5745,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -5808,7 +5804,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -5868,7 +5864,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -5932,7 +5928,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -5942,8 +5938,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -5976,7 +5971,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::Scenes::Commands::AddScene::Id: { + case Commands::AddScene::Id: { expectArgumentCount = 5; uint16_t groupId; uint8_t sceneId; @@ -6053,7 +6048,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::GetSceneMembership::Id: { + case Commands::GetSceneMembership::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -6111,7 +6106,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RecallScene::Id: { + case Commands::RecallScene::Id: { expectArgumentCount = 3; uint16_t groupId; uint8_t sceneId; @@ -6177,7 +6172,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RemoveAllScenes::Id: { + case Commands::RemoveAllScenes::Id: { expectArgumentCount = 1; uint16_t groupId; bool argExists[1]; @@ -6235,7 +6230,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::RemoveScene::Id: { + case Commands::RemoveScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6297,7 +6292,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::StoreScene::Id: { + case Commands::StoreScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6359,7 +6354,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::Scenes::Commands::ViewScene::Id: { + case Commands::ViewScene::Id: { expectArgumentCount = 2; uint16_t groupId; uint8_t sceneId; @@ -6423,7 +6418,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::Scenes::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, Scenes::Id, aCommandId); return; } } @@ -6433,7 +6428,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + Scenes::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6466,24 +6461,24 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::TestCluster::Commands::Test::Id: { + case Commands::Test::Id: { wasHandled = emberAfTestClusterClusterTestCallback(aEndpointId, apCommandObj); break; } - case Clusters::TestCluster::Commands::TestNotHandled::Id: { + case Commands::TestNotHandled::Id: { wasHandled = emberAfTestClusterClusterTestNotHandledCallback(aEndpointId, apCommandObj); break; } - case Clusters::TestCluster::Commands::TestSpecific::Id: { + case Commands::TestSpecific::Id: { wasHandled = emberAfTestClusterClusterTestSpecificCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::TestCluster::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, TestCluster::Id, aCommandId); return; } } @@ -6493,7 +6488,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + TestCluster::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -6509,7 +6504,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace TestCluster -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -6522,58 +6517,58 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::BarrierControl::Id: - clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Basic::Id: - clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Binding::Id: - clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::ColorControl::Id: - clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DiagnosticLogs::Id: - clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::DoorLock::Id: - clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Groups::Id: - clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::IasZone::Id: - clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Identify::Id: - clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::LevelControl::Id: - clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OtaSoftwareUpdateProvider::Id: - clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OtaSoftwareUpdateProvider::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OnOff::Id: - clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::Scenes::Id: - clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::TestCluster::Id: - clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::TestCluster::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply. diff --git a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp index 455851536d7114..8b8382de3ba78e 100644 --- a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp @@ -49,7 +49,7 @@ void ReportCommandUnsupported(Command * aCommandObj, EndpointId aEndpointId, Clu // Cluster specific command parsing -namespace clusters { +namespace Clusters { namespace AdministratorCommissioning { @@ -68,7 +68,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id: { + case Commands::OpenBasicCommissioningWindow::Id: { expectArgumentCount = 1; uint16_t CommissioningTimeout; bool argExists[1]; @@ -127,7 +127,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Id: { + case Commands::OpenCommissioningWindow::Id: { expectArgumentCount = 6; uint16_t CommissioningTimeout; chip::ByteSpan PAKEVerifier; @@ -206,14 +206,14 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::Id: { + case Commands::RevokeCommissioning::Id: { wasHandled = emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::AdministratorCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, AdministratorCommissioning::Id, aCommandId); return; } } @@ -223,8 +223,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::AdministratorCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + AdministratorCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -257,7 +256,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::GeneralCommissioning::Commands::ArmFailSafe::Id: { + case Commands::ArmFailSafe::Id: { expectArgumentCount = 3; uint16_t expiryLengthSeconds; uint64_t breadcrumb; @@ -324,12 +323,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::GeneralCommissioning::Commands::CommissioningComplete::Id: { + case Commands::CommissioningComplete::Id: { wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback(aEndpointId, apCommandObj); break; } - case Clusters::GeneralCommissioning::Commands::SetRegulatoryConfig::Id: { + case Commands::SetRegulatoryConfig::Id: { expectArgumentCount = 4; uint8_t location; const uint8_t * countryCode; @@ -403,7 +402,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::GeneralCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, GeneralCommissioning::Id, aCommandId); return; } } @@ -413,8 +412,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::GeneralCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + GeneralCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -447,7 +445,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::NetworkCommissioning::Commands::AddThreadNetwork::Id: { + case Commands::AddThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -514,7 +512,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::AddWiFiNetwork::Id: { + case Commands::AddWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -585,7 +583,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::DisableNetwork::Id: { + case Commands::DisableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -652,7 +650,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::EnableNetwork::Id: { + case Commands::EnableNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan networkID; uint64_t breadcrumb; @@ -719,7 +717,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::GetLastNetworkCommissioningResult::Id: { + case Commands::GetLastNetworkCommissioningResult::Id: { expectArgumentCount = 1; uint32_t timeoutMs; bool argExists[1]; @@ -778,7 +776,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::RemoveNetwork::Id: { + case Commands::RemoveNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan NetworkID; uint64_t Breadcrumb; @@ -845,7 +843,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::ScanNetworks::Id: { + case Commands::ScanNetworks::Id: { expectArgumentCount = 3; chip::ByteSpan ssid; uint64_t breadcrumb; @@ -912,7 +910,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateThreadNetwork::Id: { + case Commands::UpdateThreadNetwork::Id: { expectArgumentCount = 3; chip::ByteSpan operationalDataset; uint64_t breadcrumb; @@ -979,7 +977,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::NetworkCommissioning::Commands::UpdateWiFiNetwork::Id: { + case Commands::UpdateWiFiNetwork::Id: { expectArgumentCount = 4; chip::ByteSpan ssid; chip::ByteSpan credentials; @@ -1052,7 +1050,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::NetworkCommissioning::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, NetworkCommissioning::Id, aCommandId); return; } } @@ -1062,8 +1060,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::NetworkCommissioning::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + NetworkCommissioning::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1096,7 +1093,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::OperationalCredentials::Commands::AddNOC::Id: { + case Commands::AddNOC::Id: { expectArgumentCount = 5; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1171,7 +1168,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AddTrustedRootCertificate::Id: { + case Commands::AddTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan RootCertificate; bool argExists[1]; @@ -1230,7 +1227,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::AttestationRequest::Id: { + case Commands::AttestationRequest::Id: { expectArgumentCount = 1; chip::ByteSpan AttestationNonce; bool argExists[1]; @@ -1289,7 +1286,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::CertificateChainRequest::Id: { + case Commands::CertificateChainRequest::Id: { expectArgumentCount = 1; uint8_t CertificateType; bool argExists[1]; @@ -1348,7 +1345,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::OpCSRRequest::Id: { + case Commands::OpCSRRequest::Id: { expectArgumentCount = 1; chip::ByteSpan CSRNonce; bool argExists[1]; @@ -1406,7 +1403,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveFabric::Id: { + case Commands::RemoveFabric::Id: { expectArgumentCount = 1; uint8_t FabricIndex; bool argExists[1]; @@ -1464,7 +1461,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::RemoveTrustedRootCertificate::Id: { + case Commands::RemoveTrustedRootCertificate::Id: { expectArgumentCount = 1; chip::ByteSpan TrustedRootIdentifier; bool argExists[1]; @@ -1523,7 +1520,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Id: { + case Commands::UpdateFabricLabel::Id: { expectArgumentCount = 1; const uint8_t * Label; bool argExists[1]; @@ -1583,7 +1580,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::OperationalCredentials::Commands::UpdateNOC::Id: { + case Commands::UpdateNOC::Id: { expectArgumentCount = 2; chip::ByteSpan NOCValue; chip::ByteSpan ICACValue; @@ -1647,7 +1644,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::OperationalCredentials::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, OperationalCredentials::Id, aCommandId); return; } } @@ -1657,8 +1654,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::OperationalCredentials::Id, aCommandId, - (CommandPathFlags::kEndpointIdValid) }; + OperationalCredentials::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1691,12 +1687,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { switch (aCommandId) { - case Clusters::WindowCovering::Commands::DownOrClose::Id: { + case Commands::DownOrClose::Id: { wasHandled = emberAfWindowCoveringClusterDownOrCloseCallback(aEndpointId, apCommandObj); break; } - case Clusters::WindowCovering::Commands::GoToLiftPercentage::Id: { + case Commands::GoToLiftPercentage::Id: { expectArgumentCount = 2; uint8_t liftPercentageValue; uint16_t liftPercent100thsValue; @@ -1759,7 +1755,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::WindowCovering::Commands::GoToLiftValue::Id: { + case Commands::GoToLiftValue::Id: { expectArgumentCount = 1; uint16_t liftValue; bool argExists[1]; @@ -1817,7 +1813,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::WindowCovering::Commands::GoToTiltPercentage::Id: { + case Commands::GoToTiltPercentage::Id: { expectArgumentCount = 2; uint8_t tiltPercentageValue; uint16_t tiltPercent100thsValue; @@ -1880,7 +1876,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::WindowCovering::Commands::GoToTiltValue::Id: { + case Commands::GoToTiltValue::Id: { expectArgumentCount = 1; uint16_t tiltValue; bool argExists[1]; @@ -1938,19 +1934,19 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } break; } - case Clusters::WindowCovering::Commands::StopMotion::Id: { + case Commands::StopMotion::Id: { wasHandled = emberAfWindowCoveringClusterStopMotionCallback(aEndpointId, apCommandObj); break; } - case Clusters::WindowCovering::Commands::UpOrOpen::Id: { + case Commands::UpOrOpen::Id: { wasHandled = emberAfWindowCoveringClusterUpOrOpenCallback(aEndpointId, apCommandObj); break; } default: { // Unrecognized command ID, error status will apply. - ReportCommandUnsupported(apCommandObj, aEndpointId, Clusters::WindowCovering::Id, aCommandId); + ReportCommandUnsupported(apCommandObj, aEndpointId, WindowCovering::Id, aCommandId); return; } } @@ -1960,7 +1956,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, { CommandPathParams returnStatusParam = { aEndpointId, 0, // GroupId - Clusters::WindowCovering::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; + WindowCovering::Id, aCommandId, (CommandPathFlags::kEndpointIdValid) }; apCommandObj->AddStatusCode(returnStatusParam, Protocols::SecureChannel::GeneralStatusCode::kBadRequest, Protocols::SecureChannel::Id, Protocols::InteractionModel::Status::InvalidCommand); ChipLogProgress(Zcl, @@ -1976,7 +1972,7 @@ void DispatchServerCommand(CommandHandler * apCommandObj, CommandId aCommandId, } // namespace WindowCovering -} // namespace clusters +} // namespace Clusters void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, EndpointId aEndPointId, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -1989,19 +1985,19 @@ void DispatchSingleClusterCommand(ClusterId aClusterId, CommandId aCommandId, En switch (aClusterId) { case Clusters::AdministratorCommissioning::Id: - clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::GeneralCommissioning::Id: - clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::NetworkCommissioning::Id: - clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::OperationalCredentials::Id: - clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::OperationalCredentials::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; case Clusters::WindowCovering::Id: - clusters::WindowCovering::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); + Clusters::WindowCovering::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader); break; default: // Unrecognized cluster ID, error status will apply.