Update Matter TV clusters & TV app per latest spec. (#12757)

* Update media clusters xml files * Run zap tool successfully * Fixed the gn_build.sh * Fixed tests, recompiled code, all green Fixed application launcher cluster Restyle fix Fixed tests Restyle fix Updated allowed vendor list attribute Restyle fix Disabled application basic cluster - allowed vendor list Run zap tool regen Restyle fix Re-Run of zap regen script Restyle fix Enable current navigator attribute in all cluster app. Restyle fix Re-run zap regen Restyle fix Updated tests per comments Added zap_regen Restyle fix Run zap regen tool Restyle fix Re-run zap regen code, to resolve conflicts Restyle fix Re-run zap regen code, to resolve conflicts Restyle fix Re-run zap regen code, to resolve conflicts Restyle fix Re-run zap regen code, to resolve conflicts Restyle fix Run zap regen code & restyle Run zap regen code & restyle * Disable struct attributes, they cause Cirque to fail
project-chip · Mar 1, 2022 · cb0580f · cb0580f
1 parent bf2afce
commit cb0580f
Show file tree

Hide file tree

Showing 91 changed files with 11,154 additions and 5,363 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -13496,7 +13496,7 @@
           ],
           "attributes": [
             {
-              "name": "tv channel list",
+              "name": "channel list",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -13511,12 +13511,12 @@
               "reportableChange": 0
             },
             {
-              "name": "tv channel lineup",
+              "name": "channel lineup",
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -13526,12 +13526,12 @@
               "reportableChange": 0
             },
             {
-              "name": "current tv channel",
+              "name": "current channel",
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -13625,6 +13625,21 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "current navigator target",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -13900,28 +13915,13 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "position updated at",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "position",
-              "code": 4,
+              "code": 3,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -13932,7 +13932,7 @@
             },
             {
               "name": "playback speed",
-              "code": 5,
+              "code": 4,
               "mfgCode": null,
               "side": "server",
               "included": 1,
@@ -13947,7 +13947,7 @@
             },
             {
               "name": "seek range end",
-              "code": 6,
+              "code": 5,
               "mfgCode": null,
               "side": "server",
               "included": 1,
@@ -13962,7 +13962,7 @@
             },
             {
               "name": "seek range start",
-              "code": 7,
+              "code": 6,
               "mfgCode": null,
               "side": "server",
               "included": 1,
@@ -14323,7 +14323,7 @@
               "reportableChange": 0
             },
             {
-              "name": "supported streaming types",
+              "name": "supported streaming protocols",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -14522,27 +14522,12 @@
               "reportableChange": 0
             },
             {
-              "name": "catalog vendor id",
+              "name": "application launcher app",
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "application id",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
+              "included": 0,
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x00",
@@ -14664,7 +14649,7 @@
               "reportableChange": 0
             },
             {
-              "name": "application id",
+              "name": "application status",
               "code": 5,
               "mfgCode": null,
               "side": "server",
@@ -14679,7 +14664,7 @@
               "reportableChange": 0
             },
             {
-              "name": "catalog vendor id",
+              "name": "application version",
               "code": 6,
               "mfgCode": null,
               "side": "server",
@@ -14693,21 +14678,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "application status",
-              "code": 7,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x01",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -19458,5 +19428,6 @@
       "endpointVersion": 1,
       "deviceIdentifier": 22
     }
-  ]
-}
+  ],
+  "log": []
+}
diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
@@ -67,11 +67,22 @@ string AccountLoginManager::proxySetupPinRequest(string requestTempAccountIdenti
     return "tempPin123";
 }
 
+bool AccountLoginManager::proxyLogout()
+{
+    // TODO: Insert your code here to send logout request
+    return true;
+}
+
 bool accountLoginClusterIsUserLoggedIn(std::string requestTempAccountIdentifier, std::string requestSetupPin)
 {
     return AccountLoginManager().GetInstance().isUserLoggedIn(requestTempAccountIdentifier, requestSetupPin);
 }
 
