From 366aa9e2b321fe178704e36f02ecfa50ce167986 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 11 Jul 2023 16:36:26 -0400 Subject: [PATCH] Improve chip-tool help for "synthetic" clusters. (#27665) * Improve chip-tool help for "synthetic" clusters. 1. Makes it clear which things are actual clusters and which are command sets. 2. Makes sure all command sets have overall help text that describes what the commands in the set do. 3. Adds some help text to some specific commands. * Address review comment. * Address review comments. --- .../commands/clusters/SubscriptionsCommands.h | 2 +- .../chip-tool/commands/common/Commands.cpp | 88 ++++-- examples/chip-tool/commands/common/Commands.h | 33 ++- examples/chip-tool/commands/delay/Commands.h | 2 +- .../delay/WaitForCommissioneeCommand.h | 4 +- .../chip-tool/commands/discover/Commands.h | 2 +- examples/chip-tool/commands/group/Commands.h | 3 +- .../chip-tool/commands/interactive/Commands.h | 2 +- .../interactive/InteractiveCommands.h | 12 +- .../chip-tool/commands/pairing/Commands.h | 2 +- .../chip-tool/commands/payload/Commands.h | 2 +- .../commands/session-management/Commands.h | 2 +- .../chip-tool/commands/storage/Commands.h | 2 +- examples/chip-tool/templates/commands.zapt | 4 +- .../chip-tool/templates/tests/commands.zapt | 2 +- .../commands/discover/Commands.h | 2 +- .../commands/interactive/Commands.h | 2 +- .../commands/pairing/Commands.h | 2 +- .../commands/payload/Commands.h | 2 +- .../commands/provider/Commands.h | 2 +- .../commands/storage/Commands.h | 3 +- .../templates/commands.zapt | 4 +- .../templates/tests/commands.zapt | 2 +- .../zap-generated/cluster/Commands.h | 269 +++++++++--------- .../chip-tool/zap-generated/test/Commands.h | 2 +- .../zap-generated/cluster/Commands.h | 133 ++++----- .../zap-generated/test/Commands.h | 2 +- 27 files changed, 321 insertions(+), 266 deletions(-) diff --git a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h index 1a95949b48c615..cc0daaf7d83398 100644 --- a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h +++ b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h @@ -104,5 +104,5 @@ void registerCommandsSubscriptions(Commands & commands, CredentialIssuerCommands make_unique(credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands, "Commands for shutting down subscriptions."); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for shutting down subscriptions."); } diff --git a/examples/chip-tool/commands/common/Commands.cpp b/examples/chip-tool/commands/common/Commands.cpp index eef7d8ccb39174..c2f49c236738b5 100644 --- a/examples/chip-tool/commands/common/Commands.cpp +++ b/examples/chip-tool/commands/common/Commands.cpp @@ -119,12 +119,14 @@ static void DetectAndLogMismatchedDoubleQuotes(int argc, char ** argv) } // namespace -void Commands::Register(const char * clusterName, commands_list commandsList, const char * helpText) +void Commands::Register(const char * commandSetName, commands_list commandsList, const char * helpText, bool isCluster) { - mClusters[clusterName].second = helpText; + VerifyOrDieWithMsg(isCluster || helpText != nullptr, chipTool, "Non-cluster command sets must have help text"); + mCommandSets[commandSetName].isCluster = isCluster; + mCommandSets[commandSetName].helpText = helpText; for (auto & command : commandsList) { - mClusters[clusterName].first.push_back(std::move(command)); + mCommandSets[commandSetName].commands.push_back(std::move(command)); } } @@ -192,26 +194,26 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive, if (argc <= 1) { - ChipLogError(chipTool, "Missing cluster name"); - ShowClusters(argv[0]); + ChipLogError(chipTool, "Missing cluster or command set name"); + ShowCommandSets(argv[0]); return CHIP_ERROR_INVALID_ARGUMENT; } - auto clusterIter = GetCluster(argv[1]); - if (clusterIter == mClusters.end()) + auto commandSetIter = GetCommandSet(argv[1]); + if (commandSetIter == mCommandSets.end()) { - ChipLogError(chipTool, "Unknown cluster: %s", argv[1]); - ShowClusters(argv[0]); + ChipLogError(chipTool, "Unknown cluster or command set: %s", argv[1]); + ShowCommandSets(argv[0]); return CHIP_ERROR_INVALID_ARGUMENT; } - auto & commandList = clusterIter->second.first; - auto * clusterHelp = clusterIter->second.second; + auto & commandList = commandSetIter->second.commands; + auto * helpText = commandSetIter->second.helpText; if (argc <= 2) { ChipLogError(chipTool, "Missing command name"); - ShowCluster(argv[0], argv[1], commandList, clusterHelp); + ShowCommandSet(argv[0], argv[1], commandList, helpText); return CHIP_ERROR_INVALID_ARGUMENT; } @@ -222,7 +224,7 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive, if (command == nullptr) { ChipLogError(chipTool, "Unknown command: %s", argv[2]); - ShowCluster(argv[0], argv[1], commandList, clusterHelp); + ShowCommandSet(argv[0], argv[1], commandList, helpText); return CHIP_ERROR_INVALID_ARGUMENT; } } @@ -293,19 +295,19 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive, return command->Run(); } -Commands::ClusterMap::iterator Commands::GetCluster(std::string clusterName) +Commands::CommandSetMap::iterator Commands::GetCommandSet(std::string commandSetName) { - for (auto & cluster : mClusters) + for (auto & commandSet : mCommandSets) { - std::string key(cluster.first); + std::string key(commandSet.first); std::transform(key.begin(), key.end(), key.begin(), ::tolower); - if (key.compare(clusterName) == 0) + if (key.compare(commandSetName) == 0) { - return mClusters.find(cluster.first); + return mCommandSets.find(commandSet.first); } } - return mClusters.end(); + return mCommandSets.end(); } Command * Commands::GetCommand(CommandsVector & commands, std::string commandName) @@ -350,29 +352,53 @@ bool Commands::IsGlobalCommand(std::string commandName) const return IsAttributeCommand(commandName) || IsEventCommand(commandName); } -void Commands::ShowClusters(std::string executable) +void Commands::ShowCommandSetOverview(std::string commandSetName, const CommandSet & commandSet) +{ + std::transform(commandSetName.begin(), commandSetName.end(), commandSetName.begin(), + [](unsigned char c) { return std::tolower(c); }); + fprintf(stderr, " | * %-82s|\n", commandSetName.c_str()); + ShowHelpText(commandSet.helpText); +} + +void Commands::ShowCommandSets(std::string executable) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s cluster_name command_name [param1 param2 ...]\n", executable.c_str()); + fprintf(stderr, "or:\n"); + fprintf(stderr, " %s command_set_name command_name [param1 param2 ...]\n", executable.c_str()); fprintf(stderr, "\n"); + // Table of clusters fprintf(stderr, " +-------------------------------------------------------------------------------------+\n"); fprintf(stderr, " | Clusters: |\n"); fprintf(stderr, " +-------------------------------------------------------------------------------------+\n"); - for (auto & cluster : mClusters) + for (auto & commandSet : mCommandSets) + { + if (commandSet.second.isCluster) + { + ShowCommandSetOverview(commandSet.first, commandSet.second); + } + } + fprintf(stderr, " +-------------------------------------------------------------------------------------+\n"); + fprintf(stderr, "\n"); + + // Table of command sets + fprintf(stderr, " +-------------------------------------------------------------------------------------+\n"); + fprintf(stderr, " | Command sets: |\n"); + fprintf(stderr, " +-------------------------------------------------------------------------------------+\n"); + for (auto & commandSet : mCommandSets) { - std::string clusterName(cluster.first); - std::transform(clusterName.begin(), clusterName.end(), clusterName.begin(), - [](unsigned char c) { return std::tolower(c); }); - fprintf(stderr, " | * %-82s|\n", clusterName.c_str()); - ShowHelpText(cluster.second.second); + if (!commandSet.second.isCluster) + { + ShowCommandSetOverview(commandSet.first, commandSet.second); + } } fprintf(stderr, " +-------------------------------------------------------------------------------------+\n"); } -void Commands::ShowCluster(std::string executable, std::string clusterName, CommandsVector & commands, const char * helpText) +void Commands::ShowCommandSet(std::string executable, std::string commandSetName, CommandsVector & commands, const char * helpText) { fprintf(stderr, "Usage:\n"); - fprintf(stderr, " %s %s command_name [param1 param2 ...]\n", executable.c_str(), clusterName.c_str()); + fprintf(stderr, " %s %s command_name [param1 param2 ...]\n", executable.c_str(), commandSetName.c_str()); if (helpText) { @@ -554,11 +580,11 @@ bool Commands::DecodeArgumentsFromBase64EncodedJson(const char * json, std::vect auto commandName = jsonValue[kJsonCommandKey].asString(); auto arguments = jsonValue[kJsonArgumentsKey].asString(); - auto clusterIter = GetCluster(clusterName); - VerifyOrReturnValue(clusterIter != mClusters.end(), false, + auto clusterIter = GetCommandSet(clusterName); + VerifyOrReturnValue(clusterIter != mCommandSets.end(), false, ChipLogError(chipTool, "Cluster '%s' is not supported.", clusterName.c_str())); - auto & commandList = clusterIter->second.first; + auto & commandList = clusterIter->second.commands; auto command = GetCommand(commandList, commandName); diff --git a/examples/chip-tool/commands/common/Commands.h b/examples/chip-tool/commands/common/Commands.h index f9ba9f739ae140..67c23b401c4147 100644 --- a/examples/chip-tool/commands/common/Commands.h +++ b/examples/chip-tool/commands/common/Commands.h @@ -30,25 +30,44 @@ class Commands public: using CommandsVector = ::std::vector>; - void Register(const char * clusterName, commands_list commandsList, const char * helpText = nullptr); + void RegisterCluster(const char * clusterName, commands_list commandsList) + { + Register(clusterName, commandsList, nullptr, true); + } + // Command sets represent chip-tool functionality that is not actually + // XML-defined clusters. All command sets should have help text explaining + // what sort of commands one should expect to find in the set. + void RegisterCommandSet(const char * commandSetName, commands_list commandsList, const char * helpText) + { + Register(commandSetName, commandsList, helpText, false); + } int Run(int argc, char ** argv); int RunInteractive(const char * command, const chip::Optional & storageDirectory = chip::NullOptional); private: - using ClusterMap = std::map>; + struct CommandSet + { + CommandsVector commands; + bool isCluster = false; + const char * helpText = nullptr; + }; + // The tuple contains the commands, whether it's a synthetic cluster, and + // the help text for the cluster (which may be null). + using CommandSetMap = std::map; CHIP_ERROR RunCommand(int argc, char ** argv, bool interactive = false, const chip::Optional & interactiveStorageDirectory = chip::NullOptional); - ClusterMap::iterator GetCluster(std::string clusterName); + CommandSetMap::iterator GetCommandSet(std::string commandSetName); Command * GetCommand(CommandsVector & commands, std::string commandName); Command * GetGlobalCommand(CommandsVector & commands, std::string commandName, std::string attributeName); bool IsAttributeCommand(std::string commandName) const; bool IsEventCommand(std::string commandName) const; bool IsGlobalCommand(std::string commandName) const; - void ShowClusters(std::string executable); - void ShowCluster(std::string executable, std::string clusterName, CommandsVector & commands, const char * helpText); + void ShowCommandSets(std::string executable); + static void ShowCommandSetOverview(std::string commandSetName, const CommandSet & commandSet); + void ShowCommandSet(std::string executable, std::string commandSetName, CommandsVector & commands, const char * helpText); void ShowClusterAttributes(std::string executable, std::string clusterName, std::string commandName, CommandsVector & commands); void ShowClusterEvents(std::string executable, std::string clusterName, std::string commandName, CommandsVector & commands); void ShowCommand(std::string executable, std::string clusterName, Command * command); @@ -60,7 +79,9 @@ class Commands // helpText may be null, in which case it's not shown. static void ShowHelpText(const char * helpText); - ClusterMap mClusters; + void Register(const char * commandSetName, commands_list commandsList, const char * helpText, bool isCluster); + + CommandSetMap mCommandSets; #ifdef CONFIG_USE_LOCAL_STORAGE PersistentStorage mStorage; #endif // CONFIG_USE_LOCAL_STORAGE diff --git a/examples/chip-tool/commands/delay/Commands.h b/examples/chip-tool/commands/delay/Commands.h index f14b4bd435e72c..4d2dd2941ea259 100644 --- a/examples/chip-tool/commands/delay/Commands.h +++ b/examples/chip-tool/commands/delay/Commands.h @@ -30,5 +30,5 @@ void registerCommandsDelay(Commands & commands, CredentialIssuerCommands * creds make_unique(credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for waiting for something to happen."); } diff --git a/examples/chip-tool/commands/delay/WaitForCommissioneeCommand.h b/examples/chip-tool/commands/delay/WaitForCommissioneeCommand.h index 830a738dcc1ef5..482d996a54a0d9 100644 --- a/examples/chip-tool/commands/delay/WaitForCommissioneeCommand.h +++ b/examples/chip-tool/commands/delay/WaitForCommissioneeCommand.h @@ -26,8 +26,8 @@ class WaitForCommissioneeCommand : public CHIPCommand { public: WaitForCommissioneeCommand(CredentialIssuerCommands * credIssuerCommands) : - CHIPCommand("wait-for-commissionee", credIssuerCommands), mOnDeviceConnectedCallback(OnDeviceConnectedFn, this), - mOnDeviceConnectionFailureCallback(OnDeviceConnectionFailureFn, this) + CHIPCommand("wait-for-commissionee", credIssuerCommands, "Establish a CASE session to the provided node id."), + mOnDeviceConnectedCallback(OnDeviceConnectedFn, this), mOnDeviceConnectionFailureCallback(OnDeviceConnectionFailureFn, this) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("expire-existing-session", 0, 1, &mExpireExistingSession); diff --git a/examples/chip-tool/commands/discover/Commands.h b/examples/chip-tool/commands/discover/Commands.h index e2a2209d2fc83c..1b3f45ac75168c 100644 --- a/examples/chip-tool/commands/discover/Commands.h +++ b/examples/chip-tool/commands/discover/Commands.h @@ -85,5 +85,5 @@ void registerCommandsDiscover(Commands & commands, CredentialIssuerCommands * cr make_unique(credsIssuerConfig), }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for device discovery."); } diff --git a/examples/chip-tool/commands/group/Commands.h b/examples/chip-tool/commands/group/Commands.h index b66d62dccf5171..b29ff959ede832 100644 --- a/examples/chip-tool/commands/group/Commands.h +++ b/examples/chip-tool/commands/group/Commands.h @@ -358,5 +358,6 @@ void registerCommandsGroup(Commands & commands, CredentialIssuerCommands * creds make_unique(credsIssuerConfig), }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, + "Commands for manipulating group keys and memberships for chip-tool itself."); } diff --git a/examples/chip-tool/commands/interactive/Commands.h b/examples/chip-tool/commands/interactive/Commands.h index 747c8aeaa418d9..188f3c0f3df871 100644 --- a/examples/chip-tool/commands/interactive/Commands.h +++ b/examples/chip-tool/commands/interactive/Commands.h @@ -33,5 +33,5 @@ void registerCommandsInteractive(Commands & commands, CredentialIssuerCommands * #endif // CONFIG_USE_INTERACTIVE_MODE }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for starting long-lived interactive modes."); } diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.h b/examples/chip-tool/commands/interactive/InteractiveCommands.h index 0b4ead9f9cbbf5..85cc53c92b487a 100644 --- a/examples/chip-tool/commands/interactive/InteractiveCommands.h +++ b/examples/chip-tool/commands/interactive/InteractiveCommands.h @@ -29,8 +29,10 @@ class Commands; class InteractiveCommand : public CHIPCommand { public: - InteractiveCommand(const char * name, Commands * commandsHandler, CredentialIssuerCommands * credsIssuerConfig) : - CHIPCommand(name, credsIssuerConfig), mHandler(commandsHandler) + InteractiveCommand(const char * name, Commands * commandsHandler, const char * helpText, + CredentialIssuerCommands * credsIssuerConfig) : + CHIPCommand(name, credsIssuerConfig, helpText), + mHandler(commandsHandler) { AddArgument("advertise-operational", 0, 1, &mAdvertiseOperational, "Advertise operational node over DNS-SD and accept incoming CASE sessions."); @@ -51,7 +53,8 @@ class InteractiveStartCommand : public InteractiveCommand { public: InteractiveStartCommand(Commands * commandsHandler, CredentialIssuerCommands * credsIssuerConfig) : - InteractiveCommand("start", commandsHandler, credsIssuerConfig) + InteractiveCommand("start", commandsHandler, "Start an interactive shell that can then run other commands.", + credsIssuerConfig) {} /////////// CHIPCommand Interface ///////// @@ -62,7 +65,8 @@ class InteractiveServerCommand : public InteractiveCommand, public WebSocketServ { public: InteractiveServerCommand(Commands * commandsHandler, CredentialIssuerCommands * credsIssuerConfig) : - InteractiveCommand("server", commandsHandler, credsIssuerConfig) + InteractiveCommand("server", commandsHandler, "Start a websocket server that can receive commands sent by another process.", + credsIssuerConfig) { AddArgument("port", 0, UINT16_MAX, &mPort, "Port the websocket will listen to. Defaults to 9002."); } diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h index 6d02253c13de92..388dc4741ffe30 100644 --- a/examples/chip-tool/commands/pairing/Commands.h +++ b/examples/chip-tool/commands/pairing/Commands.h @@ -255,5 +255,5 @@ void registerCommandsPairing(Commands & commands, CredentialIssuerCommands * cre make_unique(credsIssuerConfig), }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for commissioning devices."); } diff --git a/examples/chip-tool/commands/payload/Commands.h b/examples/chip-tool/commands/payload/Commands.h index 0cc5cae0a0879c..7f10e831b2ac9e 100644 --- a/examples/chip-tool/commands/payload/Commands.h +++ b/examples/chip-tool/commands/payload/Commands.h @@ -36,5 +36,5 @@ void registerCommandsPayload(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for parsing and generating setup payloads."); } diff --git a/examples/chip-tool/commands/session-management/Commands.h b/examples/chip-tool/commands/session-management/Commands.h index 7c75be2065f13d..97223a6354748c 100644 --- a/examples/chip-tool/commands/session-management/Commands.h +++ b/examples/chip-tool/commands/session-management/Commands.h @@ -30,5 +30,5 @@ void registerCommandsSessionManagement(Commands & commands, CredentialIssuerComm make_unique(credsIssuerConfig), }; - commands.Register(clusterName, clusterCommands, "Commands for managing CASE and PASE session state"); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for managing CASE and PASE session state."); } diff --git a/examples/chip-tool/commands/storage/Commands.h b/examples/chip-tool/commands/storage/Commands.h index c53b324481a1ae..7e2ca063e1f42b 100644 --- a/examples/chip-tool/commands/storage/Commands.h +++ b/examples/chip-tool/commands/storage/Commands.h @@ -27,5 +27,5 @@ void registerCommandsStorage(Commands & commands) commands_list clusterCommands = { make_unique() }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for managing persistent data stored by chip-tool."); } diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt index 8f47277816f30f..60d327821b05d5 100644 --- a/examples/chip-tool/templates/commands.zapt +++ b/examples/chip-tool/templates/commands.zapt @@ -117,7 +117,7 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands, CredentialIss {{/zcl_events}} }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } {{/zcl_clusters}} @@ -136,7 +136,7 @@ void registerClusterAny(Commands & commands, CredentialIssuerCommands * credsIss make_unique(credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for sending IM messages based on cluster id, not cluster name."); } void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) diff --git a/examples/chip-tool/templates/tests/commands.zapt b/examples/chip-tool/templates/tests/commands.zapt index 060539a66ba090..34e80ddfb44843 100644 --- a/examples/chip-tool/templates/tests/commands.zapt +++ b/examples/chip-tool/templates/tests/commands.zapt @@ -58,5 +58,5 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds #endif // CONFIG_ENABLE_YAML_TESTS }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for running YAML tests."); } diff --git a/examples/darwin-framework-tool/commands/discover/Commands.h b/examples/darwin-framework-tool/commands/discover/Commands.h index d1d54eac255ddb..b20b93e07b189b 100644 --- a/examples/darwin-framework-tool/commands/discover/Commands.h +++ b/examples/darwin-framework-tool/commands/discover/Commands.h @@ -32,5 +32,5 @@ void registerCommandsDiscover(Commands & commands) make_unique(), }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for device discovery."); } diff --git a/examples/darwin-framework-tool/commands/interactive/Commands.h b/examples/darwin-framework-tool/commands/interactive/Commands.h index 722feb8ae2069a..fdc92f45579725 100644 --- a/examples/darwin-framework-tool/commands/interactive/Commands.h +++ b/examples/darwin-framework-tool/commands/interactive/Commands.h @@ -35,5 +35,5 @@ void registerCommandsInteractive(Commands & commands) #endif // CONFIG_USE_INTERACTIVE_MODE }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for starting long-lived interactive modes."); } diff --git a/examples/darwin-framework-tool/commands/pairing/Commands.h b/examples/darwin-framework-tool/commands/pairing/Commands.h index f15524833a0e31..bc1bccdfd0ce43 100644 --- a/examples/darwin-framework-tool/commands/pairing/Commands.h +++ b/examples/darwin-framework-tool/commands/pairing/Commands.h @@ -102,5 +102,5 @@ void registerCommandsPairing(Commands & commands) make_unique(), }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for commissioning devices."); } diff --git a/examples/darwin-framework-tool/commands/payload/Commands.h b/examples/darwin-framework-tool/commands/payload/Commands.h index 67615bcd2c3a7d..3e0015f472b5c5 100644 --- a/examples/darwin-framework-tool/commands/payload/Commands.h +++ b/examples/darwin-framework-tool/commands/payload/Commands.h @@ -27,5 +27,5 @@ void registerCommandsPayload(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for parsing and generating setup payloads."); } diff --git a/examples/darwin-framework-tool/commands/provider/Commands.h b/examples/darwin-framework-tool/commands/provider/Commands.h index 15f2750a528b5d..0083ade9cdd5e5 100644 --- a/examples/darwin-framework-tool/commands/provider/Commands.h +++ b/examples/darwin-framework-tool/commands/provider/Commands.h @@ -10,5 +10,5 @@ void registerClusterOtaSoftwareUpdateProviderInteractive(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Command for configuring darwin-framework-tool as an OTA provider."); } diff --git a/examples/darwin-framework-tool/commands/storage/Commands.h b/examples/darwin-framework-tool/commands/storage/Commands.h index c53b324481a1ae..65534272b81ca5 100644 --- a/examples/darwin-framework-tool/commands/storage/Commands.h +++ b/examples/darwin-framework-tool/commands/storage/Commands.h @@ -27,5 +27,6 @@ void registerCommandsStorage(Commands & commands) commands_list clusterCommands = { make_unique() }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, + "Commands for managing persistent data stored by darwin-framework-tool."); } diff --git a/examples/darwin-framework-tool/templates/commands.zapt b/examples/darwin-framework-tool/templates/commands.zapt index ae0c239dbf9e57..f549b3bd16b641 100644 --- a/examples/darwin-framework-tool/templates/commands.zapt +++ b/examples/darwin-framework-tool/templates/commands.zapt @@ -304,7 +304,7 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands) {{/zcl_events}} }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } {{/if}} {{/zcl_clusters}} @@ -323,7 +323,7 @@ void registerClusterAny(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for sending IM messages based on cluster id, not cluster name."); } void registerClusters(Commands & commands) diff --git a/examples/darwin-framework-tool/templates/tests/commands.zapt b/examples/darwin-framework-tool/templates/tests/commands.zapt index ce44db1f69f82a..526e33f5edd497 100644 --- a/examples/darwin-framework-tool/templates/tests/commands.zapt +++ b/examples/darwin-framework-tool/templates/tests/commands.zapt @@ -59,5 +59,5 @@ void registerCommandsTests(Commands & commands) #endif // CONFIG_ENABLE_YAML_TESTS }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for running YAML tests."); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 44312157dea3be..0935bdb0e54c3f 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -11168,7 +11168,7 @@ void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * cre make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGroups(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11229,7 +11229,7 @@ void registerClusterGroups(Commands & commands, CredentialIssuerCommands * creds make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterScenes(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11323,7 +11323,7 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11400,7 +11400,7 @@ void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsI make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11459,7 +11459,7 @@ void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssu make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11578,7 +11578,7 @@ void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11665,7 +11665,7 @@ void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerComman make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11716,7 +11716,7 @@ void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCo make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11784,7 +11784,7 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBinding(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11840,7 +11840,7 @@ void registerClusterBinding(Commands & commands, CredentialIssuerCommands * cred make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -11929,7 +11929,7 @@ void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12010,7 +12010,7 @@ void registerClusterActions(Commands & commands, CredentialIssuerCommands * cred make_unique(Id, "action-failed", Events::ActionFailed::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBasicInformation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12154,7 +12154,7 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman make_unique(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12208,7 +12208,7 @@ void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIss make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12284,7 +12284,7 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs make_unique(Id, "download-error", Events::DownloadError::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLocalizationConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12343,7 +12343,7 @@ void registerClusterLocalizationConfiguration(Commands & commands, CredentialIss make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12410,7 +12410,7 @@ void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuer make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterUnitLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12465,7 +12465,7 @@ void registerClusterUnitLocalization(Commands & commands, CredentialIssuerComman make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12520,7 +12520,7 @@ void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssu make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12725,7 +12725,7 @@ void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * make_unique(Id, "bat-charge-fault-change", Events::BatChargeFaultChange::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12805,7 +12805,7 @@ void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCo make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12900,7 +12900,7 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -12952,7 +12952,7 @@ void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -13055,7 +13055,7 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm make_unique(Id, "boot-reason", Events::BootReason::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -13129,7 +13129,7 @@ void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCom make_unique(Id, "software-fault", Events::SoftwareFault::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -13476,7 +13476,7 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu make_unique(Id, "network-fault-change", Events::NetworkFaultChange::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -13596,7 +13596,7 @@ void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuer make_unique(Id, "connection-status", Events::ConnectionStatus::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -13684,7 +13684,7 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIs make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -13806,7 +13806,7 @@ void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCom make_unique(Id, "missing-trusted-time-source", Events::MissingTrustedTimeSource::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBridgedDeviceBasicInformation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -13930,7 +13930,7 @@ void registerClusterBridgedDeviceBasicInformation(Commands & commands, Credentia make_unique(Id, "reachable-changed", Events::ReachableChanged::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14007,7 +14007,7 @@ void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * creds make_unique(Id, "multi-press-complete", Events::MultiPressComplete::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAdministratorCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14075,7 +14075,7 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOperationalCredentials(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14162,7 +14162,7 @@ void registerClusterOperationalCredentials(Commands & commands, CredentialIssuer make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14236,7 +14236,7 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14292,7 +14292,7 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14348,7 +14348,7 @@ void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * cr make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14399,7 +14399,7 @@ void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerComm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14450,7 +14450,7 @@ void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14501,7 +14501,7 @@ void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14558,7 +14558,7 @@ void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * make_unique(Id, "state-change", Events::StateChange::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14640,7 +14640,7 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14718,7 +14718,7 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14787,7 +14787,7 @@ void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerComma make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) @@ -14857,7 +14857,7 @@ void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14926,7 +14926,7 @@ void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerC make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -14995,7 +14995,7 @@ void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15064,7 +15064,7 @@ void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands * make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTemperatureControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15146,7 +15146,7 @@ void registerClusterTemperatureControl(Commands & commands, CredentialIssuerComm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15211,7 +15211,7 @@ void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerComma make_unique(Id, "notify", Events::Notify::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15280,7 +15280,7 @@ void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15335,7 +15335,7 @@ void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15468,7 +15468,7 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * make_unique(Id, "all-clear", Events::AllClear::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDishwasherAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15539,7 +15539,7 @@ void registerClusterDishwasherAlarm(Commands & commands, CredentialIssuerCommand make_unique(Id, "notify", Events::Notify::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15625,7 +15625,7 @@ void registerClusterOperationalState(Commands & commands, CredentialIssuerComman make_unique(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRvcOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15711,7 +15711,7 @@ void registerClusterRvcOperationalState(Commands & commands, CredentialIssuerCom make_unique(Id, "operation-completion", Events::OperationCompletion::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterHepaFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15786,7 +15786,7 @@ void registerClusterHepaFilterMonitoring(Commands & commands, CredentialIssuerCo make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15861,7 +15861,7 @@ void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, Credent make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterCeramicFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -15936,7 +15936,7 @@ void registerClusterCeramicFilterMonitoring(Commands & commands, CredentialIssue make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterElectrostaticFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16011,7 +16011,7 @@ void registerClusterElectrostaticFilterMonitoring(Commands & commands, Credentia make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterUvFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16086,7 +16086,7 @@ void registerClusterUvFilterMonitoring(Commands & commands, CredentialIssuerComm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterIonizingFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16161,7 +16161,7 @@ void registerClusterIonizingFilterMonitoring(Commands & commands, CredentialIssu make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterZeoliteFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16236,7 +16236,7 @@ void registerClusterZeoliteFilterMonitoring(Commands & commands, CredentialIssue make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOzoneFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16311,7 +16311,7 @@ void registerClusterOzoneFilterMonitoring(Commands & commands, CredentialIssuerC make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterWaterTankMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16386,7 +16386,7 @@ void registerClusterWaterTankMonitoring(Commands & commands, CredentialIssuerCom make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFuelTankMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16461,7 +16461,7 @@ void registerClusterFuelTankMonitoring(Commands & commands, CredentialIssuerComm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterInkCartridgeMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16536,7 +16536,7 @@ void registerClusterInkCartridgeMonitoring(Commands & commands, CredentialIssuer make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTonerCartridgeMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16611,7 +16611,7 @@ void registerClusterTonerCartridgeMonitoring(Commands & commands, CredentialIssu make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -16875,7 +16875,7 @@ void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * cre make_unique(Id, "lock-user-change", Events::LockUserChange::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterWindowCovering(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -17061,7 +17061,7 @@ void registerClusterWindowCovering(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBarrierControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -17160,7 +17160,7 @@ void registerClusterBarrierControl(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -17353,7 +17353,7 @@ void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialI make_unique(Id, "turbine-operation", Events::TurbineOperation::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -17661,7 +17661,7 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -17762,7 +17762,7 @@ void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -17829,7 +17829,7 @@ void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, Cr make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18136,7 +18136,7 @@ void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18249,7 +18249,7 @@ void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCo make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterIlluminanceMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18325,7 +18325,7 @@ void registerClusterIlluminanceMeasurement(Commands & commands, CredentialIssuer make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18395,7 +18395,7 @@ void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuer make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPressureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18488,7 +18488,7 @@ void registerClusterPressureMeasurement(Commands & commands, CredentialIssuerCom make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFlowMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18558,7 +18558,7 @@ void registerClusterFlowMeasurement(Commands & commands, CredentialIssuerCommand make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18628,7 +18628,7 @@ void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialI make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOccupancySensing(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18758,7 +18758,7 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterCarbonMonoxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18866,7 +18866,7 @@ void registerClusterCarbonMonoxideConcentrationMeasurement(Commands & commands, make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterCarbonDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -18974,7 +18974,7 @@ void registerClusterCarbonDioxideConcentrationMeasurement(Commands & commands, C make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterEthyleneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19082,7 +19082,7 @@ void registerClusterEthyleneConcentrationMeasurement(Commands & commands, Creden make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterEthyleneOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19190,7 +19190,7 @@ void registerClusterEthyleneOxideConcentrationMeasurement(Commands & commands, C make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterHydrogenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19298,7 +19298,7 @@ void registerClusterHydrogenConcentrationMeasurement(Commands & commands, Creden make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterHydrogenSulfideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19406,7 +19406,7 @@ void registerClusterHydrogenSulfideConcentrationMeasurement(Commands & commands, make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterNitricOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19514,7 +19514,7 @@ void registerClusterNitricOxideConcentrationMeasurement(Commands & commands, Cre make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19622,7 +19622,7 @@ void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands, make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19730,7 +19730,7 @@ void registerClusterOxygenConcentrationMeasurement(Commands & commands, Credenti make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOzoneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19838,7 +19838,7 @@ void registerClusterOzoneConcentrationMeasurement(Commands & commands, Credentia make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSulfurDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -19946,7 +19946,7 @@ void registerClusterSulfurDioxideConcentrationMeasurement(Commands & commands, C make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDissolvedOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20054,7 +20054,7 @@ void registerClusterDissolvedOxygenConcentrationMeasurement(Commands & commands, make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBromateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20162,7 +20162,7 @@ void registerClusterBromateConcentrationMeasurement(Commands & commands, Credent make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterChloraminesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20270,7 +20270,7 @@ void registerClusterChloraminesConcentrationMeasurement(Commands & commands, Cre make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterChlorineConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20378,7 +20378,7 @@ void registerClusterChlorineConcentrationMeasurement(Commands & commands, Creden make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFecalColiformEColiConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20486,7 +20486,7 @@ void registerClusterFecalColiformEColiConcentrationMeasurement(Commands & comman make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFluorideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20594,7 +20594,7 @@ void registerClusterFluorideConcentrationMeasurement(Commands & commands, Creden make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterHaloaceticAcidsConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20702,7 +20702,7 @@ void registerClusterHaloaceticAcidsConcentrationMeasurement(Commands & commands, make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTotalTrihalomethanesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20810,7 +20810,7 @@ void registerClusterTotalTrihalomethanesConcentrationMeasurement(Commands & comm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTotalColiformBacteriaConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -20918,7 +20918,7 @@ void registerClusterTotalColiformBacteriaConcentrationMeasurement(Commands & com make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTurbidityConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21026,7 +21026,7 @@ void registerClusterTurbidityConcentrationMeasurement(Commands & commands, Crede make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterCopperConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21134,7 +21134,7 @@ void registerClusterCopperConcentrationMeasurement(Commands & commands, Credenti make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLeadConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21242,7 +21242,7 @@ void registerClusterLeadConcentrationMeasurement(Commands & commands, Credential make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterManganeseConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21350,7 +21350,7 @@ void registerClusterManganeseConcentrationMeasurement(Commands & commands, Crede make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSulfateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21458,7 +21458,7 @@ void registerClusterSulfateConcentrationMeasurement(Commands & commands, Credent make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBromodichloromethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21566,7 +21566,7 @@ void registerClusterBromodichloromethaneConcentrationMeasurement(Commands & comm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBromoformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21674,7 +21674,7 @@ void registerClusterBromoformConcentrationMeasurement(Commands & commands, Crede make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterChlorodibromomethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21782,7 +21782,7 @@ void registerClusterChlorodibromomethaneConcentrationMeasurement(Commands & comm make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterChloroformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21890,7 +21890,7 @@ void registerClusterChloroformConcentrationMeasurement(Commands & commands, Cred make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSodiumConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -21998,7 +21998,7 @@ void registerClusterSodiumConcentrationMeasurement(Commands & commands, Credenti make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPm25ConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22106,7 +22106,7 @@ void registerClusterPm25ConcentrationMeasurement(Commands & commands, Credential make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFormaldehydeConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22214,7 +22214,7 @@ void registerClusterFormaldehydeConcentrationMeasurement(Commands & commands, Cr make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPm1ConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22322,7 +22322,7 @@ void registerClusterPm1ConcentrationMeasurement(Commands & commands, CredentialI make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPm10ConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22430,7 +22430,7 @@ void registerClusterPm10ConcentrationMeasurement(Commands & commands, Credential make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTotalVolatileOrganicCompoundsConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) @@ -22541,7 +22541,7 @@ void registerClusterTotalVolatileOrganicCompoundsConcentrationMeasurement(Comman make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRadonConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22649,7 +22649,7 @@ void registerClusterRadonConcentrationMeasurement(Commands & commands, Credentia make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22704,7 +22704,7 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterChannel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22773,7 +22773,7 @@ void registerClusterChannel(Commands & commands, CredentialIssuerCommands * cred make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22834,7 +22834,7 @@ void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommand make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22927,7 +22927,7 @@ void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -22991,7 +22991,7 @@ void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * c make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -23043,7 +23043,7 @@ void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * cre make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -23095,7 +23095,7 @@ void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands * make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -23159,7 +23159,7 @@ void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommand make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -23221,7 +23221,7 @@ void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands * make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -23284,7 +23284,7 @@ void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCom make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterApplicationBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -23367,7 +23367,7 @@ void registerClusterApplicationBasic(Commands & commands, CredentialIssuerComman make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -23421,7 +23421,7 @@ void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands * make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterElectricalMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -24117,7 +24117,7 @@ void registerClusterElectricalMeasurement(Commands & commands, CredentialIssuerC make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterUnitTesting(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -24562,7 +24562,7 @@ void registerClusterUnitTesting(Commands & commands, CredentialIssuerCommands * make_unique(Id, "test-fabric-scoped-event", Events::TestFabricScopedEvent::Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFaultInjection(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { @@ -24615,7 +24615,7 @@ void registerClusterFaultInjection(Commands & commands, CredentialIssuerCommands make_unique(Id, credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAny(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) @@ -24633,7 +24633,8 @@ void registerClusterAny(Commands & commands, CredentialIssuerCommands * credsIss make_unique(credsIssuerConfig), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, + "Commands for sending IM messages based on cluster id, not cluster name."); } void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index c9aeac70f7797e..cf357feadac2c1 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -139164,5 +139164,5 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds #endif // CONFIG_ENABLE_YAML_TESTS }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for running YAML tests."); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 71dcb80bf18e38..db186770fca25d 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -97730,7 +97730,7 @@ void registerClusterIdentify(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGroups(Commands & commands) { @@ -97763,7 +97763,7 @@ void registerClusterGroups(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterScenes(Commands & commands) { @@ -97810,7 +97810,7 @@ void registerClusterScenes(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOnOff(Commands & commands) { @@ -97854,7 +97854,7 @@ void registerClusterOnOff(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOnOffSwitchConfiguration(Commands & commands) { @@ -97884,7 +97884,7 @@ void registerClusterOnOffSwitchConfiguration(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLevelControl(Commands & commands) { @@ -97953,7 +97953,7 @@ void registerClusterLevelControl(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBinaryInputBasic(Commands & commands) { @@ -98002,7 +98002,7 @@ void registerClusterBinaryInputBasic(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDescriptor(Commands & commands) { @@ -98035,7 +98035,7 @@ void registerClusterDescriptor(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBinding(Commands & commands) { @@ -98063,7 +98063,7 @@ void registerClusterBinding(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAccessControl(Commands & commands) { @@ -98102,7 +98102,7 @@ void registerClusterAccessControl(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterActions(Commands & commands) { @@ -98147,7 +98147,7 @@ void registerClusterActions(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBasicInformation(Commands & commands) { @@ -98219,7 +98219,7 @@ void registerClusterBasicInformation(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOtaSoftwareUpdateProvider(Commands & commands) { @@ -98247,7 +98247,7 @@ void registerClusterOtaSoftwareUpdateProvider(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOtaSoftwareUpdateRequestor(Commands & commands) { @@ -98284,7 +98284,7 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLocalizationConfiguration(Commands & commands) { @@ -98314,7 +98314,7 @@ void registerClusterLocalizationConfiguration(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTimeFormatLocalization(Commands & commands) { @@ -98347,7 +98347,7 @@ void registerClusterTimeFormatLocalization(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterUnitLocalization(Commands & commands) { @@ -98375,7 +98375,7 @@ void registerClusterUnitLocalization(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPowerSourceConfiguration(Commands & commands) { @@ -98402,7 +98402,7 @@ void registerClusterPowerSourceConfiguration(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPowerSource(Commands & commands) { @@ -98491,7 +98491,7 @@ void registerClusterPowerSource(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGeneralCommissioning(Commands & commands) { @@ -98530,7 +98530,7 @@ void registerClusterGeneralCommissioning(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterNetworkCommissioning(Commands & commands) { @@ -98578,7 +98578,7 @@ void registerClusterNetworkCommissioning(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDiagnosticLogs(Commands & commands) { @@ -98604,7 +98604,7 @@ void registerClusterDiagnosticLogs(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGeneralDiagnostics(Commands & commands) { @@ -98650,7 +98650,7 @@ void registerClusterGeneralDiagnostics(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSoftwareDiagnostics(Commands & commands) { @@ -98686,7 +98686,7 @@ void registerClusterSoftwareDiagnostics(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterThreadNetworkDiagnostics(Commands & commands) { @@ -98840,7 +98840,7 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterWiFiNetworkDiagnostics(Commands & commands) { @@ -98894,7 +98894,7 @@ void registerClusterWiFiNetworkDiagnostics(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterEthernetNetworkDiagnostics(Commands & commands) { @@ -98938,7 +98938,7 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBridgedDeviceBasicInformation(Commands & commands) { @@ -98998,7 +98998,7 @@ void registerClusterBridgedDeviceBasicInformation(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterSwitch(Commands & commands) { @@ -99031,7 +99031,7 @@ void registerClusterSwitch(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAdministratorCommissioning(Commands & commands) { @@ -99065,7 +99065,7 @@ void registerClusterAdministratorCommissioning(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOperationalCredentials(Commands & commands) { @@ -99110,7 +99110,7 @@ void registerClusterOperationalCredentials(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterGroupKeyManagement(Commands & commands) { @@ -99148,7 +99148,7 @@ void registerClusterGroupKeyManagement(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFixedLabel(Commands & commands) { @@ -99175,7 +99175,7 @@ void registerClusterFixedLabel(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterUserLabel(Commands & commands) { @@ -99203,7 +99203,7 @@ void registerClusterUserLabel(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBooleanState(Commands & commands) { @@ -99232,7 +99232,7 @@ void registerClusterBooleanState(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterModeSelect(Commands & commands) { @@ -99272,7 +99272,7 @@ void registerClusterModeSelect(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterDoorLock(Commands & commands) { @@ -99407,7 +99407,7 @@ void registerClusterDoorLock(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterWindowCovering(Commands & commands) { @@ -99484,7 +99484,7 @@ void registerClusterWindowCovering(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBarrierControl(Commands & commands) { @@ -99537,7 +99537,7 @@ void registerClusterBarrierControl(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPumpConfigurationAndControl(Commands & commands) { @@ -99614,7 +99614,7 @@ void registerClusterPumpConfigurationAndControl(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterThermostat(Commands & commands) { @@ -99768,7 +99768,7 @@ void registerClusterThermostat(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFanControl(Commands & commands) { @@ -99821,7 +99821,7 @@ void registerClusterFanControl(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterThermostatUserInterfaceConfiguration(Commands & commands) { @@ -99855,7 +99855,7 @@ void registerClusterThermostatUserInterfaceConfiguration(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterColorControl(Commands & commands) { @@ -100016,7 +100016,7 @@ void registerClusterColorControl(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterBallastConfiguration(Commands & commands) { @@ -100079,7 +100079,7 @@ void registerClusterBallastConfiguration(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterIlluminanceMeasurement(Commands & commands) { @@ -100114,7 +100114,7 @@ void registerClusterIlluminanceMeasurement(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTemperatureMeasurement(Commands & commands) { @@ -100147,7 +100147,7 @@ void registerClusterTemperatureMeasurement(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterPressureMeasurement(Commands & commands) { @@ -100190,7 +100190,7 @@ void registerClusterPressureMeasurement(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterFlowMeasurement(Commands & commands) { @@ -100223,7 +100223,7 @@ void registerClusterFlowMeasurement(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterRelativeHumidityMeasurement(Commands & commands) { @@ -100256,7 +100256,7 @@ void registerClusterRelativeHumidityMeasurement(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterOccupancySensing(Commands & commands) { @@ -100314,7 +100314,7 @@ void registerClusterOccupancySensing(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterWakeOnLan(Commands & commands) { @@ -100341,7 +100341,7 @@ void registerClusterWakeOnLan(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterChannel(Commands & commands) { @@ -100375,7 +100375,7 @@ void registerClusterChannel(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterTargetNavigator(Commands & commands) { @@ -100405,7 +100405,7 @@ void registerClusterTargetNavigator(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterMediaPlayback(Commands & commands) { @@ -100455,7 +100455,7 @@ void registerClusterMediaPlayback(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterMediaInput(Commands & commands) { @@ -100488,7 +100488,7 @@ void registerClusterMediaInput(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterLowPower(Commands & commands) { @@ -100514,7 +100514,7 @@ void registerClusterLowPower(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterKeypadInput(Commands & commands) { @@ -100540,7 +100540,7 @@ void registerClusterKeypadInput(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterContentLauncher(Commands & commands) { @@ -100572,7 +100572,7 @@ void registerClusterContentLauncher(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAudioOutput(Commands & commands) { @@ -100603,7 +100603,7 @@ void registerClusterAudioOutput(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterApplicationLauncher(Commands & commands) { @@ -100636,7 +100636,7 @@ void registerClusterApplicationLauncher(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterApplicationBasic(Commands & commands) { @@ -100677,7 +100677,7 @@ void registerClusterApplicationBasic(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAccountLogin(Commands & commands) { @@ -100705,7 +100705,7 @@ void registerClusterAccountLogin(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterElectricalMeasurement(Commands & commands) { @@ -100996,7 +100996,7 @@ void registerClusterElectricalMeasurement(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterUnitTesting(Commands & commands) { @@ -101291,7 +101291,7 @@ void registerClusterUnitTesting(Commands & commands) make_unique(Id), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCluster(clusterName, clusterCommands); } void registerClusterAny(Commands & commands) @@ -101308,7 +101308,8 @@ void registerClusterAny(Commands & commands) make_unique(), // }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet( + clusterName, clusterCommands, "Commands for sending IM messages based on cluster id, not cluster name."); } void registerClusters(Commands & commands) diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 0eefdf94fa9f36..7e47aa29ac6c57 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -150004,5 +150004,5 @@ void registerCommandsTests(Commands & commands) #endif // CONFIG_ENABLE_YAML_TESTS }; - commands.Register(clusterName, clusterCommands); + commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for running YAML tests."); }