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.
diff --git a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h
index 1a95949..cc0daaf 100644
--- a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h
+++ b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h
@@ -104,5 +104,5 @@
make_unique<ShutdownAllSubscriptions>(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 eef7d8c..c2f49c2 100644
--- a/examples/chip-tool/commands/common/Commands.cpp
+++ b/examples/chip-tool/commands/common/Commands.cpp
@@ -119,12 +119,14 @@
} // 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 @@
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 @@
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 @@
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 @@
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)
{
- 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");
+ fprintf(stderr, "\n");
+
+ // Table of command sets
+ fprintf(stderr, " +-------------------------------------------------------------------------------------+\n");
+ fprintf(stderr, " | Command sets: |\n");
+ fprintf(stderr, " +-------------------------------------------------------------------------------------+\n");
+ for (auto & commandSet : mCommandSets)
+ {
+ 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 @@
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 f9ba9f7..67c23b4 100644
--- a/examples/chip-tool/commands/common/Commands.h
+++ b/examples/chip-tool/commands/common/Commands.h
@@ -30,25 +30,44 @@
public:
using CommandsVector = ::std::vector<std::unique_ptr<Command>>;
- 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<char *> & storageDirectory = chip::NullOptional);
private:
- using ClusterMap = std::map<std::string, std::pair<CommandsVector, const char *>>;
+ 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<std::string, CommandSet>;
CHIP_ERROR RunCommand(int argc, char ** argv, bool interactive = false,
const chip::Optional<char *> & 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 @@
// 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 f14b4bd..4d2dd29 100644
--- a/examples/chip-tool/commands/delay/Commands.h
+++ b/examples/chip-tool/commands/delay/Commands.h
@@ -30,5 +30,5 @@
make_unique<WaitForCommissioneeCommand>(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 830a738..482d996 100644
--- a/examples/chip-tool/commands/delay/WaitForCommissioneeCommand.h
+++ b/examples/chip-tool/commands/delay/WaitForCommissioneeCommand.h
@@ -26,8 +26,8 @@
{
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 e2a2209..1b3f45a 100644
--- a/examples/chip-tool/commands/discover/Commands.h
+++ b/examples/chip-tool/commands/discover/Commands.h
@@ -85,5 +85,5 @@
make_unique<DiscoverCommissionersCommand>(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 b66d62d..b29ff95 100644
--- a/examples/chip-tool/commands/group/Commands.h
+++ b/examples/chip-tool/commands/group/Commands.h
@@ -358,5 +358,6 @@
make_unique<RemoveKeySet>(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 747c8ae..188f3c0 100644
--- a/examples/chip-tool/commands/interactive/Commands.h
+++ b/examples/chip-tool/commands/interactive/Commands.h
@@ -33,5 +33,5 @@
#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 0b4ead9..85cc53c 100644
--- a/examples/chip-tool/commands/interactive/InteractiveCommands.h
+++ b/examples/chip-tool/commands/interactive/InteractiveCommands.h
@@ -29,8 +29,10 @@
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 @@
{
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 @@
{
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 6d02253..388dc47 100644
--- a/examples/chip-tool/commands/pairing/Commands.h
+++ b/examples/chip-tool/commands/pairing/Commands.h
@@ -255,5 +255,5 @@
make_unique<IssueNOCChainCommand>(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 0cc5cae..7f10e83 100644
--- a/examples/chip-tool/commands/payload/Commands.h
+++ b/examples/chip-tool/commands/payload/Commands.h
@@ -36,5 +36,5 @@
make_unique<SetupPayloadVerhoeffGenerate>(), //
};
- 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 7c75be2..97223a6 100644
--- a/examples/chip-tool/commands/session-management/Commands.h
+++ b/examples/chip-tool/commands/session-management/Commands.h
@@ -30,5 +30,5 @@
make_unique<EvictLocalCASESessionsCommand>(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 c53b324..7e2ca06 100644
--- a/examples/chip-tool/commands/storage/Commands.h
+++ b/examples/chip-tool/commands/storage/Commands.h
@@ -27,5 +27,5 @@
commands_list clusterCommands = { make_unique<StorageClearAll>() };
- 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 8f47277..60d3278 100644
--- a/examples/chip-tool/templates/commands.zapt
+++ b/examples/chip-tool/templates/commands.zapt
@@ -117,7 +117,7 @@
{{/zcl_events}}
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
{{/zcl_clusters}}
@@ -136,7 +136,7 @@
make_unique<SubscribeAll>(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 060539a..34e80dd 100644
--- a/examples/chip-tool/templates/tests/commands.zapt
+++ b/examples/chip-tool/templates/tests/commands.zapt
@@ -58,5 +58,5 @@
#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 d1d54ea..b20b93e 100644
--- a/examples/darwin-framework-tool/commands/discover/Commands.h
+++ b/examples/darwin-framework-tool/commands/discover/Commands.h
@@ -32,5 +32,5 @@
make_unique<DiscoverCommissionablesListCommand>(),
};
- 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 722feb8..fdc92f4 100644
--- a/examples/darwin-framework-tool/commands/interactive/Commands.h
+++ b/examples/darwin-framework-tool/commands/interactive/Commands.h
@@ -35,5 +35,5 @@
#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 f155248..bc1bccd 100644
--- a/examples/darwin-framework-tool/commands/pairing/Commands.h
+++ b/examples/darwin-framework-tool/commands/pairing/Commands.h
@@ -102,5 +102,5 @@
make_unique<GetCommissionerNodeIdCommand>(),
};
- 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 67615bc..3e0015f 100644
--- a/examples/darwin-framework-tool/commands/payload/Commands.h
+++ b/examples/darwin-framework-tool/commands/payload/Commands.h
@@ -27,5 +27,5 @@
make_unique<SetupPayloadParseCommand>(), //
};
- 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 15f2750..0083ade 100644
--- a/examples/darwin-framework-tool/commands/provider/Commands.h
+++ b/examples/darwin-framework-tool/commands/provider/Commands.h
@@ -10,5 +10,5 @@
make_unique<OTASoftwareUpdateSetParams>(), //
};
- 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 c53b324..6553427 100644
--- a/examples/darwin-framework-tool/commands/storage/Commands.h
+++ b/examples/darwin-framework-tool/commands/storage/Commands.h
@@ -27,5 +27,6 @@
commands_list clusterCommands = { make_unique<StorageClearAll>() };
- 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 ae0c239..f549b3b 100644
--- a/examples/darwin-framework-tool/templates/commands.zapt
+++ b/examples/darwin-framework-tool/templates/commands.zapt
@@ -304,7 +304,7 @@
{{/zcl_events}}
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
{{/if}}
{{/zcl_clusters}}
@@ -323,7 +323,7 @@
make_unique<SubscribeEvent>(), //
};
- 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 ce44db1..526e33f 100644
--- a/examples/darwin-framework-tool/templates/tests/commands.zapt
+++ b/examples/darwin-framework-tool/templates/tests/commands.zapt
@@ -59,5 +59,5 @@
#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 4431215..0935bdb 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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterGroups(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11229,7 +11229,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterScenes(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11323,7 +11323,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11400,7 +11400,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11459,7 +11459,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11578,7 +11578,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11665,7 +11665,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11716,7 +11716,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11784,7 +11784,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBinding(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11840,7 +11840,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -11929,7 +11929,7 @@
credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12010,7 +12010,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12284,7 +12284,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12410,7 +12410,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterUnitLocalization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12465,7 +12465,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12520,7 +12520,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12725,7 +12725,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12900,7 +12900,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -12952,7 +12952,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -13055,7 +13055,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -13806,7 +13806,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOperationalCredentials(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14162,7 +14162,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14236,7 +14236,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14292,7 +14292,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14348,7 +14348,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14399,7 +14399,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14450,7 +14450,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14501,7 +14501,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14558,7 +14558,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14718,7 +14718,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14787,7 +14787,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & commands,
CredentialIssuerCommands * credsIssuerConfig)
@@ -14857,7 +14857,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLaundryWasherControls(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14926,7 +14926,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -14995,7 +14995,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15064,7 +15064,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTemperatureControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15146,7 +15146,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15211,7 +15211,7 @@
make_unique<SubscribeEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15280,7 +15280,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAirQuality(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15335,7 +15335,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15468,7 +15468,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, "notify", Events::Notify::Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOperationalState(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15625,7 +15625,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15861,7 +15861,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterCeramicFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -15936,7 +15936,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterElectrostaticFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16011,7 +16011,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterUvFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16086,7 +16086,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterIonizingFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16161,7 +16161,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterZeoliteFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16236,7 +16236,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOzoneFilterMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16311,7 +16311,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterWaterTankMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16386,7 +16386,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFuelTankMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16461,7 +16461,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterInkCartridgeMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16536,7 +16536,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTonerCartridgeMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16611,7 +16611,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -16875,7 +16875,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBarrierControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -17160,7 +17160,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -17353,7 +17353,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -17762,7 +17762,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -17829,7 +17829,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18136,7 +18136,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18249,7 +18249,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterIlluminanceMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18325,7 +18325,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18395,7 +18395,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPressureMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18488,7 +18488,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFlowMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18558,7 +18558,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18628,7 +18628,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOccupancySensing(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18758,7 +18758,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterCarbonMonoxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18866,7 +18866,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterCarbonDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -18974,7 +18974,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterEthyleneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19082,7 +19082,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterEthyleneOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19190,7 +19190,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterHydrogenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19298,7 +19298,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterHydrogenSulfideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19406,7 +19406,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterNitricOxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19514,7 +19514,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterNitrogenDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19622,7 +19622,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19730,7 +19730,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOzoneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19838,7 +19838,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterSulfurDioxideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -19946,7 +19946,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDissolvedOxygenConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20054,7 +20054,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBromateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20162,7 +20162,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterChloraminesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20270,7 +20270,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterChlorineConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20378,7 +20378,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFecalColiformEColiConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20486,7 +20486,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFluorideConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20594,7 +20594,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterHaloaceticAcidsConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20702,7 +20702,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTotalTrihalomethanesConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20810,7 +20810,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTotalColiformBacteriaConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -20918,7 +20918,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTurbidityConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21026,7 +21026,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterCopperConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21134,7 +21134,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLeadConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21242,7 +21242,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterManganeseConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21350,7 +21350,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterSulfateConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21458,7 +21458,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBromodichloromethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21566,7 +21566,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBromoformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21674,7 +21674,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterChlorodibromomethaneConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21782,7 +21782,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterChloroformConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21890,7 +21890,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterSodiumConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -21998,7 +21998,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPm25ConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22106,7 +22106,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFormaldehydeConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22214,7 +22214,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPm1ConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22322,7 +22322,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPm10ConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22430,7 +22430,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTotalVolatileOrganicCompoundsConcentrationMeasurement(Commands & commands,
CredentialIssuerCommands * credsIssuerConfig)
@@ -22541,7 +22541,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterRadonConcentrationMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22649,7 +22649,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22704,7 +22704,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterChannel(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22773,7 +22773,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22834,7 +22834,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22927,7 +22927,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -22991,7 +22991,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -23043,7 +23043,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -23095,7 +23095,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -23159,7 +23159,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -23221,7 +23221,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -23284,7 +23284,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterApplicationBasic(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -23367,7 +23367,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -23421,7 +23421,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterElectricalMeasurement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -24117,7 +24117,7 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterUnitTesting(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
@@ -24562,7 +24562,7 @@
make_unique<SubscribeEvent>(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 @@
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAny(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
@@ -24633,7 +24633,8 @@
make_unique<SubscribeAll>(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 c9aeac7..cf357fe 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 @@
#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 71dcb80..db18677 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 @@
make_unique<SubscribeAttributeIdentifyClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterGroups(Commands & commands)
{
@@ -97763,7 +97763,7 @@
make_unique<SubscribeAttributeGroupsClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterScenes(Commands & commands)
{
@@ -97810,7 +97810,7 @@
make_unique<SubscribeAttributeScenesClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOnOff(Commands & commands)
{
@@ -97854,7 +97854,7 @@
make_unique<SubscribeAttributeOnOffClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOnOffSwitchConfiguration(Commands & commands)
{
@@ -97884,7 +97884,7 @@
make_unique<SubscribeAttributeOnOffSwitchConfigurationClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLevelControl(Commands & commands)
{
@@ -97953,7 +97953,7 @@
make_unique<SubscribeAttributeLevelControlClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBinaryInputBasic(Commands & commands)
{
@@ -98002,7 +98002,7 @@
make_unique<SubscribeAttributeBinaryInputBasicClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDescriptor(Commands & commands)
{
@@ -98035,7 +98035,7 @@
make_unique<SubscribeAttributeDescriptorClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBinding(Commands & commands)
{
@@ -98063,7 +98063,7 @@
make_unique<SubscribeAttributeBindingClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAccessControl(Commands & commands)
{
@@ -98102,7 +98102,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterActions(Commands & commands)
{
@@ -98147,7 +98147,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBasicInformation(Commands & commands)
{
@@ -98219,7 +98219,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOtaSoftwareUpdateProvider(Commands & commands)
{
@@ -98247,7 +98247,7 @@
make_unique<SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOtaSoftwareUpdateRequestor(Commands & commands)
{
@@ -98284,7 +98284,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLocalizationConfiguration(Commands & commands)
{
@@ -98314,7 +98314,7 @@
make_unique<SubscribeAttributeLocalizationConfigurationClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTimeFormatLocalization(Commands & commands)
{
@@ -98347,7 +98347,7 @@
make_unique<SubscribeAttributeTimeFormatLocalizationClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterUnitLocalization(Commands & commands)
{
@@ -98375,7 +98375,7 @@
make_unique<SubscribeAttributeUnitLocalizationClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPowerSourceConfiguration(Commands & commands)
{
@@ -98402,7 +98402,7 @@
make_unique<SubscribeAttributePowerSourceConfigurationClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPowerSource(Commands & commands)
{
@@ -98491,7 +98491,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterGeneralCommissioning(Commands & commands)
{
@@ -98530,7 +98530,7 @@
make_unique<SubscribeAttributeGeneralCommissioningClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterNetworkCommissioning(Commands & commands)
{
@@ -98578,7 +98578,7 @@
make_unique<SubscribeAttributeNetworkCommissioningClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDiagnosticLogs(Commands & commands)
{
@@ -98604,7 +98604,7 @@
make_unique<SubscribeAttributeDiagnosticLogsClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterGeneralDiagnostics(Commands & commands)
{
@@ -98650,7 +98650,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterSoftwareDiagnostics(Commands & commands)
{
@@ -98686,7 +98686,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterThreadNetworkDiagnostics(Commands & commands)
{
@@ -98840,7 +98840,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterWiFiNetworkDiagnostics(Commands & commands)
{
@@ -98894,7 +98894,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterEthernetNetworkDiagnostics(Commands & commands)
{
@@ -98938,7 +98938,7 @@
make_unique<SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBridgedDeviceBasicInformation(Commands & commands)
{
@@ -98998,7 +98998,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterSwitch(Commands & commands)
{
@@ -99031,7 +99031,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAdministratorCommissioning(Commands & commands)
{
@@ -99065,7 +99065,7 @@
make_unique<SubscribeAttributeAdministratorCommissioningClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOperationalCredentials(Commands & commands)
{
@@ -99110,7 +99110,7 @@
make_unique<SubscribeAttributeOperationalCredentialsClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterGroupKeyManagement(Commands & commands)
{
@@ -99148,7 +99148,7 @@
make_unique<SubscribeAttributeGroupKeyManagementClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFixedLabel(Commands & commands)
{
@@ -99175,7 +99175,7 @@
make_unique<SubscribeAttributeFixedLabelClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterUserLabel(Commands & commands)
{
@@ -99203,7 +99203,7 @@
make_unique<SubscribeAttributeUserLabelClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBooleanState(Commands & commands)
{
@@ -99232,7 +99232,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterModeSelect(Commands & commands)
{
@@ -99272,7 +99272,7 @@
make_unique<SubscribeAttributeModeSelectClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterDoorLock(Commands & commands)
{
@@ -99407,7 +99407,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterWindowCovering(Commands & commands)
{
@@ -99484,7 +99484,7 @@
make_unique<SubscribeAttributeWindowCoveringClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBarrierControl(Commands & commands)
{
@@ -99537,7 +99537,7 @@
make_unique<SubscribeAttributeBarrierControlClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPumpConfigurationAndControl(Commands & commands)
{
@@ -99614,7 +99614,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterThermostat(Commands & commands)
{
@@ -99768,7 +99768,7 @@
make_unique<SubscribeAttributeThermostatClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFanControl(Commands & commands)
{
@@ -99821,7 +99821,7 @@
make_unique<SubscribeAttributeFanControlClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterThermostatUserInterfaceConfiguration(Commands & commands)
{
@@ -99855,7 +99855,7 @@
make_unique<SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterColorControl(Commands & commands)
{
@@ -100016,7 +100016,7 @@
make_unique<SubscribeAttributeColorControlClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterBallastConfiguration(Commands & commands)
{
@@ -100079,7 +100079,7 @@
make_unique<SubscribeAttributeBallastConfigurationClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterIlluminanceMeasurement(Commands & commands)
{
@@ -100114,7 +100114,7 @@
make_unique<SubscribeAttributeIlluminanceMeasurementClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTemperatureMeasurement(Commands & commands)
{
@@ -100147,7 +100147,7 @@
make_unique<SubscribeAttributeTemperatureMeasurementClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterPressureMeasurement(Commands & commands)
{
@@ -100190,7 +100190,7 @@
make_unique<SubscribeAttributePressureMeasurementClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterFlowMeasurement(Commands & commands)
{
@@ -100223,7 +100223,7 @@
make_unique<SubscribeAttributeFlowMeasurementClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterRelativeHumidityMeasurement(Commands & commands)
{
@@ -100256,7 +100256,7 @@
make_unique<SubscribeAttributeRelativeHumidityMeasurementClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterOccupancySensing(Commands & commands)
{
@@ -100314,7 +100314,7 @@
make_unique<SubscribeAttributeOccupancySensingClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterWakeOnLan(Commands & commands)
{
@@ -100341,7 +100341,7 @@
make_unique<SubscribeAttributeWakeOnLanClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterChannel(Commands & commands)
{
@@ -100375,7 +100375,7 @@
make_unique<SubscribeAttributeChannelClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterTargetNavigator(Commands & commands)
{
@@ -100405,7 +100405,7 @@
make_unique<SubscribeAttributeTargetNavigatorClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterMediaPlayback(Commands & commands)
{
@@ -100455,7 +100455,7 @@
make_unique<SubscribeAttributeMediaPlaybackClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterMediaInput(Commands & commands)
{
@@ -100488,7 +100488,7 @@
make_unique<SubscribeAttributeMediaInputClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterLowPower(Commands & commands)
{
@@ -100514,7 +100514,7 @@
make_unique<SubscribeAttributeLowPowerClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterKeypadInput(Commands & commands)
{
@@ -100540,7 +100540,7 @@
make_unique<SubscribeAttributeKeypadInputClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterContentLauncher(Commands & commands)
{
@@ -100572,7 +100572,7 @@
make_unique<SubscribeAttributeContentLauncherClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAudioOutput(Commands & commands)
{
@@ -100603,7 +100603,7 @@
make_unique<SubscribeAttributeAudioOutputClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterApplicationLauncher(Commands & commands)
{
@@ -100636,7 +100636,7 @@
make_unique<SubscribeAttributeApplicationLauncherClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterApplicationBasic(Commands & commands)
{
@@ -100677,7 +100677,7 @@
make_unique<SubscribeAttributeApplicationBasicClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAccountLogin(Commands & commands)
{
@@ -100705,7 +100705,7 @@
make_unique<SubscribeAttributeAccountLoginClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterElectricalMeasurement(Commands & commands)
{
@@ -100996,7 +100996,7 @@
make_unique<SubscribeAttributeElectricalMeasurementClusterRevision>(), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterUnitTesting(Commands & commands)
{
@@ -101291,7 +101291,7 @@
make_unique<SubscribeEvent>(Id), //
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCluster(clusterName, clusterCommands);
}
void registerClusterAny(Commands & commands)
@@ -101308,7 +101308,8 @@
make_unique<SubscribeEvent>(), //
};
- 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 0eefdf9..7e47aa2 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 @@
#endif // CONFIG_ENABLE_YAML_TESTS
};
- commands.Register(clusterName, clusterCommands);
+ commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for running YAML tests.");
}
