Update PR per latest comments

project-chip · Jul 3, 2021 · 450a1f3 · 450a1f3
1 parent 3e51072
commit 450a1f3
Show file tree

Hide file tree

Showing 38 changed files with 251 additions and 276 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -83,12 +83,7 @@ jobs:
               timeout-minutes: 10
               run: |
                   ifconfig -a
-                  scripts/tests/test_suites.sh 
-            - name: Run TV Tests
-              timeout-minutes: 10
-              run: |
-                  ifconfig -a
-                  scripts/tests/test_suites.sh -a tv -i 20
+                  scripts/tests/test_suites.sh
             - name: Uploading core files
               uses: actions/upload-artifact@v2
               if: ${{ failure() }}
@@ -169,10 +164,6 @@ jobs:
               timeout-minutes: 15
               run: |
                   scripts/tests/test_suites.sh
-            - name: Run TV Tests
-              timeout-minutes: 10
-              run: |
-                  scripts/tests/test_suites.sh -a tv -i 20
             - name: Uploading core files
               uses: actions/upload-artifact@v2
               if: ${{ failure() }}

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
@@ -11616,7 +11616,7 @@
               "outgoing": 1
             },
             {
-              "name": "MediaSkipSeek",
+              "name": "MediaSeek",
               "code": 10,
               "mfgCode": null,
               "source": "client",
@@ -11731,11 +11731,11 @@
               "outgoing": 0
             },
             {
-              "name": "MediaSkipSeekResponse",
-              "code": 10,
+              "name": "MediaSeekResponse",
+              "code": 11,
               "mfgCode": null,
               "source": "server",
-              "incoming": 1,
+              "incoming": 0,
               "outgoing": 0
             }
           ],
@@ -12399,7 +12399,7 @@
               "reportableChange": 0
             },
             {
-              "name": "application satus",
+              "name": "application status",
               "code": 7,
               "mfgCode": null,
               "side": "server",
@@ -16316,4 +16316,4 @@
     }
   ],
   "log": []
-}
+}
diff --git a/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h b/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h
@@ -2600,7 +2600,7 @@
 
 // Array of EmberAfCommandMetadata structs.
 #define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
