Media clusters & TV app minor attributes update (#14808)

* Update attributes in xml and in code * Update code * Run zap regen code * Restyle fix * Fix tv android app
project-chip · Feb 7, 2022 · d5d9dc7 · d5d9dc7
1 parent 4d36551
commit d5d9dc7
Show file tree

Hide file tree

Showing 38 changed files with 259 additions and 262 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -141,7 +141,7 @@ server cluster ApplicationLauncher = 1292 {
     kLineupInfo = 0x2;
   }
 
-  struct ApplicationLauncherApplication {
+  struct Application {
     INT16U catalogVendorId = 0;
     CHAR_STRING applicationId = 1;
   }
@@ -2815,8 +2815,8 @@ server cluster Switch = 59 {
 server cluster TargetNavigator = 1285 {
   enum StatusEnum : ENUM8 {
     kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
   struct TargetInfo {

diff --git a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp
@@ -21,6 +21,7 @@
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters::ApplicationLauncher;
+using namespace chip::Uint8;
 
 CHIP_ERROR ApplicationLauncherManager::HandleGetCatalogList(AttributeValueEncoder & aEncoder)
 {
@@ -34,32 +35,35 @@ CHIP_ERROR ApplicationLauncherManager::HandleGetCatalogList(AttributeValueEncode
     });
 }
 
-void ApplicationLauncherManager::HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const CharSpan & data,
-                                                 const ApplicationLauncherApplicationType & application)
+void ApplicationLauncherManager::HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const ByteSpan & data,
+                                                 const ApplicationType & application)
 {
     // TODO: Insert code here
     Commands::LauncherResponse::Type response;
-    response.data   = chip::CharSpan::fromCharString("data");
-    response.status = StatusEnum::kSuccess;
+    const char * buf = "data";
+    response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+    response.status  = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
 void ApplicationLauncherManager::HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper,
-                                               const ApplicationLauncherApplicationType & application)
+                                               const ApplicationType & application)
 {
     // TODO: Insert code here
     Commands::LauncherResponse::Type response;
-    response.data   = chip::CharSpan::fromCharString("data");
-    response.status = StatusEnum::kSuccess;
+    const char * buf = "data";
+    response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+    response.status  = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
 void ApplicationLauncherManager::HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper,
-                                               const ApplicationLauncherApplicationType & application)
+                                               const ApplicationType & application)
 {
     // TODO: Insert code here
     Commands::LauncherResponse::Type response;
-    response.data   = chip::CharSpan::fromCharString("data");
-    response.status = StatusEnum::kSuccess;
+    const char * buf = "data";
+    response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+    response.status  = StatusEnum::kSuccess;
     helper.Success(response);
 }
diff --git a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.h b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.h
@@ -21,22 +21,20 @@
 #include <app/clusters/application-launcher-server/application-launcher-server.h>
 #include <list>
 
-using chip::CharSpan;
+using chip::ByteSpan;
 using chip::app::AttributeValueEncoder;
 using chip::app::CommandResponseHelper;
-using ApplicationLauncherDelegate        = chip::app::Clusters::ApplicationLauncher::Delegate;
-using ApplicationLauncherApplicationType = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type;
-using LauncherResponseType               = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type;
+using ApplicationLauncherDelegate = chip::app::Clusters::ApplicationLauncher::Delegate;
+using ApplicationType             = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type;
+using LauncherResponseType        = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type;
 
 class ApplicationLauncherManager : public ApplicationLauncherDelegate
 {
 public:
     CHIP_ERROR HandleGetCatalogList(AttributeValueEncoder & aEncoder) override;
 
-    void HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const CharSpan & data,
-                         const ApplicationLauncherApplicationType & application) override;
-    void HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper,
-                       const ApplicationLauncherApplicationType & application) override;
-    void HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper,
-                       const ApplicationLauncherApplicationType & application) override;
+    void HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const ByteSpan & data,
+                         const ApplicationType & application) override;
+    void HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper, const ApplicationType & application) override;
+    void HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper, const ApplicationType & application) override;
 };
diff --git a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp
@@ -22,6 +22,7 @@ using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ApplicationLauncher;
+using namespace chip::Uint8;
 
 CHIP_ERROR ApplicationLauncherManager::HandleGetCatalogList(AttributeValueEncoder & aEncoder)
 {
@@ -35,38 +36,41 @@ CHIP_ERROR ApplicationLauncherManager::HandleGetCatalogList(AttributeValueEncode
     });
 }
 