+bool accountLoginClusterLogout()
+{
+    return AccountLoginManager().GetInstance().proxyLogout();
+}
+
 std::string accountLoginClusterGetSetupPin(std::string requestTempAccountIdentifier, chip::EndpointId endpoint)
 {
     string responseSetupPin = AccountLoginManager().proxySetupPinRequest(requestTempAccountIdentifier, endpoint);

diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.h b/examples/tv-app/android/include/account-login/AccountLoginManager.h
@@ -27,6 +27,7 @@ class AccountLoginManager
 {
 public:
     bool isUserLoggedIn(std::string requestTempAccountIdentifier, std::string requestSetupPin);
+    bool proxyLogout();
     std::string proxySetupPinRequest(std::string requestTempAccountIdentifier, chip::EndpointId endpoint);
     void setTempAccountIdentifierForPin(std::string requestTempAccountIdentifier, std::string requestSetupPin);
 

diff --git a/examples/tv-app/android/include/application-basic/Application.h b/examples/tv-app/android/include/application-basic/Application.h
@@ -22,12 +22,14 @@
 
 struct Application
 {
-    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;
+    using ApplicationBasicStatus   = chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus;
+    char vendorName[32]            = "";
+    char name[32]                  = "";
+    char id[32]                    = "";
+    char version[32]               = "";
+    uint16_t vendorId              = 0;
+    uint16_t productId             = 0;
+    uint16_t catalogVendorId       = 0;
+    uint16_t allowedVendorList[32] = { 123, 456 };
+    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
@@ -74,6 +74,15 @@ void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * app
         ChipLogError(Zcl, "Failed to store name attribute.");
     }
 
+    MakeZclCharString(zclString, application->version);
+    EmberAfStatus versionStatus =
+        emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_BASIC_CLUSTER_ID, ZCL_APPLICATION_VERSION_ATTRIBUTE_ID,
+                                    zclString.data(), ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    if (versionStatus != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        ChipLogError(Zcl, "Failed to store version attribute.");
+    }
+
     EmberAfStatus productIdStatus =
         emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_BASIC_CLUSTER_ID, ZCL_APPLICATION_PRODUCT_ID_ATTRIBUTE_ID,
                                     (uint8_t *) &application->productId, ZCL_INT16U_ATTRIBUTE_TYPE);
@@ -82,23 +91,6 @@ void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * app
         ChipLogError(Zcl, "Failed to store product id attribute.");
     }
 
-    MakeZclCharString(zclString, application->id);
-    EmberAfStatus idStatus =
-        emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_BASIC_CLUSTER_ID, ZCL_APPLICATION_ID_ATTRIBUTE_ID, zclString.data(),
-                                    ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
-    if (idStatus != EMBER_ZCL_STATUS_SUCCESS)
-    {
-        ChipLogError(Zcl, "Failed to store id attribute.");
-    }
-
-    EmberAfStatus catalogVendorIdStatus =
-        emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_BASIC_CLUSTER_ID, ZCL_CATALOG_VENDOR_ID_ATTRIBUTE_ID,
-                                    (uint8_t *) &application->catalogVendorId, ZCL_INT16U_ATTRIBUTE_TYPE);
-    if (catalogVendorIdStatus != EMBER_ZCL_STATUS_SUCCESS)
-    {
-        ChipLogError(Zcl, "Failed to store catalog vendor id attribute.");
-    }
-
     EmberAfStatus applicationStatus =
         emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_BASIC_CLUSTER_ID, ZCL_APPLICATION_STATUS_ATTRIBUTE_ID,
                                     (uint8_t *) &application->status, ZCL_ENUM8_ATTRIBUTE_TYPE);

diff --git a/examples/tv-app/android/include/endpoint-configuration/chip_tv_config.ini b/examples/tv-app/android/include/endpoint-configuration/chip_tv_config.ini
@@ -13,6 +13,7 @@ name=exampleName1
 productId=1
 id=1
 catalogVendorId=1
