Update chip-tool commands to use subscribe instead of report (#14231)

project-chip · Dec 15, 2023 · 1109068 · 1109068
1 parent b4035f7
commit 1109068
Show file tree

Hide file tree

Showing 3 changed files with 675 additions and 675 deletions.
diff --git a/examples/chip-tool/commands/common/Commands.cpp b/examples/chip-tool/commands/common/Commands.cpp
@@ -177,12 +177,12 @@ Command * Commands::GetGlobalCommand(CommandsVector & commands, std::string comm
 
 bool Commands::IsAttributeCommand(std::string commandName) const
 {
-    return commandName.compare("read") == 0 || commandName.compare("write") == 0 || commandName.compare("report") == 0;
+    return commandName.compare("read") == 0 || commandName.compare("write") == 0 || commandName.compare("subscribe") == 0;
 }
 
 bool Commands::IsEventCommand(std::string commandName) const
 {
-    return commandName.compare("read-event") == 0 || commandName.compare("report-event") == 0;
+    return commandName.compare("read-event") == 0 || commandName.compare("subscribe-event") == 0;
 }
 
 bool Commands::IsGlobalCommand(std::string commandName) const
@@ -216,11 +216,11 @@ void Commands::ShowCluster(std::string executable, std::string clusterName, Comm
     fprintf(stderr, "  +-------------------------------------------------------------------------------------+\n");
     fprintf(stderr, "  | Commands:                                                                           |\n");
     fprintf(stderr, "  +-------------------------------------------------------------------------------------+\n");
-    bool readCommand        = false;
-    bool writeCommand       = false;
-    bool reportCommand      = false;
-    bool readEventCommand   = false;
-    bool reportEventCommand = false;
+    bool readCommand           = false;
+    bool writeCommand          = false;
+    bool subscribeCommand      = false;
+    bool readEventCommand      = false;
+    bool subscribeEventCommand = false;
     for (auto & command : commands)
     {
         bool shouldPrint = true;
@@ -235,17 +235,17 @@ void Commands::ShowCluster(std::string executable, std::string clusterName, Comm
             {
                 writeCommand = true;
             }
-            else if (strcmp(command->GetName(), "report") == 0 && reportCommand == false)
+            else if (strcmp(command->GetName(), "subscribe") == 0 && subscribeCommand == false)
             {
-                reportCommand = true;
+                subscribeCommand = true;
             }
             else if (strcmp(command->GetName(), "read-event") == 0 && readEventCommand == false)
             {
                 readEventCommand = true;
             }
-            else if (strcmp(command->GetName(), "report-event") == 0 && reportEventCommand == false)
+            else if (strcmp(command->GetName(), "subscribe-event") == 0 && subscribeEventCommand == false)
             {
-                reportEventCommand = true;
+                subscribeEventCommand = true;
             }
             else
             {

diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt
@@ -335,7 +335,7 @@ public:
 class Report{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}: public ModelCommand
 {
 public:
-    Report{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}(): ModelCommand("report-event")
+    Report{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}(): ModelCommand("subscribe-event")
     {
         AddArgument("event-name", "{{asDelimitedCommand (asUpperCamelCase name)}}");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -462,7 +462,7 @@ private:
 class Report{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}: public ModelCommand
 {
 public:
-    Report{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}(): ModelCommand("report")
+    Report{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}(): ModelCommand("subscribe")
     {
         AddArgument("attr-name", "{{asDelimitedCommand (asUpperCamelCase name)}}");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);