Merge branch 'sve' into cherry-pick-c104a72d298a5d8e30d24860daac1f0f4…

…f24f75f
project-chip · Jul 27, 2022 · c996b7d · c996b7d
2 parents 1e679ea + 7069064
commit c996b7d
Show file tree

Hide file tree

Showing 516 changed files with 28,967 additions and 17,851 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -126,6 +126,7 @@ BeagleBone
 befc
 betaprogram
 BinaryInputBasic
+Binfmt
 bitbake
 bld
 BLE
@@ -160,7 +161,9 @@ btmgmt
 BTN
 BTP
 btvirt
+BuildKit
 buildwithmatter
+buildX
 burndown
 ButtonIsr
 BytesMain

diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml
@@ -65,9 +65,3 @@ jobs:
               run: |
                   cd integrations/docker/images/chip-build${{ matrix.img }}
                   ./build.sh --latest
-            - name: Scan for vulnerabilities
-              uses: crazy-max/docker-scan-action@master
-              with:
-                  # NOTE: This task validates the images built previously with latest tag
-                  image: connectedhomeip/chip-build${{ matrix.img }}:latest
-                  annotations: true
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.5.84
+            image: connectedhomeip/chip-build-k32w:0.5.87
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -82,15 +82,15 @@ jobs:
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    k32w k32w061+release light \
-                    out/artifacts/k32w-light-release-no-ota/chip-k32w061-light-example \
+                    k32w k32w0+release light \
+                    out/artifacts/k32w-light-release-no-ota/chip-k32w0x-light-example \
                     /tmp/bloat_reports/
             - name: Get lock size stats
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    k32w k32w061+release lock \
-                    out/artifacts/k32w-lock-low-power-release/chip-k32w061-lock-example \
+                    k32w k32w0+release lock \
+                    out/artifacts/k32w-lock-low-power-release/chip-k32w0x-lock-example \
                     /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -451,15 +451,15 @@ server cluster AccessControl = 31 {
     nullable INT16U adminPasscodeID = 2;
     ChangeTypeEnum changeType = 3;
     nullable AccessControlEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+    fabric_idx fabricIndex = 254;
   }
 
   info event access(read: administer) AccessControlExtensionChanged = 1 {
     nullable node_id adminNodeID = 1;
     nullable INT16U adminPasscodeID = 2;
     ChangeTypeEnum changeType = 3;
     nullable ExtensionEntry latestValue = 4;
-    fabric_idx adminFabricIndex = 254;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
@@ -1540,7 +1540,6 @@ server cluster OperationalCredentials = 62 {
     kMissingCsr = 4;
     kTableFull = 5;
     kInvalidAdminSubject = 6;
-    kInsufficientPrivilege = 8;
     kFabricConflict = 9;
     kLabelConflict = 10;
     kInvalidFabricIndex = 11;
@@ -3607,7 +3606,7 @@ server cluster TestCluster = 4294048773 {
   }
 
   info event TestFabricScopedEvent = 2 {
-    fabric_idx arg1 = 254;
+    fabric_idx fabricIndex = 254;
   }
 
   attribute boolean boolean = 0;

diff --git a/examples/all-clusters-app/esp32/main/AppTask.cpp b/examples/all-clusters-app/esp32/main/AppTask.cpp
@@ -26,6 +26,7 @@
 #include "esp_log.h"
 #include "esp_spi_flash.h"
 #include "freertos/FreeRTOS.h"
+#include <DeviceInfoProviderImpl.h>
 #include <app/server/OnboardingCodesUtil.h>
 
 #define APP_TASK_NAME "APP"
@@ -39,6 +40,8 @@ namespace {
 QueueHandle_t sAppEventQueue;
 TaskHandle_t sAppTaskHandle;
 
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
 } // namespace
 
 AppTask AppTask::sAppTask;
@@ -84,6 +87,9 @@ CHIP_ERROR AppTask::Init()
 #if CONFIG_HAVE_DISPLAY
     InitDeviceDisplay();
 #endif
+
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     return err;
 }
 

diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -21,13 +21,15 @@ set(PRIV_INCLUDE_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-app"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/include"
                       "${CMAKE_CURRENT_LIST_DIR}/include"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"                      
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
 )
 set(SRC_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-app/zap-generated"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated/attributes"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"                      
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/route_hook"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/ota"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"

diff --git a/examples/all-clusters-app/esp32/main/include/ShellCommands.h b/examples/all-clusters-app/esp32/main/include/ShellCommands.h
@@ -140,7 +140,7 @@ class CASECommands
         GetInstance().SetOnConnecting(false);
     }
 
-    static void OnConnectionFailure(void * context, PeerId peerId, CHIP_ERROR error)
+    static void OnConnectionFailure(void * context, const ScopedNodeId & peerId, CHIP_ERROR error)
     {
         streamer_printf(streamer_get(), "Establish CASESession Failure!\r\n");
         GetInstance().SetOnConnecting(false);
@@ -156,8 +156,9 @@ class CASECommands
             ChipLogError(SecureChannel, "Can't get the CASESessionManager");
             return;
         }
-        caseSessionManager->FindOrEstablishSession(caseCommand->GetFabricInfo()->GetPeerIdForNode(caseCommand->GetNodeId()),
-                                                   &sOnConnectedCallback, &sOnConnectionFailureCallback);
+        caseSessionManager->FindOrEstablishSession(
+            ScopedNodeId(caseCommand->GetNodeId(), caseCommand->GetFabricInfo()->GetFabricIndex()), &sOnConnectedCallback,
+            &sOnConnectionFailureCallback);
     }
 
     static CHIP_ERROR ConnectToNodeHandler(int argc, char ** argv)