Update PR per comments. Resolved build tasks issue

lazarkov · Nov 30, 2023 · 3122a80 · 3122a80
1 parent f8e568b
commit 3122a80
Show file tree

Hide file tree

Showing 491 changed files with 15,128 additions and 11,675 deletions.
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -4398,13 +4398,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {

diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -1358,13 +1358,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -6028,13 +6028,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {
@@ -6202,13 +6202,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -5985,13 +5985,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {
@@ -6159,13 +6159,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {

diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
@@ -355,13 +355,13 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count)
     return static_cast<bool>(ret);
 }
 
-void ChannelManager::HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper, const uint64_t & startTime,
-                                           const uint64_t & endTime,
-                                           const chip::app::DataModel::DecodableList<ChannelInfoType> & channelList,
-                                           const PageTokenType & pageToken,
-                                           const chip::BitMask<RecordingFlagBitmap> & recordingFlag,
-                                           const chip::app::DataModel::DecodableList<AdditionalInfoType> & externalIdList,
-                                           const chip::ByteSpan & data)
+void ChannelManager::HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper,
+                                           const chip::Optional<uint32_t> & startTime, const chip::Optional<uint32_t> & endTime,
+                                           const chip::Optional<chip::app::DataModel::DecodableList<ChannelInfoType>> & channelList, 
+                                           const chip::Optional<PageTokenType> & pageToken,
+                                           const chip::Optional<chip::BitMask<RecordingFlagBitmap>> & recordingFlag,
+                                           const chip::Optional<chip::app::DataModel::DecodableList<AdditionalInfoType>> & externalIdList,
+                                           const chip::Optional<chip::ByteSpan> & data)
 {
 
     // 1. Decode received parameters

diff --git a/examples/tv-app/android/java/ChannelManager.h b/examples/tv-app/android/java/ChannelManager.h
@@ -45,11 +45,13 @@ class ChannelManager : public ChannelDelegate
     void HandleChangeChannel(CommandResponseHelper<ChangeChannelResponseType> & helper, const CharSpan & match) override;
     bool HandleChangeChannelByNumber(const uint16_t & majorNumber, const uint16_t & minorNumber) override;
     bool HandleSkipChannel(const int16_t & count) override;
-    void HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper, const uint64_t & startTime,
-                               const uint64_t & endTime, const chip::app::DataModel::DecodableList<ChannelInfoType> & channelList,
-                               const PageTokenType & pageToken, const chip::BitMask<RecordingFlagBitmap> & recordingFlag,
-                               const chip::app::DataModel::DecodableList<AdditionalInfoType> & externalIdList,
-                               const chip::ByteSpan & data) override;
+    void HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper,
+                               const chip::Optional<uint32_t> & startTime, const chip::Optional<uint32_t> & endTime,
+                               const chip::Optional<chip::app::DataModel::DecodableList<ChannelInfoType>> & channelList, 
+                               const chip::Optional<PageTokenType> & pageToken,
+                               const chip::Optional<chip::BitMask<RecordingFlagBitmap>> & recordingFlag,
+                               const chip::Optional<chip::app::DataModel::DecodableList<AdditionalInfoType>> & externalIdList,
+                               const chip::Optional<chip::ByteSpan> & data) override;
 
     bool HandleRecordProgram(const chip::CharSpan & programIdentifier, bool shouldRecordSeries,
                              const chip::app::DataModel::DecodableList<AdditionalInfoType> & externalIdList,

diff --git a/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp b/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp
@@ -191,13 +191,13 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count)
     return true;
 }
 
