Resolved conflicts

project-chip · Dec 15, 2021 · 3838c19 · 3838c19
1 parent 5e91ccb
commit 3838c19
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8,520 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/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
@@ -61,7 +61,7 @@ class ChannelInfoAttrAccess : public app::AttributeAccessInterface
 
 ChannelInfoAttrAccess gChannelAttrAccess;
 
-/** @brief Tv Channel  Cluster Init
+/** @brief Channel  Cluster Init
  *
  * This function is called when a specific cluster is initialized. It gives the
  * application an opportunity to take care of cluster initialization procedures.

diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py
@@ -82,7 +82,7 @@
     'THREAD_NETWORK_DIAGNOSTICS_CLUSTER': ['thread-network-diagnostics-server'],
     'TIME_CLUSTER': [],
     'TIME_SYNCHRONIZATION_CLUSTER': [],
-    'USER_LABEL_CLUSTER': [],
+    'USER_LABEL_CLUSTER': ['user-label-server'],
     'WAKE_ON_LAN_CLUSTER': [],
     'WIFI_NETWORK_DIAGNOSTICS_CLUSTER': ['wifi-network-diagnostics-server'],
     'WINDOW_COVERING_CLUSTER': ['window-covering-server'],