-void ApplicationLauncherManager::HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const CharSpan & data,
-                                                 const ApplicationLauncherApplicationType & application)
+void ApplicationLauncherManager::HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const ByteSpan & data,
+                                                 const ApplicationType & application)
 {
     ChipLogError(Zcl, "ApplicationLauncherManager::HandleLaunchApp");
 
     // TODO: Insert code here
     LauncherResponseType response;
-    response.data   = CharSpan::fromCharString("data");
-    response.status = StatusEnum::kSuccess;
+    const char * buf = "data";
+    response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+    response.status  = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
 void ApplicationLauncherManager::HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper,
-                                               const ApplicationLauncherApplicationType & application)
+                                               const ApplicationType & application)
 {
     ChipLogError(Zcl, "ApplicationLauncherManager::HandleStopApp");
 
     // TODO: Insert code here
     LauncherResponseType response;
-    response.data   = CharSpan::fromCharString("data");
-    response.status = StatusEnum::kSuccess;
+    const char * buf = "data";
+    response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+    response.status  = StatusEnum::kSuccess;
     helper.Success(response);
 }
 
 void ApplicationLauncherManager::HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper,
-                                               const ApplicationLauncherApplicationType & application)
+                                               const ApplicationType & application)
 {
     ChipLogError(Zcl, "ApplicationLauncherManager::HandleHideApp");
 
     // TODO: Insert code here
     LauncherResponseType response;
-    response.data   = CharSpan::fromCharString("data");
-    response.status = StatusEnum::kSuccess;
+    const char * buf = "data";
+    response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+    response.status  = StatusEnum::kSuccess;
     helper.Success(response);
 }
diff --git a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.h b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.h
@@ -21,12 +21,12 @@
 #include <app/clusters/application-launcher-server/application-launcher-server.h>
 #include <list>
 
-using chip::CharSpan;
+using chip::ByteSpan;
 using chip::app::AttributeValueEncoder;
 using chip::app::CommandResponseHelper;
-using ApplicationLauncherDelegate        = chip::app::Clusters::ApplicationLauncher::Delegate;
-using ApplicationLauncherApplicationType = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type;
-using LauncherResponseType               = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type;
+using ApplicationLauncherDelegate = chip::app::Clusters::ApplicationLauncher::Delegate;
+using ApplicationType             = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type;
+using LauncherResponseType        = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type;
 
 class ApplicationLauncherManager : public ApplicationLauncherDelegate
 {
@@ -36,10 +36,8 @@ class ApplicationLauncherManager : public ApplicationLauncherDelegate
 
     CHIP_ERROR HandleGetCatalogList(AttributeValueEncoder & aEncoder) override;
 
-    void HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const CharSpan & data,
-                         const ApplicationLauncherApplicationType & application) override;
-    void HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper,
-                       const ApplicationLauncherApplicationType & application) override;
-    void HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper,
-                       const ApplicationLauncherApplicationType & application) override;
+    void HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const ByteSpan & data,
+                         const ApplicationType & application) override;
+    void HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper, const ApplicationType & application) override;
+    void HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper, const ApplicationType & application) override;
 };
