Update example apps

lazarkov · lazarkov · commit 1357cd009e0b · 2024-02-06T21:12:54.000+01:00
diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
@@ -108,7 +108,7 @@ uint16_t AccountLoginManager::GetClusterRevision(chip::EndpointId endpoint)
 {
     if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)
     {
-        return mDynamicClusterRevision;
+        return kClusterRevision;
     }
 
     uint16_t clusterRevision = 0;
diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.h b/examples/tv-app/android/include/account-login/AccountLoginManager.h
@@ -56,5 +56,5 @@ class AccountLoginManager : public AccountLoginDelegate
     ContentAppCommandDelegate * mCommandDelegate;
     EndpointId mEndpointId;
 
-    uint16_t mDynamicClusterRevision = 2;
+    static constexpr uint16_t kClusterRevision = 2;
 };
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
@@ -170,7 +170,7 @@ uint16_t AppContentLauncherManager::GetClusterRevision(chip::EndpointId endpoint
 {
     if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)
     {
-        return mDynamicClusterRevision;
+        return kClusterRevision;
     }
 
     uint16_t clusterRevision = 0;
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
@@ -63,6 +63,6 @@ class AppContentLauncherManager : public ContentLauncherDelegate
 
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
-    uint16_t mDynamicClusterRevision    = 2;
+    static constexpr uint16_t kClusterRevision    = 2;
     ContentAppAttributeDelegate * mAttributeDelegate;
 };
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
@@ -288,7 +288,7 @@ uint16_t AppMediaPlaybackManager::GetClusterRevision(chip::EndpointId endpoint)
 {
     if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)
     {
-        return mDynamicClusterRevision;
+        return kClusterRevision;
     }
 
     uint16_t clusterRevision = 0;
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h
@@ -115,7 +115,7 @@ class AppMediaPlaybackManager : public MediaPlaybackDelegate
 
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
-    uint16_t mDynamicClusterRevision    = 2;
+    static constexpr uint16_t kClusterRevision    = 2;
 
     ContentAppAttributeDelegate * mAttributeDelegate;
 };
diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
@@ -150,7 +150,7 @@ uint16_t TargetNavigatorManager::GetClusterRevision(chip::EndpointId endpoint)
 {
     if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)
     {
-        return mDynamicClusterRevision;
+        return kClusterRevision;
     }
 
     uint16_t clusterRevision = 0;
diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h
@@ -55,5 +55,5 @@ class TargetNavigatorManager : public TargetNavigatorDelegate
 
 private:
     // TODO: set this based upon meta data from app
-    uint16_t mDynamicClusterRevision = 2;
+    static constexpr uint16_t kClusterRevision = 2;
 };
diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
@@ -756,7 +756,7 @@ uint16_t ChannelManager::GetClusterRevision(chip::EndpointId endpoint)
 {
     if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)
     {
-        return mDynamicClusterRevision;
+        return kClusterRevision;
     }
 
     uint16_t clusterRevision = 0;
diff --git a/examples/tv-app/android/java/ChannelManager.h b/examples/tv-app/android/java/ChannelManager.h
@@ -82,5 +82,5 @@ class ChannelManager : public ChannelDelegate
 
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
-    uint16_t mDynamicClusterRevision    = 2;
+    static constexpr uint16_t kClusterRevision    = 2;
 };
diff --git a/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.h b/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.h
@@ -54,5 +54,5 @@ class AccountLoginManager : public AccountLoginDelegate
 
 private:
     // TODO: set this based upon meta data from app
-    uint16_t kClusterRevision = 2;
+    static constexpr uint16_t kClusterRevision = 2;
 };
diff --git a/examples/tv-app/tv-common/clusters/channel/ChannelManager.h b/examples/tv-app/tv-common/clusters/channel/ChannelManager.h
@@ -74,5 +74,5 @@ class ChannelManager : public ChannelDelegate
 private:
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
-    uint16_t kClusterRevision    = 2;
+    static constexpr uint16_t kClusterRevision    = 2;
 };
diff --git a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h
@@ -64,5 +64,5 @@ class ContentLauncherManager : public ContentLauncherDelegate
 private:
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
-    uint16_t kClusterRevision    = 2;
+    static constexpr uint16_t kClusterRevision    = 2;
 };
diff --git a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.h b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.h
@@ -114,5 +114,5 @@ class MediaPlaybackManager : public MediaPlaybackDelegate
 private:
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
-    uint16_t kClusterRevision    = 2;
+    static constexpr uint16_t kClusterRevision    = 2;
 };
diff --git a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h
@@ -46,5 +46,5 @@ class TargetNavigatorManager : public TargetNavigatorDelegate
 
 private:
     // TODO: set this based upon meta data from app
-    uint16_t kClusterRevision = 2;
+    static constexpr uint16_t kClusterRevision = 2;
 };

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ uint16_t AccountLoginManager::GetClusterRevision(chip::EndpointId endpoint)`
`108`	`108`	`{`
`109`	`109`	`if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)`
`110`	`110`	`{`
`111`		`- return mDynamicClusterRevision;`
	`111`	`+ return kClusterRevision;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`uint16_t clusterRevision = 0;`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ uint16_t AppContentLauncherManager::GetClusterRevision(chip::EndpointId endpoint`
`170`	`170`	`{`
`171`	`171`	`if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)`
`172`	`172`	`{`
`173`		`- return mDynamicClusterRevision;`
	`173`	`+ return kClusterRevision;`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`uint16_t clusterRevision = 0;`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ uint16_t AppMediaPlaybackManager::GetClusterRevision(chip::EndpointId endpoint)`
`288`	`288`	`{`
`289`	`289`	`if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)`
`290`	`290`	`{`
`291`		`- return mDynamicClusterRevision;`
	`291`	`+ return kClusterRevision;`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`uint16_t clusterRevision = 0;`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ uint16_t TargetNavigatorManager::GetClusterRevision(chip::EndpointId endpoint)`
`150`	`150`	`{`
`151`	`151`	`if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)`
`152`	`152`	`{`
`153`		`- return mDynamicClusterRevision;`
	`153`	`+ return kClusterRevision;`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`uint16_t clusterRevision = 0;`
Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,7 @@ uint16_t ChannelManager::GetClusterRevision(chip::EndpointId endpoint)`
`756`	`756`	`{`
`757`	`757`	`if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)`
`758`	`758`	`{`
`759`		`- return mDynamicClusterRevision;`
	`759`	`+ return kClusterRevision;`
`760`	`760`	`}`
`761`	`761`
`762`	`762`	`uint16_t clusterRevision = 0;`