Rename TV channel cluster to channel cluster (#12999)

* Rename TvChannel cluster in TV Linux and Android App * Rename TvChannel cluster in other example apps * Rename TvChannel cluster in src/app folder * Zap regen * Resolved conflicts * Zap Regen zbog conflicts
project-chip · Dec 16, 2021 · 161cd14 · 161cd14
1 parent 5988375
commit 161cd14
Show file tree

Hide file tree

Showing 101 changed files with 2,896 additions and 8,596 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -150,6 +150,7 @@ CFLAGS
 cgit
 cgroup
 changeset
+Channel
 characterised
 CharString
 checkmark
@@ -999,7 +1000,6 @@ ttyACM
 ttyACMx
 ttymxc
 ttyUSB
-TvChannel
 TXD
 txt
 UART

diff --git a/docs/guides/python_chip_controller_building.md b/docs/guides/python_chip_controller_building.md
@@ -516,7 +516,7 @@ RelativeHumidityMeasurement
 Scenes
 SoftwareDiagnostics
 Switch
-TvChannel
+Channel
 TargetNavigator
 TemperatureMeasurement
 TestCluster

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
@@ -13579,10 +13579,10 @@
           ]
         },
         {
-          "name": "TV Channel",
+          "name": "Channel",
           "code": 1284,
           "mfgCode": null,
-          "define": "TV_CHANNEL_CLUSTER",
+          "define": "CHANNEL_CLUSTER",
           "side": "client",
           "enabled": 0,
           "commands": [
@@ -13630,10 +13630,10 @@
           ]
         },
         {
-          "name": "TV Channel",
+          "name": "Channel",
           "code": 1284,
           "mfgCode": null,
-          "define": "TV_CHANNEL_CLUSTER",
+          "define": "CHANNEL_CLUSTER",
           "side": "server",
           "enabled": 1,
           "commands": [

diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -63,7 +63,7 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-user-interface-configuration-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thread-network-diagnostics-server" 
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/tv-channel-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/channel-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/scenes"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/software-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/switch-server"

diff --git a/examples/all-clusters-app/mbed/CMakeLists.txt b/examples/all-clusters-app/mbed/CMakeLists.txt
@@ -122,7 +122,7 @@ target_sources(${APP_TARGET} PRIVATE
                ${APP_CLUSTERS}/target-navigator-server/target-navigator-server.cpp
                ${APP_CLUSTERS}/thermostat-server/thermostat-server.cpp
                ${APP_CLUSTERS}/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
-               ${APP_CLUSTERS}/tv-channel-server/tv-channel-server.cpp
+               ${APP_CLUSTERS}/channel-server/channel-server.cpp
                ${APP_CLUSTERS}/operational-credentials-server/operational-credentials-server.cpp
                ${APP_CLUSTERS}/test-cluster-server/test-cluster-server.cpp
                ${APP_CLUSTERS}/occupancy-sensor-server/occupancy-sensor-server.cpp

diff --git a/examples/chip-tool/templates/tests.js b/examples/chip-tool/templates/tests.js
@@ -171,7 +171,7 @@ function getTests()
     'TV_WakeOnLanCluster',
     'TV_ApplicationBasicCluster',
     'TV_MediaPlaybackCluster',
-    'TV_TvChannelCluster',
+    'TV_ChannelCluster',
     'TV_LowPowerCluster',
     'TV_ContentLauncherCluster',
     'TV_MediaInputCluster',

diff --git a/examples/common/pigweed/protos/attributes_service.proto b/examples/common/pigweed/protos/attributes_service.proto
@@ -158,7 +158,7 @@ enum ClusterType {
     ZCL_IAS_ACE_CLUSTER_ID = 0x0501;
     ZCL_IAS_WD_CLUSTER_ID = 0x0502;
     ZCL_WAKE_ON_LAN_CLUSTER_ID = 0x0503;
-    ZCL_TV_CHANNEL_CLUSTER_ID = 0x0504;
+    ZCL_CHANNEL_CLUSTER_ID = 0x0504;
     ZCL_TARGET_NAVIGATOR_CLUSTER_ID = 0x0505;
     ZCL_MEDIA_PLAYBACK_CLUSTER_ID = 0x0506;
     ZCL_MEDIA_INPUT_CLUSTER_ID = 0x0507;

diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -12382,10 +12382,10 @@
           ]
         },
         {
-          "name": "TV Channel",
+          "name": "Channel",
           "code": 1284,
           "mfgCode": null,
-          "define": "TV_CHANNEL_CLUSTER",
+          "define": "CHANNEL_CLUSTER",
           "side": "client",
           "enabled": 0,
           "commands": [
@@ -12433,10 +12433,10 @@
           ]
         },
         {
-          "name": "TV Channel",
+          "name": "Channel",
           "code": 1284,
           "mfgCode": null,
-          "define": "TV_CHANNEL_CLUSTER",
+          "define": "CHANNEL_CLUSTER",
           "side": "server",
           "enabled": 0,
           "commands": [

diff --git a/...tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java b/...tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
@@ -9,13 +9,13 @@
 import chip.platform.NsdManagerServiceResolver;
 import chip.platform.PreferencesConfigurationManager;
 import chip.platform.PreferencesKeyValueStoreManager;
+import com.tcl.chip.tvapp.ChannelManagerStub;
 import com.tcl.chip.tvapp.ContentLaunchManagerStub;
 import com.tcl.chip.tvapp.KeypadInputManagerStub;
 import com.tcl.chip.tvapp.LowPowerManagerStub;
 import com.tcl.chip.tvapp.MediaInputManagerStub;
 import com.tcl.chip.tvapp.MediaPlaybackManagerStub;
 import com.tcl.chip.tvapp.TvApp;
-import com.tcl.chip.tvapp.TvChannelManagerStub;
 import com.tcl.chip.tvapp.WakeOnLanManagerStub;
 
 public class MatterServant {
@@ -38,7 +38,7 @@ public void init(@NonNull Context context) {
     tvApp.setContentLaunchManager(new ContentLaunchManagerStub());
     tvApp.setLowPowerManager(new LowPowerManagerStub());
     tvApp.setMediaPlaybackManager(new MediaPlaybackManagerStub());
-    tvApp.setTvChannelManager(new TvChannelManagerStub());
+    tvApp.setChannelManager(new ChannelManagerStub());
 
     Context applicationContext = context.getApplicationContext();
     AndroidChipPlatform chipPlatform =

diff --git a/examples/tv-app/android/BUILD.gn b/examples/tv-app/android/BUILD.gn
@@ -38,6 +38,8 @@ shared_library("jni") {
     "include/endpoint-configuration/EndpointConfigurationStorage.h",
     "include/target-navigator/TargetNavigatorManager.cpp",
     "include/target-navigator/TargetNavigatorManager.h",
+    "java/ChannelManager.cpp",
+    "java/ChannelManager.h",
     "java/ContentLauncherManager.cpp",
     "java/ContentLauncherManager.h",
     "java/KeypadInputManager.cpp",
@@ -49,8 +51,6 @@ shared_library("jni") {
     "java/MediaPlaybackManager.cpp",
     "java/MediaPlaybackManager.h",
     "java/TVApp-JNI.cpp",
-    "java/TvChannelManager.cpp",
-    "java/TvChannelManager.h",
     "java/WakeOnLanManager.cpp",
     "java/WakeOnLanManager.h",
   ]
@@ -83,6 +83,10 @@ android_library("java") {
   ]
 
   sources = [
+    "java/src/com/tcl/chip/tvapp/ChannelInfo.java",
+    "java/src/com/tcl/chip/tvapp/ChannelLineupInfo.java",
+    "java/src/com/tcl/chip/tvapp/ChannelManager.java",
+    "java/src/com/tcl/chip/tvapp/ChannelManagerStub.java",
     "java/src/com/tcl/chip/tvapp/ContentLaunchBrandingInformation.java",
     "java/src/com/tcl/chip/tvapp/ContentLaunchManager.java",
     "java/src/com/tcl/chip/tvapp/ContentLaunchManagerStub.java",
@@ -98,10 +102,6 @@ android_library("java") {
     "java/src/com/tcl/chip/tvapp/MediaPlaybackManager.java",
     "java/src/com/tcl/chip/tvapp/MediaPlaybackManagerStub.java",
     "java/src/com/tcl/chip/tvapp/TvApp.java",
-    "java/src/com/tcl/chip/tvapp/TvChannelInfo.java",
-    "java/src/com/tcl/chip/tvapp/TvChannelLineupInfo.java",
-    "java/src/com/tcl/chip/tvapp/TvChannelManager.java",
-    "java/src/com/tcl/chip/tvapp/TvChannelManagerStub.java",
     "java/src/com/tcl/chip/tvapp/WakeOnLanManager.java",
     "java/src/com/tcl/chip/tvapp/WakeOnLanManagerStub.java",
   ]