From dadddef6d6365192bee03de9f64badc02c864160 Mon Sep 17 00:00:00 2001 From: lpbeliveau-silabs Date: Thu, 14 Dec 2023 16:53:29 -0500 Subject: [PATCH] Refactored the name in the code so it can compile and run tests --- .../cpp-tlvmeta/clusters_meta.cpp | 71 +++++++++++-------- .../cpp-app/callback-stub.cpp | 2 +- .../color-control-server.cpp | 54 +++++++------- .../clusters/groups-server/groups-server.cpp | 15 ++-- .../clusters/level-control/level-control.cpp | 30 ++++---- .../clusters/on-off-server/on-off-server.cpp | 51 ++++++------- .../clusters/scenes-server/SceneHandlerImpl.h | 8 +-- src/app/clusters/scenes-server/SceneTable.h | 9 +-- .../clusters/scenes-server/SceneTableImpl.cpp | 2 +- .../clusters/scenes-server/scenes-server.cpp | 19 ++--- .../clusters/scenes-server/scenes-server.h | 4 +- .../window-covering-server.cpp | 4 +- src/app/tests/TestSceneTable.cpp | 22 +++--- .../templates/app/gen_config.zapt | 2 +- 14 files changed, 153 insertions(+), 140 deletions(-) diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp index 97838b756794e3..cce875cfcfad92 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp @@ -8,72 +8,81 @@ using namespace chip::FlatTree; using namespace chip::TLV; const Entry _OnOff[] = { - { { AttributeTag(0), "onOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::boolean - { { AttributeTag(65532), "featureMap", ItemType::kBitmap }, 8 }, // OnOff::OnOffFeature - { { AttributeTag(65533), "clusterRevision", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::int16u - { { CommandTag(0), "Off", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::Off::() - { { CommandTag(1), "On", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::On::() - { { CommandTag(2), "Toggle", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::Toggle::() + { { AttributeTag(0), "onOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::boolean + { { AttributeTag(65532), "featureMap", ItemType::kBitmap }, 8 }, // OnOff::OnOffFeature + { { AttributeTag(65533), "clusterRevision", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::int16u + { { CommandTag(0), "Off", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::Off::() + { { CommandTag(1), "On", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::On::() + { { CommandTag(2), "Toggle", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::Toggle::() }; const Entry _OnOff_DelayedAllOffEffectVariantEnum[] = { - { { ConstantValueTag(0x0), "kDelayedOffFastFade", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffFastFade - { { ConstantValueTag(0x1), "kNoFade", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kNoFade - { { ConstantValueTag(0x2), "kDelayedOffSlowFade", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffSlowFade + { { ConstantValueTag(0x0), "kDelayedOffFastFade", ItemType::kDefault }, + kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffFastFade + { { ConstantValueTag(0x1), "kNoFade", ItemType::kDefault }, + kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kNoFade + { { ConstantValueTag(0x2), "kDelayedOffSlowFade", ItemType::kDefault }, + kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffSlowFade }; const Entry _OnOff_DyingLightEffectVariantEnum[] = { - { { ConstantValueTag(0x0), "kDyingLightFadeOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DyingLightEffectVariantEnum::kDyingLightFadeOff + { { ConstantValueTag(0x0), "kDyingLightFadeOff", ItemType::kDefault }, + kInvalidNodeIndex }, // OnOff::DyingLightEffectVariantEnum::kDyingLightFadeOff }; const Entry _OnOff_EffectIdentifierEnum[] = { - { { ConstantValueTag(0x0), "kDelayedAllOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::EffectIdentifierEnum::kDelayedAllOff - { { ConstantValueTag(0x1), "kDyingLight", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::EffectIdentifierEnum::kDyingLight + { { ConstantValueTag(0x0), "kDelayedAllOff", ItemType::kDefault }, + kInvalidNodeIndex }, // OnOff::EffectIdentifierEnum::kDelayedAllOff + { { ConstantValueTag(0x1), "kDyingLight", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::EffectIdentifierEnum::kDyingLight }; const Entry _OnOff_StartUpOnOffEnum[] = { - { { ConstantValueTag(0x0), "kOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kOff - { { ConstantValueTag(0x1), "kOn", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kOn - { { ConstantValueTag(0x2), "kToggle", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kToggle + { { ConstantValueTag(0x0), "kOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kOff + { { ConstantValueTag(0x1), "kOn", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kOn + { { ConstantValueTag(0x2), "kToggle", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kToggle }; const Entry _OnOff_OnOffControl[] = { - { { ConstantValueTag(0x1), "kAcceptOnlyWhenOn", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffControl::kAcceptOnlyWhenOn + { { ConstantValueTag(0x1), "kAcceptOnlyWhenOn", ItemType::kDefault }, + kInvalidNodeIndex }, // OnOff::OnOffControl::kAcceptOnlyWhenOn }; const Entry _OnOff_OnOffFeature[] = { - { { ConstantValueTag(0x1), "kLighting", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffFeature::kLighting + { { ConstantValueTag(0x1), "kLighting", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffFeature::kLighting }; const Entry _OnOff_ScenesFeature[] = { - { { ConstantValueTag(0x1), "kSceneNames", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::ScenesFeature::kSceneNames + { { ConstantValueTag(0x1), "kSceneNames", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::MatterScenesFeature::kSceneNames }; const Entry _all_clusters[] = { - { { ClusterTag(0x06), "OnOff", ItemType::kDefault }, 2 }, + { { ClusterTag(0x06), "OnOff", ItemType::kDefault }, 2 }, }; // For any non-structure list like u64[] or similar. const Entry _primitive_type_list[] = { - { { AnonymousTag(), "Anonymous<>", ItemType::kDefault }, kInvalidNodeIndex }, + { { AnonymousTag(), "Anonymous<>", ItemType::kDefault }, kInvalidNodeIndex }, }; } // namespace -#define _ENTRY(n) { sizeof(n) / sizeof(n[0]), n} +#define _ENTRY(n) \ + { \ + sizeof(n) / sizeof(n[0]), n \ + } const std::array, 8 + 2> clusters_meta = { { - _ENTRY(_all_clusters), // 0 - _ENTRY(_primitive_type_list), // 1 - _ENTRY(_OnOff), // 2 - _ENTRY(_OnOff_DelayedAllOffEffectVariantEnum), // 3 - _ENTRY(_OnOff_DyingLightEffectVariantEnum), // 4 - _ENTRY(_OnOff_EffectIdentifierEnum), // 5 - _ENTRY(_OnOff_StartUpOnOffEnum), // 6 - _ENTRY(_OnOff_OnOffControl), // 7 - _ENTRY(_OnOff_OnOffFeature), // 8 - _ENTRY(_OnOff_ScenesFeature), // 9 + _ENTRY(_all_clusters), // 0 + _ENTRY(_primitive_type_list), // 1 + _ENTRY(_OnOff), // 2 + _ENTRY(_OnOff_DelayedAllOffEffectVariantEnum), // 3 + _ENTRY(_OnOff_DyingLightEffectVariantEnum), // 4 + _ENTRY(_OnOff_EffectIdentifierEnum), // 5 + _ENTRY(_OnOff_StartUpOnOffEnum), // 6 + _ENTRY(_OnOff_OnOffControl), // 7 + _ENTRY(_OnOff_OnOffFeature), // 8 + _ENTRY(_OnOff_ScenesFeature), // 9 } }; } // namespace TLVMeta diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp index f5a6cb85d0b253..8a27f40cd0797d 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/large_all_clusters_app/cpp-app/callback-stub.cpp @@ -154,7 +154,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case app::Clusters::RelativeHumidityMeasurement::Id: emberAfRelativeHumidityMeasurementClusterInitCallback(endpoint); break; - case app::Clusters::Scenes::Id: + case app::Clusters::MatterScenes::Id: emberAfScenesClusterInitCallback(endpoint); break; case app::Clusters::SoftwareDiagnostics::Id: diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp index 3dbba76be8491a..4b8e748c053077 100644 --- a/src/app/clusters/color-control-server/color-control-server.cpp +++ b/src/app/clusters/color-control-server/color-control-server.cpp @@ -25,7 +25,7 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES #include #endif @@ -59,7 +59,7 @@ constexpr uint8_t kExecuteIfOff = 1; } // namespace app } // namespace chip -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl { public: @@ -99,7 +99,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl /// @return CHIP_NO_ERROR if successfully serialized the data, CHIP_ERROR_INVALID_ARGUMENT otherwise CHIP_ERROR SerializeSave(EndpointId endpoint, ClusterId cluster, MutableByteSpan & serializedBytes) override { - using AttributeValuePair = Scenes::Structs::AttributeValuePair::Type; + using AttributeValuePair = MatterScenes::Structs::AttributeValuePair::Type; AttributeValuePair pairs[kColorControlScenableAttributesCount]; @@ -194,7 +194,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl CHIP_ERROR ApplyScene(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes, scenes::TransitionTimeMs timeMs) override { - app::DataModel::DecodableList attributeValueList; + app::DataModel::DecodableList attributeValueList; ReturnErrorOnFailure(DecodeAttributeValueList(serializedBytes, attributeValueList)); @@ -371,7 +371,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl } } - void AddAttributeValuePair(Scenes::Structs::AttributeValuePair::Type * pairs, AttributeId id, uint32_t value, + void AddAttributeValuePair(MatterScenes::Structs::AttributeValuePair::Type * pairs, AttributeId id, uint32_t value, size_t & attributeCount) { pairs[attributeCount].attributeID = id; @@ -380,7 +380,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl } }; static DefaultColorControlSceneHandler sColorControlSceneHandler; -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS /********************************************************** * Matter timer scheduling glue logic @@ -434,11 +434,11 @@ ColorControlServer & ColorControlServer::Instance() chip::scenes::SceneHandler * ColorControlServer::GetSceneHandler() { -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS return &sColorControlSceneHandler; #else return nullptr; -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } bool ColorControlServer::HasFeature(chip::EndpointId endpoint, Feature feature) @@ -1607,9 +1607,9 @@ bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * com return true; } Status status = moveToHueAndSaturation(hue, saturation, transitionTime, isEnhanced, commandPath.mEndpointId); -#ifdef EMBER_AF_PLUGIN_SCENES - Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES + MatterScenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES commandObj->AddStatus(commandPath, status); return true; } @@ -1812,9 +1812,9 @@ bool ColorControlServer::moveToSaturationCommand(app::CommandHandler * commandOb return true; } Status status = moveToSaturation(commandData.saturation, commandData.transitionTime, commandPath.mEndpointId); -#ifdef EMBER_AF_PLUGIN_SCENES - Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES + MatterScenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES commandObj->AddStatus(commandPath, status); return true; } @@ -1996,9 +1996,9 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons } exit: -#ifdef EMBER_AF_PLUGIN_SCENES - Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); -#endif // EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES + MatterScenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES commandObj->AddStatus(commandPath, status); return true; } @@ -2205,9 +2205,9 @@ bool ColorControlServer::moveToColorCommand(app::CommandHandler * commandObj, co } Status status = moveToColor(commandData.colorX, commandData.colorY, commandData.transitionTime, commandPath.mEndpointId); -#ifdef EMBER_AF_PLUGIN_SCENES - Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES + MatterScenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES commandObj->AddStatus(commandPath, status); return true; } @@ -2732,9 +2732,9 @@ bool ColorControlServer::moveToColorTempCommand(app::CommandHandler * commandObj } Status status = moveToColorTemp(commandPath.mEndpointId, commandData.colorTemperatureMireds, commandData.transitionTime); -#ifdef EMBER_AF_PLUGIN_SCENES - Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES + MatterScenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES commandObj->AddStatus(commandPath, status); return true; } @@ -3084,11 +3084,11 @@ void emberAfColorControlClusterServerInitCallback(EndpointId endpoint) #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP ColorControlServer::Instance().startUpColorTempCommand(endpoint); #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS // Registers Scene handlers for the color control cluster on the server - app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, - ColorControlServer::Instance().GetSceneHandler()); -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS + app::Clusters::MatterScenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, + ColorControlServer::Instance().GetSceneHandler()); +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } void MatterColorControlClusterServerShutdownCallback(EndpointId endpoint) diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp index 10aa34351230b7..ada7d836fef92f 100644 --- a/src/app/clusters/groups-server/groups-server.cpp +++ b/src/app/clusters/groups-server/groups-server.cpp @@ -29,9 +29,9 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES #include -#endif // EMBER_AF_PLUGIN_SCENES +#endif // EMBER_AF_PLUGIN_MATTER_SCENES using namespace chip; using namespace app::Clusters; @@ -287,9 +287,9 @@ bool emberAfGroupsClusterRemoveGroupCallback(app::CommandHandler * commandObj, c auto fabricIndex = commandObj->GetAccessingFabricIndex(); Groups::Commands::RemoveGroupResponse::Type response; -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES // If a group is removed the scenes associated with that group SHOULD be removed. - Scenes::ScenesServer::Instance().GroupWillBeRemoved(fabricIndex, commandPath.mEndpointId, commandData.groupID); + MatterScenes::ScenesServer::Instance().GroupWillBeRemoved(fabricIndex, commandPath.mEndpointId, commandData.groupID); #endif response.groupID = commandData.groupID; response.status = GroupRemove(fabricIndex, commandPath.mEndpointId, commandData.groupID); @@ -307,7 +307,7 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandOb VerifyOrExit(nullptr != provider, status = Status::Failure); -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES { GroupDataProvider::EndpointIterator * iter = provider->IterateEndpoints(fabricIndex); GroupDataProvider::GroupEndpoint mapping; @@ -317,11 +317,12 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandOb { if (commandPath.mEndpointId == mapping.endpoint_id) { - Scenes::ScenesServer::Instance().GroupWillBeRemoved(fabricIndex, mapping.endpoint_id, mapping.group_id); + MatterScenes::ScenesServer::Instance().GroupWillBeRemoved(fabricIndex, mapping.endpoint_id, mapping.group_id); } } iter->Release(); - Scenes::ScenesServer::Instance().GroupWillBeRemoved(fabricIndex, commandPath.mEndpointId, ZCL_SCENES_GLOBAL_SCENE_GROUP_ID); + MatterScenes::ScenesServer::Instance().GroupWillBeRemoved(fabricIndex, commandPath.mEndpointId, + ZCL_SCENES_GLOBAL_SCENE_GROUP_ID); } #endif diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index ad394d1fc248b3..4ee1b989a273a6 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -34,9 +34,9 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES #include -#endif // EMBER_AF_PLUGIN_SCENES +#endif // EMBER_AF_PLUGIN_MATTER_SCENES #ifdef EMBER_AF_PLUGIN_ON_OFF #include @@ -120,7 +120,7 @@ static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs); static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, chip::Optional> optionsMask, chip::Optional> optionsOverride); -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl { public: @@ -158,7 +158,7 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl /// @return CHIP_NO_ERROR if successfully serialized the data, CHIP_ERROR_INVALID_ARGUMENT otherwise CHIP_ERROR SerializeSave(EndpointId endpoint, ClusterId cluster, MutableByteSpan & serializedBytes) override { - using AttributeValuePair = Scenes::Structs::AttributeValuePair::Type; + using AttributeValuePair = MatterScenes::Structs::AttributeValuePair::Type; app::DataModel::Nullable level; VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == Attributes::CurrentLevel::Get(endpoint, level), CHIP_ERROR_READ_FAILED); @@ -202,7 +202,7 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl CHIP_ERROR ApplyScene(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes, scenes::TransitionTimeMs timeMs) override { - app::DataModel::DecodableList attributeValueList; + app::DataModel::DecodableList attributeValueList; ReturnErrorOnFailure(DecodeAttributeValueList(serializedBytes, attributeValueList)); @@ -254,7 +254,7 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl }; static DefaultLevelControlSceneHandler sLevelControlSceneHandler; -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS #if !defined(IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS) && defined(EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP) static void reallyUpdateCoupledColorTemp(EndpointId endpoint); @@ -608,11 +608,11 @@ Status MoveToLevel(EndpointId endpointId, const Commands::MoveToLevel::Decodable chip::scenes::SceneHandler * GetSceneHandler() { -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS return &sLevelControlSceneHandler; #else return nullptr; -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } } // namespace LevelControlServer @@ -904,13 +904,13 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8 state->callbackSchedule.runTime = System::Clock::Milliseconds32(0); -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES // The level has changed, the scene is no longer valid. - if (emberAfContainsServer(endpoint, Scenes::Id)) + if (emberAfContainsServer(endpoint, MatterScenes::Id)) { - Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); + MatterScenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); } -#endif // EMBER_AF_PLUGIN_SCENES +#endif // EMBER_AF_PLUGIN_MATTER_SCENES // The setup was successful, so mark the new state as active and return. scheduleTimerCallbackMs(endpoint, computeCallbackWaitTimeMs(state->callbackSchedule, state->eventDurationMs)); @@ -1444,10 +1444,10 @@ void emberAfLevelControlClusterServerInitCallback(EndpointId endpoint) } } -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS // Registers Scene handlers for the level control cluster on the server - app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, LevelControlServer::GetSceneHandler()); -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS + app::Clusters::MatterScenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, LevelControlServer::GetSceneHandler()); +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS emberAfPluginLevelControlClusterServerPostInitCallback(endpoint); } diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index 0350c61c5b07d2..8e5f980ff848f4 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -25,9 +25,9 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES #include -#endif // EMBER_AF_PLUGIN_SCENES +#endif // EMBER_AF_PLUGIN_MATTER_SCENES #ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL #include @@ -103,7 +103,7 @@ static bool LevelControlWithOnOffFeaturePresent(EndpointId endpoint) static constexpr size_t kOnOffMaxEnpointCount = EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS static void sceneOnOffCallback(EndpointId endpoint); using OnOffEndPointPair = scenes::DefaultSceneHandlerImpl::EndpointStatePair; using OnOffTransitionTimeInterface = @@ -147,7 +147,7 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl /// @return CHIP_NO_ERROR if successfully serialized the data, CHIP_ERROR_INVALID_ARGUMENT otherwise CHIP_ERROR SerializeSave(EndpointId endpoint, ClusterId cluster, MutableByteSpan & serializedBytes) override { - using AttributeValuePair = Scenes::Structs::AttributeValuePair::Type; + using AttributeValuePair = MatterScenes::Structs::AttributeValuePair::Type; bool currentValue; // read current on/off value @@ -177,7 +177,7 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl CHIP_ERROR ApplyScene(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes, scenes::TransitionTimeMs timeMs) override { - app::DataModel::DecodableList attributeValueList; + app::DataModel::DecodableList attributeValueList; VerifyOrReturnError(cluster == OnOff::Id, CHIP_ERROR_INVALID_ARGUMENT); @@ -210,7 +210,7 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl // versa. #ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL if (!(LevelControlWithOnOffFeaturePresent(endpoint) && - Scenes::ScenesServer::Instance().IsHandlerRegistered(endpoint, LevelControlServer::GetSceneHandler()))) + MatterScenes::ScenesServer::Instance().IsHandlerRegistered(endpoint, LevelControlServer::GetSceneHandler()))) #endif { OnOffServer::Instance().scheduleTimerCallbackMs(mTransitionTimeInterface.sceneEventControl(endpoint), timeMs); @@ -232,7 +232,7 @@ static void sceneOnOffCallback(EndpointId endpoint) OnOffServer::Instance().setOnOffValue(endpoint, command, false); ReturnOnFailure(sOnOffSceneHandler.mSceneEndpointStatePairs.RemovePair(endpoint)); } -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS /********************************************************** * Attributes Definition @@ -300,11 +300,11 @@ OnOffServer & OnOffServer::Instance() chip::scenes::SceneHandler * OnOffServer::GetSceneHandler() { -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS return &sOnOffSceneHandler; #else return nullptr; -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } bool OnOffServer::HasFeature(chip::EndpointId endpoint, Feature feature) @@ -455,13 +455,13 @@ EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, chip::Comman } } -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES // the scene has been changed (the value of on/off has changed) so // the current scene as described in the attribute table is invalid, // so mark it as invalid (just writes the valid/invalid attribute) - Scenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); -#endif // EMBER_AF_PLUGIN_SCENES + MatterScenes::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES // The returned status is based solely on the On/Off cluster. Errors in the // Level Control and/or Scenes cluster are ignored. @@ -499,10 +499,11 @@ void OnOffServer::initOnOffServer(chip::EndpointId endpoint) status = setOnOffValue(endpoint, onOffValueForStartUp, true); } -#if defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS // Registers Scene handlers for the On/Off cluster on the server - app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, OnOffServer::Instance().GetSceneHandler()); -#endif // defined(EMBER_AF_PLUGIN_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS + app::Clusters::MatterScenes::ScenesServer::Instance().RegisterSceneHandler(endpoint, + OnOffServer::Instance().GetSceneHandler()); +#endif // defined(EMBER_AF_PLUGIN_MATTER_SCENES) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS #ifdef EMBER_AF_PLUGIN_MODE_SELECT // If OnMode is not a null value, then change the current mode to it. @@ -599,9 +600,9 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a if (SupportsLightingApplications(endpoint)) { -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES FabricIndex fabric = commandObj->GetAccessingFabricIndex(); -#endif // EMBER_AF_PLUGIN_SCENES +#endif // EMBER_AF_PLUGIN_MATTER_SCENES bool globalSceneControl = false; OnOff::Attributes::GlobalSceneControl::Get(endpoint, &globalSceneControl); @@ -610,14 +611,14 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a if (globalSceneControl) { -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID; if (commandObj->GetExchangeContext()->IsGroupExchangeContext()) { groupId = commandObj->GetExchangeContext()->GetSessionHandle()->AsIncomingGroupSession()->GetGroupId(); } - Scenes::ScenesServer::Instance().StoreCurrentScene(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID); -#endif // EMBER_AF_PLUGIN_SCENES + MatterScenes::ScenesServer::Instance().StoreCurrentScene(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES OnOff::Attributes::GlobalSceneControl::Set(endpoint, false); } @@ -656,9 +657,9 @@ bool OnOffServer::OnWithRecallGlobalSceneCommand(app::CommandHandler * commandOb return true; } -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES FabricIndex fabric = commandObj->GetAccessingFabricIndex(); -#endif // EMBER_AF_PLUGIN_SCENES +#endif // EMBER_AF_PLUGIN_MATTER_SCENES bool globalSceneControl = false; OnOff::Attributes::GlobalSceneControl::Get(endpoint, &globalSceneControl); @@ -669,15 +670,15 @@ bool OnOffServer::OnWithRecallGlobalSceneCommand(app::CommandHandler * commandOb return true; } -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID; if (commandObj->GetExchangeContext()->IsGroupExchangeContext()) { groupId = commandObj->GetExchangeContext()->GetSessionHandle()->AsIncomingGroupSession()->GetGroupId(); } - Scenes::ScenesServer::Instance().RecallScene(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID); -#endif // EMBER_AF_PLUGIN_SCENES + MatterScenes::ScenesServer::Instance().RecallScene(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID); +#endif // EMBER_AF_PLUGIN_MATTER_SCENES OnOff::Attributes::GlobalSceneControl::Set(endpoint, true); setOnOffValue(endpoint, Commands::On::Id, false); diff --git a/src/app/clusters/scenes-server/SceneHandlerImpl.h b/src/app/clusters/scenes-server/SceneHandlerImpl.h index 19eef3975ebbc3..e92dae49d049b5 100644 --- a/src/app/clusters/scenes-server/SceneHandlerImpl.h +++ b/src/app/clusters/scenes-server/SceneHandlerImpl.h @@ -35,10 +35,10 @@ class DefaultSceneHandlerImpl : public scenes::SceneHandler template using DecodableList = app::DataModel::DecodableList; - using AttributeValuePairType = app::Clusters::Scenes::Structs::AttributeValuePair::Type; - using AttributeValuePairDecodableType = app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType; - using ExtensionFieldSetDecodableType = app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType; - using ExtensionFieldSetType = app::Clusters::Scenes::Structs::ExtensionFieldSet::Type; + using AttributeValuePairType = app::Clusters::MatterScenes::Structs::AttributeValuePair::Type; + using AttributeValuePairDecodableType = app::Clusters::MatterScenes::Structs::AttributeValuePair::DecodableType; + using ExtensionFieldSetDecodableType = app::Clusters::MatterScenes::Structs::ExtensionFieldSet::DecodableType; + using ExtensionFieldSetType = app::Clusters::MatterScenes::Structs::ExtensionFieldSet::Type; public: /// @brief Struct meant to map the state of a cluster to a specific endpoint. Meant to be used to apply scenes using a timer for diff --git a/src/app/clusters/scenes-server/SceneTable.h b/src/app/clusters/scenes-server/SceneTable.h index 5ee97bf1da3fe3..a53a1c63e02235 100644 --- a/src/app/clusters/scenes-server/SceneTable.h +++ b/src/app/clusters/scenes-server/SceneTable.h @@ -85,9 +85,10 @@ class SceneHandler : public IntrusiveListNodeBase<> /// @return CHIP_NO_ERROR if successful, CHIP_ERROR value otherwise /// @note Only gets called after the scene-cluster has previously verified that the endpoint,cluster pair is supported by /// the handler. It is therefore the implementation's reponsibility to also implement the SupportsCluster method. - virtual CHIP_ERROR SerializeAdd(EndpointId endpoint, - const app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType & extensionFieldSet, - MutableByteSpan & serialisedBytes) = 0; + virtual CHIP_ERROR + SerializeAdd(EndpointId endpoint, + const app::Clusters::MatterScenes::Structs::ExtensionFieldSet::DecodableType & extensionFieldSet, + MutableByteSpan & serialisedBytes) = 0; /// @brief Called when handling StoreScene, and only if the handler supports the given endpoint and cluster. /// @@ -112,7 +113,7 @@ class SceneHandler : public IntrusiveListNodeBase<> /// @note Only gets called for handlers for which SupportsCluster() is true for the given endpoint and cluster. virtual CHIP_ERROR Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes, - app::Clusters::Scenes::Structs::ExtensionFieldSet::Type & extensionFieldSet) = 0; + app::Clusters::MatterScenes::Structs::ExtensionFieldSet::Type & extensionFieldSet) = 0; /// @brief Restore a stored scene for the given cluster instance, over timeMs milliseconds (e.g. when handling RecallScene) /// diff --git a/src/app/clusters/scenes-server/SceneTableImpl.cpp b/src/app/clusters/scenes-server/SceneTableImpl.cpp index a0cc24a8e4516e..2483caad8f308b 100644 --- a/src/app/clusters/scenes-server/SceneTableImpl.cpp +++ b/src/app/clusters/scenes-server/SceneTableImpl.cpp @@ -802,7 +802,7 @@ CHIP_ERROR DefaultSceneTableImpl::RemoveFabric(FabricIndex fabric_index) { VerifyOrReturnError(IsInitialized(), CHIP_ERROR_INTERNAL); - for (auto endpoint : app::EnabledEndpointsWithServerCluster(chip::app::Clusters::Scenes::Id)) + for (auto endpoint : app::EnabledEndpointsWithServerCluster(chip::app::Clusters::MatterScenes::Id)) { FabricSceneData fabric(endpoint, fabric_index); SceneIndex idx = 0; diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp index cac001cdc2c49d..20a77da191129f 100644 --- a/src/app/clusters/scenes-server/scenes-server.cpp +++ b/src/app/clusters/scenes-server/scenes-server.cpp @@ -40,12 +40,12 @@ using ExtensionFieldSet = chip::scenes::ExtensionFieldSet; using GroupDataProvider = chip::Credentials::GroupDataProvider; using SceneTable = chip::scenes::SceneTable; using AuthMode = chip::Access::AuthMode; -using ScenesServer = chip::app::Clusters::Scenes::ScenesServer; +using ScenesServer = chip::app::Clusters::MatterScenes::ScenesServer; namespace chip { namespace app { namespace Clusters { -namespace Scenes { +namespace MatterScenes { namespace { @@ -259,7 +259,8 @@ CHIP_ERROR ScenesServer::FabricSceneInfo::FindFabricSceneInfoIndex(EndpointId en { VerifyOrReturnError(kInvalidEndpointId != endpoint, CHIP_ERROR_INVALID_ARGUMENT); - uint16_t index = emberAfGetClusterServerEndpointIndex(endpoint, Scenes::Id, EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t index = + emberAfGetClusterServerEndpointIndex(endpoint, MatterScenes::Id, EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT); if (index < ArraySize(mSceneInfoStructs)) { @@ -1055,7 +1056,7 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce sceneTable->GetRemainingCapacity(ctx.mCommandHandler.GetAccessingFabricIndex(), capacity))); // Checks if we copy a single scene or all of them - if (req.mode.GetField(app::Clusters::Scenes::CopyModeBitmap::kCopyAllScenes)) + if (req.mode.GetField(app::Clusters::MatterScenes::CopyModeBitmap::kCopyAllScenes)) { // Scene Table interface data SceneId scenesInGroup[scenes::kMaxScenesPerFabric]; @@ -1121,16 +1122,16 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response); } -} // namespace Scenes +} // namespace MatterScenes } // namespace Clusters } // namespace app } // namespace chip using namespace chip; using namespace chip::app::Clusters; -using namespace chip::app::Clusters::Scenes; +using namespace chip::app::Clusters::MatterScenes; -void emberAfScenesClusterServerInitCallback(EndpointId endpoint) +void emberAfMatterScenesClusterServerInitCallback(EndpointId endpoint) { uint32_t featureMap = 0; EmberAfStatus status = Attributes::FeatureMap::Get(endpoint, &featureMap); @@ -1173,7 +1174,7 @@ void emberAfScenesClusterServerInitCallback(EndpointId endpoint) } } -void MatterScenesClusterServerShutdownCallback(EndpointId endpoint) +void MatterMatterScenesClusterServerShutdownCallback(EndpointId endpoint) { uint16_t endpointTableSize = 0; ReturnOnFailure(Attributes::SceneTableSize::Get(endpoint, &endpointTableSize)); @@ -1183,7 +1184,7 @@ void MatterScenesClusterServerShutdownCallback(EndpointId endpoint) sceneTable->RemoveEndpoint(); } -void MatterScenesPluginServerInitCallback() +void MatterMatterScenesPluginServerInitCallback() { CHIP_ERROR err = ScenesServer::Instance().Init(); if (err != CHIP_NO_ERROR) diff --git a/src/app/clusters/scenes-server/scenes-server.h b/src/app/clusters/scenes-server/scenes-server.h index 49bd1537de8734..d3b4b6d12813fc 100644 --- a/src/app/clusters/scenes-server/scenes-server.h +++ b/src/app/clusters/scenes-server/scenes-server.h @@ -29,7 +29,7 @@ namespace chip { namespace app { namespace Clusters { -namespace Scenes { +namespace MatterScenes { class ScenesServer : public CommandHandlerInterface, public AttributeAccessInterface { @@ -128,7 +128,7 @@ class ScenesServer : public CommandHandlerInterface, public AttributeAccessInter static ScenesServer mInstance; }; -} // namespace Scenes +} // namespace MatterScenes } // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp index a78a3d138bbd39..91f7b012201c80 100644 --- a/src/app/clusters/window-covering-server/window-covering-server.cpp +++ b/src/app/clusters/window-covering-server/window-covering-server.cpp @@ -30,9 +30,9 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES +#ifdef EMBER_AF_PLUGIN_MATTER_SCENES #include -#endif // EMBER_AF_PLUGIN_SCENES +#endif // EMBER_AF_PLUGIN_MATTER_SCENES using namespace chip; using namespace chip::app::Clusters; diff --git a/src/app/tests/TestSceneTable.cpp b/src/app/tests/TestSceneTable.cpp index 3346c54dabdc6e..181480eb6cbe65 100644 --- a/src/app/tests/TestSceneTable.cpp +++ b/src/app/tests/TestSceneTable.cpp @@ -136,13 +136,13 @@ SceneTableEntry scene14(sceneId11, sceneData14); SceneTableEntry scene15(sceneId12, sceneData15); // Clusters EFS data -static app::Clusters::Scenes::Structs::ExtensionFieldSet::Type OOextensionFieldSet; -static app::Clusters::Scenes::Structs::ExtensionFieldSet::Type LCextensionFieldSet; -static app::Clusters::Scenes::Structs::ExtensionFieldSet::Type CCextensionFieldSet; +static app::Clusters::MatterScenes::Structs::ExtensionFieldSet::Type OOextensionFieldSet; +static app::Clusters::MatterScenes::Structs::ExtensionFieldSet::Type LCextensionFieldSet; +static app::Clusters::MatterScenes::Structs::ExtensionFieldSet::Type CCextensionFieldSet; -static app::Clusters::Scenes::Structs::AttributeValuePair::Type OOPairs[1]; -static app::Clusters::Scenes::Structs::AttributeValuePair::Type LCPairs[2]; -static app::Clusters::Scenes::Structs::AttributeValuePair::Type CCPairs[8]; +static app::Clusters::MatterScenes::Structs::AttributeValuePair::Type OOPairs[1]; +static app::Clusters::MatterScenes::Structs::AttributeValuePair::Type LCPairs[2]; +static app::Clusters::MatterScenes::Structs::AttributeValuePair::Type CCPairs[8]; static uint8_t OO_buffer[scenes::kMaxFieldBytesPerCluster] = { 0 }; static uint8_t LC_buffer[scenes::kMaxFieldBytesPerCluster] = { 0 }; @@ -496,8 +496,8 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext) NL_TEST_ASSERT(aSuite, nullptr != sceneTable); VerifyOrReturn(nullptr != sceneTable); - app::Clusters::Scenes::Structs::ExtensionFieldSet::Type extensionFieldSetOut; - app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType extensionFieldSetIn; + app::Clusters::MatterScenes::Structs::ExtensionFieldSet::Type extensionFieldSetOut; + app::Clusters::MatterScenes::Structs::ExtensionFieldSet::DecodableType extensionFieldSetIn; TLV::TLVReader reader; TLV::TLVWriter writer; @@ -644,9 +644,9 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext) memset(buffer, 0, buff_span.size()); // To test failure on serialize and deserialize when too many pairs are in the field sets - app::Clusters::Scenes::Structs::ExtensionFieldSet::Type extensionFieldFailTestOut; - app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType extensionFieldFailTestIn; - app::Clusters::Scenes::Structs::AttributeValuePair::Type TooManyPairs[16]; + app::Clusters::MatterScenes::Structs::ExtensionFieldSet::Type extensionFieldFailTestOut; + app::Clusters::MatterScenes::Structs::ExtensionFieldSet::DecodableType extensionFieldFailTestIn; + app::Clusters::MatterScenes::Structs::AttributeValuePair::Type TooManyPairs[16]; uint8_t payloadOk = 0; for (uint8_t i = 0; i < 16; i++) diff --git a/src/app/zap-templates/templates/app/gen_config.zapt b/src/app/zap-templates/templates/app/gen_config.zapt index 4accc4a61be151..b9924025bd2e27 100644 --- a/src/app/zap-templates/templates/app/gen_config.zapt +++ b/src/app/zap-templates/templates/app/gen_config.zapt @@ -38,7 +38,7 @@ #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0 {{/if}} -{{else if (is_str_equal name "Scenes")}} +{{else if (is_str_equal name "Matter Scenes")}} {{#if (is_server side)}} // User options for {{side}} plugin {{name}} {{/if}}