Merge branch 'master' into feature/fix-cluster-revisions

Author: lazarkov

src/app/clusters/scenes-server/SceneTable.h

@@ -39,7 +39,7 @@ inline constexpr SceneId kUndefinedSceneId       = 0xff;
 
 static constexpr size_t kIteratorsMax            = CHIP_CONFIG_MAX_SCENES_CONCURRENT_ITERATORS;
 static constexpr size_t kSceneNameMaxLength      = CHIP_CONFIG_SCENES_CLUSTER_MAXIMUM_NAME_LENGTH;
-static constexpr size_t kScenesMaxTransitionTime = 6'000'000u;
+static constexpr size_t kScenesMaxTransitionTime = 60'000'000u;
 
 /// @brief SceneHandlers are meant as interface between various clusters and the Scene table.
 /// When a scene command involving extension field sets is received, the Scene Table will go through

src/app/clusters/scenes-server/scenes-server.cpp

@@ -61,7 +61,15 @@ CHIP_ERROR AddResponseOnError(CommandHandlerInterface::HandlerContext & ctx, Res
 {
     if (CHIP_NO_ERROR != err)
     {
-        resp.status = to_underlying(StatusIB(err).mStatus);
+        // TODO : Properly fix mapping between error types (issue https://github.com/project-chip/connectedhomeip/issues/26885)
+        if (CHIP_ERROR_NOT_FOUND == err)
+        {
+            resp.status = to_underlying(Protocols::InteractionModel::Status::NotFound);
+        }
+        else
+        {
+            resp.status = to_underlying(StatusIB(err).mStatus);
+        }
         ctx.mCommandHandler.AddResponse(ctx.mRequestPath, resp);
     }
     return err;

src/app/tests/suites/certification/PICS.yaml

@@ -5781,7 +5781,7 @@ PICS:
     - label: "Write all supported optional attributes"
       id: RH.C.AO-WRITE
 
-    # Scenes Cluster Test Plan
+    # Scenes Management Cluster Test Plan
     - label: "Does the device implement the Scenes cluster as a server?"
       id: S.S
 
@@ -5870,11 +5870,6 @@ PICS:
     - label: "Does the device implement sending the CopyScene command?"
       id: S.C.C40.Tx
 
-    - label:
-          "Does the device process the TransitionTime parameter of the
-          RecallScene command?"
-      id: PICS_SC_RECALL_SCENE_TRANSITION_TIME_MS
-
     #
     # client / manually
     #

src/app/tests/suites/certification/Test_TC_S_1_1.yaml

@@ -110,7 +110,7 @@ tests:
               contains: [0, 1, 2, 3, 4, 6]
 
     - label:
-          "Step 7b: Read optional command(CopySceneResponse) in
+          "Step 7b: TH reads Read optional command(CopySceneResponse) in
           GeneratedCommandList (global attribute 65528)"
       PICS: S.S.C40.Rsp
       command: "readAttribute"