Convert ApplicationBasicStatus to an enum class. (#12500)

project-chip · Apr 7, 2022 · 9099989 · 9099989
1 parent fc8627f
commit 9099989
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 41 deletions.
diff --git a/examples/tv-app/android/include/application-basic/Application.h b/examples/tv-app/android/include/application-basic/Application.h
@@ -18,15 +18,16 @@
 
 #pragma once
 
-#include <app-common/zap-generated/enums.h>
+#include <app-common/zap-generated/cluster-objects.h>
 
 struct Application
 {
-    char vendorName[32]                  = "";
-    char name[32]                        = "";
-    char id[32]                          = "";
-    uint16_t vendorId                    = 0;
-    uint16_t productId                   = 0;
-    uint16_t catalogVendorId             = 0;
-    EmberAfApplicationBasicStatus status = EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED;
+    using ApplicationBasicStatus  = chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus;
+    char vendorName[32]           = "";
+    char name[32]                 = "";
+    char id[32]                   = "";
+    uint16_t vendorId             = 0;
+    uint16_t productId            = 0;
+    uint16_t catalogVendorId      = 0;
+    ApplicationBasicStatus status = ApplicationBasicStatus::kStopped;
 };
diff --git a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp
@@ -20,11 +20,12 @@
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/cluster-id.h>
+#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/command-id.h>
-#include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
 #include <app/util/af.h>
 #include <app/util/basic-types.h>
+#include <lib/support/TypeTraits.h>
 #include <lib/support/ZclString.h>
 
 #include <inipp/inipp.h>
@@ -153,9 +154,10 @@ Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId
     return app;
 }
 
-bool applicationBasicClusterChangeApplicationStatus(EmberAfApplicationBasicStatus status, chip::EndpointId endpoint)
+bool applicationBasicClusterChangeApplicationStatus(app::Clusters::ApplicationBasic::ApplicationBasicStatus status,
+                                                    chip::EndpointId endpoint)
 {
     // TODO: Insert code here
-    ChipLogProgress(Zcl, "Sent an application status change request %d for endpoint %d", status, endpoint);
+    ChipLogProgress(Zcl, "Sent an application status change request %d for endpoint %d", to_underlying(status), endpoint);
     return true;
 }
diff --git a/examples/tv-app/linux/include/application-basic/Application.h b/examples/tv-app/linux/include/application-basic/Application.h
@@ -18,15 +18,17 @@
 
 #pragma once
 
-#include <app-common/zap-generated/enums.h>
+#include <app-common/zap-generated/cluster-objects.h>
 
 struct Application
 {
-    char vendorName[32]                  = "";
-    char name[32]                        = "";
-    char id[32]                          = "";
-    uint16_t vendorId                    = 0;
-    uint16_t productId                   = 0;
-    uint16_t catalogVendorId             = 0;
-    EmberAfApplicationBasicStatus status = EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED;
+    using ApplicationBasicStatus = chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus;
+
+    char vendorName[32]           = "";
+    char name[32]                 = "";
+    char id[32]                   = "";
+    uint16_t vendorId             = 0;
+    uint16_t productId            = 0;
+    uint16_t catalogVendorId      = 0;
+    ApplicationBasicStatus status = ApplicationBasicStatus::kStopped;
 };
diff --git a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp
@@ -20,11 +20,12 @@
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/cluster-id.h>
+#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/command-id.h>
-#include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
 #include <app/util/af.h>
 #include <app/util/basic-types.h>
+#include <lib/support/TypeTraits.h>
 #include <lib/support/ZclString.h>
 
 #include <inipp/inipp.h>
@@ -153,9 +154,10 @@ Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId
     return app;
 }
 
-bool applicationBasicClusterChangeApplicationStatus(EmberAfApplicationBasicStatus status, chip::EndpointId endpoint)
+bool applicationBasicClusterChangeApplicationStatus(app::Clusters::ApplicationBasic::ApplicationBasicStatus status,
+                                                    chip::EndpointId endpoint)
 {
     // TODO: Insert code here
-    ChipLogProgress(Zcl, "Sent an application status change request %d for endpoint %d", status, endpoint);
+    ChipLogProgress(Zcl, "Sent an application status change request %d for endpoint %d", to_underlying(status), endpoint);
     return true;
 }
diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp
@@ -32,16 +32,15 @@
 using namespace chip;
 using namespace chip::app::Clusters::ApplicationBasic;
 
-bool applicationBasicClusterChangeApplicationStatus(EmberAfApplicationBasicStatus status, EndpointId endpoint);
+bool applicationBasicClusterChangeApplicationStatus(ApplicationBasicStatus status, EndpointId endpoint);
 
 bool emberAfApplicationBasicClusterChangeStatusCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath,
                                                         const Commands::ChangeStatus::DecodableType & commandData)
 {
     auto & newApplicationStatus = commandData.status;
 
-    bool success = applicationBasicClusterChangeApplicationStatus(static_cast<EmberAfApplicationBasicStatus>(newApplicationStatus),
-                                                                  emberAfCurrentEndpoint());
+    bool success         = applicationBasicClusterChangeApplicationStatus(newApplicationStatus, emberAfCurrentEndpoint());
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
     emberAfSendImmediateDefaultResponse(status);
     return true;

diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js
@@ -529,7 +529,6 @@ async function getResponseCommandName(responseRef, options)
 function isWeaklyTypedEnum(label)
 {
   return [
-    "ApplicationBasicStatus",
     "ApplicationLauncherStatus",
     "AttributeWritePermission",
     "AudioOutputType",

diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h