-#define EMBER_AF_GENERATED_COMMAND_COUNT (200)
+#define EMBER_AF_GENERATED_COMMAND_COUNT (201)
 #define GENERATED_COMMANDS                                                                                                         \
     {                                                                                                                              \
                                                                                                                                    \
@@ -2825,7 +2825,8 @@
             { 0x0506, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* MediaSkipForwardResponse */                                    \
             { 0x0506, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* MediaSkipBackward */                                           \
             { 0x0506, 0x09, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* MediaSkipBackwardResponse */                                   \
-            { 0x0506, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* MediaSkipSeek */                                               \
+            { 0x0506, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* MediaSeek */                                                   \
+            { 0x0506, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* MediaSeekResponse */                                           \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Media Input (server) */                                                                       \
             { 0x0507, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* SelectInput */                                                 \

diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -27,7 +27,6 @@ set(PRIV_INCLUDE_DIRS_LIST
 set(SRC_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/gen"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/linux/include/tv-callbacks"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util"

diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -766,3 +766,8 @@ extern "C" void app_main()
         vTaskDelay(50 / portTICK_PERIOD_MS);
     }
 }
+
+bool lowPowerClusterSleep()
+{
+    return true;
+}
diff --git a/examples/chip-tool/commands/clusters/Commands.h b/examples/chip-tool/commands/clusters/Commands.h
@@ -463,25 +463,25 @@ static void OnMediaPlaybackClusterMediaRewindResponse(void * context, uint8_t me
     command->SetCommandExitStatus(CHIP_NO_ERROR);
 }
 
-static void OnMediaPlaybackClusterMediaSkipBackwardResponse(void * context, uint8_t mediaPlaybackStatus)
+static void OnMediaPlaybackClusterMediaSeekResponse(void * context, uint8_t mediaPlaybackStatus)
 {
-    ChipLogProgress(chipTool, "MediaPlaybackClusterMediaSkipBackwardResponse");
+    ChipLogProgress(chipTool, "MediaPlaybackClusterMediaSeekResponse");
 
     ModelCommand * command = reinterpret_cast<ModelCommand *>(context);
     command->SetCommandExitStatus(CHIP_NO_ERROR);
 }
 
-static void OnMediaPlaybackClusterMediaSkipForwardResponse(void * context, uint8_t mediaPlaybackStatus)
+static void OnMediaPlaybackClusterMediaSkipBackwardResponse(void * context, uint8_t mediaPlaybackStatus)
 {
-    ChipLogProgress(chipTool, "MediaPlaybackClusterMediaSkipForwardResponse");
+    ChipLogProgress(chipTool, "MediaPlaybackClusterMediaSkipBackwardResponse");
 
     ModelCommand * command = reinterpret_cast<ModelCommand *>(context);
     command->SetCommandExitStatus(CHIP_NO_ERROR);
 }
 
-static void OnMediaPlaybackClusterMediaSkipSeekResponse(void * context, uint8_t mediaPlaybackStatus)
+static void OnMediaPlaybackClusterMediaSkipForwardResponse(void * context, uint8_t mediaPlaybackStatus)
 {
-    ChipLogProgress(chipTool, "MediaPlaybackClusterMediaSkipSeekResponse");
+    ChipLogProgress(chipTool, "MediaPlaybackClusterMediaSkipForwardResponse");
 
     ModelCommand * command = reinterpret_cast<ModelCommand *>(context);
     command->SetCommandExitStatus(CHIP_NO_ERROR);
@@ -11979,9 +11979,9 @@ class ReadMediaInputClusterRevision : public ModelCommand
 | * MediaPlay                                                         |   0x00 |
 | * MediaPrevious                                                     |   0x04 |
 | * MediaRewind                                                       |   0x06 |
+| * MediaSeek                                                         |   0x0A |
 | * MediaSkipBackward                                                 |   0x09 |
 | * MediaSkipForward                                                  |   0x08 |
-| * MediaSkipSeek                                                     |   0x0A |
 | * MediaStartOver                                                    |   0x03 |
 | * MediaStop                                                         |   0x02 |
 |------------------------------------------------------------------------------|
@@ -12168,108 +12168,107 @@ class MediaPlaybackMediaRewind : public ModelCommand
 };
 
 /*
- * Command MediaSkipBackward
+ * Command MediaSeek
  */
-class MediaPlaybackMediaSkipBackward : public ModelCommand
+class MediaPlaybackMediaSeek : public ModelCommand
 {
 public:
-    MediaPlaybackMediaSkipBackward() : ModelCommand("media-skip-backward")
+    MediaPlaybackMediaSeek() : ModelCommand("media-seek")
     {
-        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mDeltaPositionMilliseconds);
+        AddArgument("Position", 0, UINT64_MAX, &mPosition);
         ModelCommand::AddArguments();
     }
-    ~MediaPlaybackMediaSkipBackward()
+    ~MediaPlaybackMediaSeek()
     {
         delete onSuccessCallback;
         delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0506) command (0x09) on endpoint %" PRIu8, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0506) command (0x0A) on endpoint %" PRIu8, endpointId);
 
         chip::Controller::MediaPlaybackCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MediaSkipBackward(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mDeltaPositionMilliseconds);
+        return cluster.MediaSeek(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mPosition);
     }
 
 private:
-    chip::Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>(
-            OnMediaPlaybackClusterMediaSkipBackwardResponse, this);
+    chip::Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback> * onSuccessCallback =
+        new chip::Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>(OnMediaPlaybackClusterMediaSeekResponse, this);
     chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
         new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    uint64_t mDeltaPositionMilliseconds;
+    uint64_t mPosition;
 };
 
 /*
- * Command MediaSkipForward
+ * Command MediaSkipBackward
  */
-class MediaPlaybackMediaSkipForward : public ModelCommand
+class MediaPlaybackMediaSkipBackward : public ModelCommand
 {
 public:
-    MediaPlaybackMediaSkipForward() : ModelCommand("media-skip-forward")
+    MediaPlaybackMediaSkipBackward() : ModelCommand("media-skip-backward")
     {
         AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mDeltaPositionMilliseconds);
         ModelCommand::AddArguments();
     }
-    ~MediaPlaybackMediaSkipForward()
+    ~MediaPlaybackMediaSkipBackward()
     {
         delete onSuccessCallback;
         delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0506) command (0x08) on endpoint %" PRIu8, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0506) command (0x09) on endpoint %" PRIu8, endpointId);
 
         chip::Controller::MediaPlaybackCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MediaSkipForward(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mDeltaPositionMilliseconds);
+        return cluster.MediaSkipBackward(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mDeltaPositionMilliseconds);
     }
 
 private:
-    chip::Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>(
-            OnMediaPlaybackClusterMediaSkipForwardResponse, this);
+    chip::Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback> * onSuccessCallback =
+        new chip::Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>(
+            OnMediaPlaybackClusterMediaSkipBackwardResponse, this);
     chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
         new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint64_t mDeltaPositionMilliseconds;
 };
 
 /*
- * Command MediaSkipSeek
+ * Command MediaSkipForward
  */
-class MediaPlaybackMediaSkipSeek : public ModelCommand
+class MediaPlaybackMediaSkipForward : public ModelCommand
 {
 public:
-    MediaPlaybackMediaSkipSeek() : ModelCommand("media-skip-seek")
+    MediaPlaybackMediaSkipForward() : ModelCommand("media-skip-forward")
     {
-        AddArgument("Position", 0, UINT64_MAX, &mPosition);
+        AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mDeltaPositionMilliseconds);
         ModelCommand::AddArguments();
     }
-    ~MediaPlaybackMediaSkipSeek()
+    ~MediaPlaybackMediaSkipForward()
     {
         delete onSuccessCallback;
         delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
     {
-        ChipLogProgress(chipTool, "Sending cluster (0x0506) command (0x0A) on endpoint %" PRIu8, endpointId);
+        ChipLogProgress(chipTool, "Sending cluster (0x0506) command (0x08) on endpoint %" PRIu8, endpointId);
 
         chip::Controller::MediaPlaybackCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MediaSkipSeek(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mPosition);
+        return cluster.MediaSkipForward(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mDeltaPositionMilliseconds);
     }
 
 private:
-    chip::Callback::Callback<MediaPlaybackClusterMediaSkipSeekResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<MediaPlaybackClusterMediaSkipSeekResponseCallback>(OnMediaPlaybackClusterMediaSkipSeekResponse,
-                                                                                        this);
+    chip::Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback> * onSuccessCallback =
+        new chip::Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>(
+            OnMediaPlaybackClusterMediaSkipForwardResponse, this);
     chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
         new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    uint64_t mPosition;
+    uint64_t mDeltaPositionMilliseconds;
 };
 
 /*
@@ -22862,8 +22861,8 @@ void registerClusterMediaPlayback(Commands & commands)
         make_unique<MediaPlaybackMediaFastForward>(),    make_unique<MediaPlaybackMediaNext>(),
         make_unique<MediaPlaybackMediaPause>(),          make_unique<MediaPlaybackMediaPlay>(),
         make_unique<MediaPlaybackMediaPrevious>(),       make_unique<MediaPlaybackMediaRewind>(),
-        make_unique<MediaPlaybackMediaSkipBackward>(),   make_unique<MediaPlaybackMediaSkipForward>(),
-        make_unique<MediaPlaybackMediaSkipSeek>(),       make_unique<MediaPlaybackMediaStartOver>(),
+        make_unique<MediaPlaybackMediaSeek>(),           make_unique<MediaPlaybackMediaSkipBackward>(),
+        make_unique<MediaPlaybackMediaSkipForward>(),    make_unique<MediaPlaybackMediaStartOver>(),
         make_unique<MediaPlaybackMediaStop>(),           make_unique<DiscoverMediaPlaybackAttributes>(),
         make_unique<ReadMediaPlaybackClusterRevision>(),
     };

diff --git a/examples/tv-app/linux/include/tv-channel/TvChannelManager.cpp b/examples/tv-app/linux/include/tv-channel/TvChannelManager.cpp
@@ -74,14 +74,6 @@ EmberAfTvChannelInfo tvChannelClusterChangeChannel(std::string match)
 {
     // TODO: Insert code here
     EmberAfTvChannelInfo channel = {};
-    char affiliateCallSign[]     = "exampleResponseASign";
-    char callSign[]              = "exampleResponseCSign";
-    char name[]                  = "exampleResponseName";
-    channel.affiliateCallSign    = ByteSpan(Uint8::from_char(affiliateCallSign), sizeof(affiliateCallSign));
-    channel.callSign             = ByteSpan(Uint8::from_char(callSign), sizeof(callSign));
-    channel.name                 = ByteSpan(Uint8::from_char(name), sizeof(name));
-    channel.majorNumber          = static_cast<uint8_t>(1);
-    channel.minorNumber          = static_cast<uint16_t>(2);
     return channel;
 }
 bool tvChannelClusterChangeChannelByNumber(uint16_t majorNumber, uint16_t minorNumber)

diff --git a/examples/tv-app/tv-common/gen/callback.h b/examples/tv-app/tv-common/gen/callback.h
@@ -2533,22 +2533,22 @@ bool emberAfMediaPlaybackClusterMediaPreviousCallback(chip::app::Command * comma
 bool emberAfMediaPlaybackClusterMediaRewindCallback(chip::app::Command * commandObj);
 
 /**
- * @brief Media Playback Cluster MediaSkipBackward Command callback
+ * @brief Media Playback Cluster MediaSeek Command callback
  */
 
-bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(chip::app::Command * commandObj, uint64_t deltaPositionMilliseconds);
+bool emberAfMediaPlaybackClusterMediaSeekCallback(chip::app::Command * commandObj, uint64_t position);
 
 /**
- * @brief Media Playback Cluster MediaSkipForward Command callback
+ * @brief Media Playback Cluster MediaSkipBackward Command callback
  */
 
-bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(chip::app::Command * commandObj, uint64_t deltaPositionMilliseconds);
+bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(chip::app::Command * commandObj, uint64_t deltaPositionMilliseconds);
 
 /**
- * @brief Media Playback Cluster MediaSkipSeek Command callback
+ * @brief Media Playback Cluster MediaSkipForward Command callback
  */
 
-bool emberAfMediaPlaybackClusterMediaSkipSeekCallback(chip::app::Command * commandObj, uint64_t position);
+bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(chip::app::Command * commandObj, uint64_t deltaPositionMilliseconds);
 
 /**
  * @brief Media Playback Cluster MediaStartOver Command callback

diff --git a/examples/tv-app/tv-common/gen/endpoint_config.h b/examples/tv-app/tv-common/gen/endpoint_config.h
@@ -1996,7 +1996,7 @@
             { 0x0506, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* MediaSkipForwardResponse */                                    \
             { 0x0506, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* MediaSkipBackward */                                           \
             { 0x0506, 0x09, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* MediaSkipBackwardResponse */                                   \
-            { 0x0506, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* MediaSkipSeek */                                               \
+            { 0x0506, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* MediaSeek */                                                   \
                                                                                                                                    \
             /* Endpoint: 3, Cluster: Content Launcher (server) */                                                                  \
             { 0x050A, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* LaunchContent */                                               \