diff --git a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp
@@ -55,9 +55,8 @@ void TargetNavigatorManager::HandleNavigateTarget(CommandResponseHelper<Navigate
     NavigateTargetResponseType response;
     if (target == kNoCurrentTarget || target > mTargets.size())
     {
-        response.data = CharSpan::fromCharString("error");
-        // TODO: should be TARGET_NOT_FOUND
-        response.status = StatusEnum::kAppNotAvailable;
+        response.data   = CharSpan::fromCharString("error");
+        response.status = StatusEnum::kTargetNotFound;
         helper.Success(response);
         return;
     }

diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
@@ -166,11 +166,11 @@ server cluster ApplicationLauncher = 1292 {
   }
 
   struct ApplicationEP {
-    ApplicationLauncherApplication application = 0;
+    Application application = 0;
     CHAR_STRING endpoint = 1;
   }
 
-  struct ApplicationLauncherApplication {
+  struct Application {
     INT16U catalogVendorId = 0;
     CHAR_STRING applicationId = 1;
   }
@@ -180,21 +180,21 @@ server cluster ApplicationLauncher = 1292 {
   readonly global attribute int16u clusterRevision = 65533;
 
   request struct HideAppRequestRequest {
-    ApplicationLauncherApplication application = 0;
+    Application application = 0;
   }
 
   request struct LaunchAppRequestRequest {
-    CHAR_STRING data = 0;
-    ApplicationLauncherApplication application = 1;
+    Application application = 0;
+    OCTET_STRING data = 1;
   }
 
   request struct StopAppRequestRequest {
-    ApplicationLauncherApplication application = 0;
+    Application application = 0;
   }
 
   response struct LauncherResponse {
     StatusEnum status = 0;
-    CHAR_STRING data = 1;
+    OCTET_STRING data = 1;
   }
 
   command HideAppRequest(HideAppRequestRequest): LauncherResponse = 2;
@@ -1671,8 +1671,8 @@ server cluster SoftwareDiagnostics = 52 {
 server cluster TargetNavigator = 1285 {
   enum StatusEnum : ENUM8 {
     kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
   struct TargetInfo {

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -154,7 +154,7 @@ client cluster ApplicationLauncher = 1292 {
     kLineupInfo = 0x2;
   }
 
-  struct ApplicationLauncherApplication {
+  struct Application {
     INT16U catalogVendorId = 0;
     CHAR_STRING applicationId = 1;
   }
@@ -163,16 +163,16 @@ client cluster ApplicationLauncher = 1292 {
   readonly global attribute int16u clusterRevision = 65533;
 
   request struct HideAppRequestRequest {
-    ApplicationLauncherApplication application = 0;
+    Application application = 0;
   }
 
   request struct LaunchAppRequestRequest {
-    CHAR_STRING data = 0;
-    ApplicationLauncherApplication application = 1;
+    Application application = 0;
+    OCTET_STRING data = 1;
   }
 
   request struct StopAppRequestRequest {
-    ApplicationLauncherApplication application = 0;
+    Application application = 0;
   }
 
   command HideAppRequest(HideAppRequestRequest): LauncherResponse = 2;
@@ -2409,8 +2409,8 @@ server cluster Switch = 59 {
 client cluster TargetNavigator = 1285 {
   enum StatusEnum : ENUM8 {
     kSuccess = 0;
-    kAppNotAvailable = 1;
-    kSystemBusy = 2;
+    kTargetNotFound = 1;
+    kNotAllowed = 2;
   }
 
   struct TargetInfo {

diff --git a/src/app/clusters/application-launcher-server/application-launcher-delegate.h b/src/app/clusters/application-launcher-server/application-launcher-delegate.h
@@ -30,9 +30,9 @@ namespace app {
 namespace Clusters {
 namespace ApplicationLauncher {
 
-using ApplicationLauncherApplicationType = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type;
-using ApplicationEPType                  = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type;
-using LauncherResponseType               = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type;
+using Application          = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type;
+using ApplicationEPType    = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type;
+using LauncherResponseType = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type;
 
 /** @brief
  *    Defines methods for implementing application-specific logic for the Application Launcher Cluster.
@@ -57,12 +57,10 @@ class Delegate
 
     virtual CHIP_ERROR HandleGetCatalogList(app::AttributeValueEncoder & aEncoder) = 0;
 
-    virtual void HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const CharSpan & data,
-                                 const ApplicationLauncherApplicationType & application) = 0;
-    virtual void HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper,
-                               const ApplicationLauncherApplicationType & application)   = 0;
-    virtual void HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper,
-                               const ApplicationLauncherApplicationType & application)   = 0;
+    virtual void HandleLaunchApp(CommandResponseHelper<LauncherResponseType> & helper, const ByteSpan & data,
+                                 const Application & application)                                                     = 0;
+    virtual void HandleStopApp(CommandResponseHelper<LauncherResponseType> & helper, const Application & application) = 0;
+    virtual void HandleHideApp(CommandResponseHelper<LauncherResponseType> & helper, const Application & application) = 0;
 
     virtual ~Delegate() = default;
 

diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -42,6 +42,7 @@ using namespace chip::app::Clusters::ApplicationLauncher;
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 using namespace chip::AppPlatform;
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+using namespace chip::Uint8;
 
 // -----------------------------------------------------------------------------
 // Delegate Implementation
@@ -217,7 +218,7 @@ bool emberAfApplicationLauncherClusterLaunchAppRequestCallback(app::CommandHandl
         // chip-tool can't send structs from command line so treat data value as appid if appid is blank
         // TODO: fix this once chip-tool support sending structs from command line
         ChipLogError(Zcl, "ApplicationLauncher blank content id, taking data as appid");
-        appId = std::string(data.data(), data.size());
+        appId = std::string((char *) data.data(), data.size());
     }
     CatalogVendorApp vendorApp(application.catalogVendorId, appId.c_str());
 
@@ -239,8 +240,9 @@ bool emberAfApplicationLauncherClusterLaunchAppRequestCallback(app::CommandHandl
             {
                 ChipLogError(Zcl, "ApplicationLauncher target app not found");
                 LauncherResponseType response;
-                response.data   = CharSpan("data", strlen("data"));
-                response.status = StatusEnum::kAppNotAvailable;
+                const char * buf = "data";
+                response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+                response.status  = StatusEnum::kAppNotAvailable;
                 responder.Success(response);
                 return true;
             }
@@ -319,8 +321,9 @@ bool emberAfApplicationLauncherClusterStopAppRequestCallback(app::CommandHandler
             {
                 ChipLogError(Zcl, "ApplicationLauncher target app not loaded");
                 LauncherResponseType response;
-                response.data   = CharSpan("data", strlen("data"));
-                response.status = StatusEnum::kAppNotAvailable;
+                const char * buf = "data";
+                response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+                response.status  = StatusEnum::kAppNotAvailable;
                 responder.Success(response);
                 return true;
             }
@@ -402,8 +405,9 @@ bool emberAfApplicationLauncherClusterHideAppRequestCallback(app::CommandHandler
             {
                 ChipLogError(Zcl, "ApplicationLauncher target app not loaded");
                 LauncherResponseType response;
-                response.data   = CharSpan("data", strlen("data"));
-                response.status = StatusEnum::kAppNotAvailable;
+                const char * buf = "data";
+                response.data    = ByteSpan(from_const_char(buf), strlen(buf));
+                response.status  = StatusEnum::kAppNotAvailable;
                 responder.Success(response);
                 return true;
             }