+version=exampleVersion
 
 [endpoint4]
 type=app
@@ -22,6 +23,7 @@ name=exampleName2
 productId=2
 id=2
 catalogVendorId=2
+version=exampleVersion
 
 [endpoint5]
 type=app
@@ -31,6 +33,7 @@ name=exampleName3
 productId=3
 id= 3
 catalogVendorId=3
+version=exampleVersion
 
 [endpoint6]
 type=app
@@ -39,4 +42,5 @@ vendorId=4
 name=exampleName4
 productId=4
 id=4
-catalogVendorId=4
+catalogVendorId=4
+version=exampleVersion
diff --git a/examples/tv-app/android/java/ContentLauncherManager.cpp b/examples/tv-app/android/java/ContentLauncherManager.cpp
@@ -59,7 +59,7 @@ class ContentLauncherAttrAccess : public app::AttributeAccessInterface
         {
             return ContentLauncherMgr().GetAcceptsHeader(aEncoder);
         }
-        else if (aPath.mAttributeId == app::Clusters::ContentLauncher::Attributes::SupportedStreamingTypes::Id)
+        else if (aPath.mAttributeId == app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id)
         {
             return ContentLauncherMgr().GetSupportedStreamingTypes(aEncoder);
         }

diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp
@@ -50,10 +50,6 @@ class MediaPlayBackAttrAccess : public app::AttributeAccessInterface
             attrId = ZCL_MEDIA_PLAYBACK_DURATION_ATTRIBUTE_ID;
             break;
         }
-        case app::Clusters::MediaPlayback::Attributes::PositionUpdatedAt::Id: {
-            attrId = ZCL_MEDIA_PLAYBACK_PLAYBACK_POSITION_UPDATED_AT_ATTRIBUTE_ID;
-            break;
-        }
         case app::Clusters::MediaPlayback::Attributes::Position::Id: {
             attrId = ZCL_MEDIA_PLAYBACK_PLAYBACK_POSITION_ATTRIBUTE_ID;
             break;

diff --git a/examples/tv-app/android/java/TvChannelManager.cpp b/examples/tv-app/android/java/TvChannelManager.cpp
@@ -42,15 +42,15 @@ class ChannelInfoAttrAccess : public app::AttributeAccessInterface
     ChannelInfoAttrAccess() : app::AttributeAccessInterface(Optional<EndpointId>::Missing(), app::Clusters::TvChannel::Id) {}
     CHIP_ERROR Read(const app::ConcreteReadAttributePath & aPath, app::AttributeValueEncoder & aEncoder) override
     {
-        if (aPath.mAttributeId == app::Clusters::TvChannel::Attributes::TvChannelList::Id)
+        if (aPath.mAttributeId == app::Clusters::TvChannel::Attributes::ChannelList::Id)
         {
             return TvChannelMgr().getTvChannelList(aEncoder);
         }
-        else if (aPath.mAttributeId == app::Clusters::TvChannel::Attributes::TvChannelLineup::Id)
+        else if (aPath.mAttributeId == app::Clusters::TvChannel::Attributes::ChannelLineup::Id)
         {
             return TvChannelMgr().getTvChannelLineup(aEncoder);
         }
-        else if (aPath.mAttributeId == app::Clusters::TvChannel::Attributes::CurrentTvChannel::Id)
+        else if (aPath.mAttributeId == app::Clusters::TvChannel::Attributes::CurrentChannel::Id)
         {
             return TvChannelMgr().getCurrentTvChannel(aEncoder);
         }

diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp
@@ -105,7 +105,7 @@ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
 DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(contentLauncherAttrs)
 DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CONTENT_LAUNCHER_ACCEPTS_HEADER_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize,
                           0), /* accept header list */
-    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CONTENT_LAUNCHER_SUPPORTED_STREAMING_TYPES_ATTRIBUTE_ID, BITMAP32, 1,
+    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID, BITMAP32, 1,
                               0), /* streaming protocols */
     DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();