-void ChannelManager::HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper, const uint64_t & startTime,
-                                           const uint64_t & endTime,
-                                           const chip::app::DataModel::DecodableList<ChannelInfoType> & channelList,
-                                           const PageTokenType & pageToken,
-                                           const chip::BitMask<RecordingFlagBitmap> & recordingFlag,
-                                           const chip::app::DataModel::DecodableList<AdditionalInfoType> & externalIdList,
-                                           const chip::ByteSpan & data)
+void ChannelManager::HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper,
+                                           const chip::Optional<uint32_t> & startTime, const chip::Optional<uint32_t> & endTime,
+                                           const chip::Optional<chip::app::DataModel::DecodableList<ChannelInfoType>> & channelList, 
+                                           const chip::Optional<PageTokenType> & pageToken,
+                                           const chip::Optional<chip::BitMask<RecordingFlagBitmap>> & recordingFlag,
+                                           const chip::Optional<chip::app::DataModel::DecodableList<AdditionalInfoType>> & externalIdList,
+                                           const chip::Optional<chip::ByteSpan> & data)
 {
 
     // 1. Decode received parameters

diff --git a/examples/tv-app/tv-common/clusters/channel/ChannelManager.h b/examples/tv-app/tv-common/clusters/channel/ChannelManager.h
@@ -44,11 +44,13 @@ class ChannelManager : public ChannelDelegate
     void HandleChangeChannel(CommandResponseHelper<ChangeChannelResponseType> & helper, const CharSpan & match) override;
     bool HandleChangeChannelByNumber(const uint16_t & majorNumber, const uint16_t & minorNumber) override;
     bool HandleSkipChannel(const int16_t & count) override;
-    void HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper, const uint64_t & startTime,
-                               const uint64_t & endTime, const chip::app::DataModel::DecodableList<ChannelInfoType> & channelList,
-                               const PageTokenType & pageToken, const chip::BitMask<RecordingFlagBitmap> & recordingFlag,
-                               const chip::app::DataModel::DecodableList<AdditionalInfoType> & externalIdList,
-                               const chip::ByteSpan & data) override;
+    void HandleGetProgramGuide(CommandResponseHelper<ProgramGuideResponseType> & helper,
+                               const chip::Optional<uint32_t> & startTime, const chip::Optional<uint32_t> & endTime,
+                               const chip::Optional<chip::app::DataModel::DecodableList<ChannelInfoType>> & channelList, 
+                               const chip::Optional<PageTokenType> & pageToken,
+                               const chip::Optional<chip::BitMask<RecordingFlagBitmap>> & recordingFlag,
+                               const chip::Optional<chip::app::DataModel::DecodableList<AdditionalInfoType>> & externalIdList,
+                               const chip::Optional<chip::ByteSpan> & data) override;
 
     bool HandleRecordProgram(const chip::CharSpan & programIdentifier, bool shouldRecordSeries,
                              const chip::app::DataModel::DecodableList<AdditionalInfoType> & externalIdList,

diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
@@ -2167,13 +2167,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {

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
@@ -1629,13 +1629,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {

diff --git a/src/app/clusters/channel-server/channel-delegate.h b/src/app/clusters/channel-server/channel-delegate.h
@@ -48,11 +48,12 @@ class Delegate
     virtual bool HandleChangeChannelByNumber(const uint16_t & majorNumber, const uint16_t & minorNumber) = 0;
     virtual bool HandleSkipChannel(const int16_t & count)                                                = 0;
     virtual void HandleGetProgramGuide(CommandResponseHelper<Commands::ProgramGuideResponse::Type> & helper,
-                                       const uint64_t & startTime, const uint64_t & endTime,
-                                       const DataModel::DecodableList<ChannelInfo> & channelList, const PageToken & pageToken,
-                                       const chip::BitMask<RecordingFlagBitmap> & recordingFlag,
-                                       const DataModel::DecodableList<AdditionalInfo> & externalIdList,
-                                       const chip::ByteSpan & data)                                      = 0;
+                                       const chip::Optional<uint32_t> & startTime, const chip::Optional<uint32_t> & endTime,
+                                       const chip::Optional<DataModel::DecodableList<ChannelInfo>> & channelList, 
+                                       const chip::Optional<PageToken> & pageToken,
+                                       const chip::Optional<chip::BitMask<RecordingFlagBitmap>> & recordingFlag,
+                                       const chip::Optional<DataModel::DecodableList<AdditionalInfo>> & externalIdList,
+                                       const chip::Optional<chip::ByteSpan> & data)                                      = 0;
 
     virtual bool HandleRecordProgram(const chip::CharSpan & programIdentifier, bool shouldRecordSeries,
                                      const DataModel::DecodableList<AdditionalInfo> & externalIdList,

diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_3.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_3.yaml
@@ -72,6 +72,27 @@ tests:
                                 },
                             ],
                     }
+              - name: "UseCurrentContext"
+                value: false
+              - name: "PlaybackPreferences"
+                value:
+                    {
+                        PlaybackPosition: 0,
+                        TextTrack:
+                            {
+                                LanguageCode: "exampleLanguageCode",
+                                Characteristics: [0],
+                                AudioOutputIndex: 0,
+                            },
+                        AudioTracks:
+                            [
+                                {
+                                    LanguageCode: "exampleLanguageCode",
+                                    Characteristics: [0],
+                                    AudioOutputIndex: 0,
+                                },
+                            ],
+                    }
       response:
           values:
               - name: "Data"

diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml
@@ -52,13 +52,13 @@ limitations under the License.
 
     <command source="client" code="0x04" name="GetProgramGuide" response="ProgramGuideResponse" optional="true">
       <description>This command retrieves the program guide. It accepts several filter parameters to return specific schedule and program information from a content app. The command shall receive in response a ProgramGuideResponse.</description>
-      <arg name="StartTime" type="epoch_s"/>
-      <arg name="EndTime" type="epoch_s"/>
-      <arg name="ChannelList" type="ChannelInfoStruct" array="true"/>
-      <arg name="PageToken" type="PageTokenStruct"/>
-      <arg name="RecordingFlag" type="RecordingFlagBitmap"/>
-      <arg name="ExternalIDList" type="AdditionalInfoStruct" array="true"/>
-      <arg name="Data" type="octet_string"/>
+      <arg name="StartTime" type="epoch_s" optional="true"/>
+      <arg name="EndTime" type="epoch_s" optional="true"/>
+      <arg name="ChannelList" type="ChannelInfoStruct" array="true" optional="true"/>
+      <arg name="PageToken" type="PageTokenStruct" optional="true"/>
+      <arg name="RecordingFlag" type="RecordingFlagBitmap" optional="true"/>
+      <arg name="ExternalIDList" type="AdditionalInfoStruct" array="true" optional="true"/>
+      <arg name="Data" type="octet_string" optional="true"/>
     </command>
 
     <command source="server" code="0x05" name="ProgramGuideResponse" optional="true">

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -6905,13 +6905,13 @@ cluster Channel = 1284 {
   }
 
   request struct GetProgramGuideRequest {
-    epoch_s startTime = 0;
-    epoch_s endTime = 1;
-    ChannelInfoStruct channelList[] = 2;
-    PageTokenStruct pageToken = 3;
-    RecordingFlagBitmap recordingFlag = 4;
-    AdditionalInfoStruct externalIDList[] = 5;
-    octet_string data = 6;
+    optional epoch_s startTime = 0;
+    optional epoch_s endTime = 1;
+    optional ChannelInfoStruct channelList[] = 2;
+    optional PageTokenStruct pageToken = 3;
+    optional RecordingFlagBitmap recordingFlag = 4;
+    optional AdditionalInfoStruct externalIDList[] = 5;
+    optional octet_string data = 6;
   }
 
   response struct ProgramGuideResponse = 5 {