Merge branch 'master' into ember_tlv_reader_encoding

.github/workflows/examples-efr32.yaml

@@ -41,7 +41,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:81
+      image: ghcr.io/project-chip/chip-build-efr32:85
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/examples-linux-arm.yaml

@@ -70,6 +70,7 @@ jobs:
                         --target linux-arm64-lit-icd-no-ble-clang \
                         --target linux-arm64-fabric-admin-clang-rpc \
                         --target linux-arm64-fabric-bridge-no-ble-clang-rpc \
+                        --target linux-arm64-fabric-sync-no-ble-clang \
                         build \
                      "
             - name: Bloat report - chip-tool

.github/workflows/examples-linux-standalone.yaml

@@ -219,6 +219,16 @@ jobs:
                     linux debug fabric-bridge-app \
                     out/linux-x64-fabric-bridge-no-ble-rpc/fabric-bridge-app \
                     /tmp/bloat_reports/
+            - name: Build example Fabric Sync
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target linux-x64-fabric-sync-no-ble \
+                        build"
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    linux debug fabric-sync \
+                    out/linux-x64-fabric-sync-no-ble/fabric-sync \
+                    /tmp/bloat_reports/                    
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}

.github/workflows/release_artifacts.yaml

@@ -64,7 +64,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:81
+            image: ghcr.io/project-chip/chip-build-efr32:85
         steps:
             - name: Checkout
               uses: actions/checkout@v4

.gitmodules

@@ -213,17 +213,17 @@
 [submodule "third_party/silabs/simplicity_sdk"]
 	path = third_party/silabs/simplicity_sdk
 	url = https://github.com/SiliconLabs/simplicity_sdk.git
-	branch = v2024.6.1-0
+	branch = v2024.6.2
 	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
 	url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
-	branch = 2.10.0
+	branch = 2.10.3
 	platforms = silabs
 [submodule "third_party/silabs/wifi_sdk"]
 	path = third_party/silabs/wifi_sdk
 	url = https://github.com/SiliconLabs/wiseconnect.git
-	branch = v3.3.2
+	branch = v3.3.3
 	platforms = silabs
 [submodule "editline"]
 	path = third_party/editline/repo

.vscode/launch.json

@@ -419,6 +419,14 @@
             "cwd": "${workspaceFolder}"
         },
 
+        {
+            "name": "Fabric Sync (Linux)",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/debug/standalone/fabric-sync",
+            "cwd": "${workspaceFolder}"
+        },
+
         {
             "name": "OTA Requestor App (Linux)",
             "type": "lldb",

docs/development_controllers/chip-tool/chip_tool_guide.md

@@ -9,33 +9,29 @@ the setup payload or performing discovery actions.
 
 <hr>
 
-## Source files
+## Installation
 
-You can find source files of the CHIP Tool in the `examples/chip-tool`
-directory.
-
-> **Note:** The CHIP Tool caches the configuration state in the
-> `/tmp/chip_tool_config.ini` file. Deleting this and other `.ini` files in the
-> `/tmp` directory can sometimes resolve issues related to stale configuration.
+On Linux distributions
+[running snapd](https://snapcraft.io/docs/installing-snapd), such as Ubuntu, the
+CHIP Tool can be installed using the
+[chip-tool snap](https://snapcraft.io/chip-tool). To do this, run:
 
-> **Note:** To make the configuration persistent (since `/tmp` directory might
-> be flushed at each reboot) you can change the directory where CHIP Tool caches
-> its configuration by using the option `--storage-directory`
+```
+sudo snap install chip-tool
+```
 
-<hr>
+## Building from source
 
-## Building and running the CHIP Tool
+The source files of the CHIP Tool are available in the `examples/chip-tool`
+directory.
 
-Before you can use the CHIP Tool, you must compile it from source on Linux
-(amd64/aarch64) or macOS. If you want to run it on Raspberry Pi, it must use a
-64-bit OS.
+The source can be compiled on Linux (amd64/aarch64) or macOS. If you want to run
+it on Raspberry Pi, you must use a 64-bit OS.
 
 > **Note:** To ensure compatibility, always build the CHIP Tool and the Matter
 > device from the same revision of the `connectedhomeip` repository.
 
-### Building the CHIP Tool
-
-To build and run the CHIP Tool:
+To build the CHIP Tool:
 
 1. Install all required packages for Matter and prepare the source code and the
    build system. Read the [Building Matter](../../guides/BUILDING.md) guide for
@@ -50,10 +46,16 @@ To build and run the CHIP Tool:
     In this command, `BUILD_PATH` specifies where the target binaries are to be
     placed.
 
-### Running the CHIP Tool
+## Running the CHIP Tool
+
+If you installed the CHIP Tool as a snap, the command to run it would be:
+
+```
+$ chip-tool
+```
 
-To check if the CHIP Tool runs correctly, execute the following command from the
-`BUILD_PATH` directory:
+If you compiled the CHIP Tool from source, it can be executed with the following
+command from the `BUILD_PATH` directory:
 
 ```
 $ ./chip-tool
@@ -68,6 +70,13 @@ more complex command by appending it with sub-commands. Examples of specific
 commands and their use cases are described in the
 [Supported commands and options](#supported-commands-and-options) section.
 
+> **Note:** The CHIP Tool caches the configuration state in the
+> `/tmp/chip_tool_config.ini` file. Deleting this and other `.ini` files in the
+> `/tmp` directory can sometimes resolve issues related to stale configuration.
+> To make the configuration persistent you can change the directory where CHIP
+> Tool caches its configuration by using the command line option
+> `--storage-directory`
+
 <hr>
 
 ## CHIP Tool modes

examples/all-clusters-app/nxp/common/main/main.cpp

@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
 
 using namespace ::chip::DeviceLayer;
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     TaskHandle_t taskHandle;
 

examples/contact-sensor-app/nxp/common/main.cpp

@@ -30,7 +30,7 @@ extern "C" void main_task(void const * argument)
     chip::NXP::App::GetAppTask().Start();
 }
 #else
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     chip::DeviceLayer::PlatformMgrImpl().HardwareInit();
     chip::NXP::App::GetAppTask().Start();

examples/laundry-washer-app/nxp/common/main/main.cpp

@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
 
 using namespace ::chip::DeviceLayer;
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     TaskHandle_t taskHandle;
 

examples/light-switch-app/genio/src/main.cpp

@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 

examples/light-switch-app/nrfconnect/README.md

@@ -638,7 +638,7 @@ same Matter network.
 To perform the unicast binding process, complete the following steps:
 
 1.  Build the CHIP Tool according to the steps from the
-    [CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md#building-and-running-the-chip-tool).
+    [CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md#building-from-source).
 2.  Go to the CHIP Tool build directory.
 3.  Add an ACL to the development kit that is programmed with the
     [Lighting Application Example](../../lighting-app/nrfconnect/README.md) by
@@ -690,7 +690,7 @@ same Matter network.
 To perform the unicast binding process, complete the following steps:
 
 1.  Build the CHIP Tool according to the steps from the
-    [CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md#building-and-running-the-chip-tool).
+    [CHIP Tool user guide](../../../docs/development_controllers/chip-tool/chip_tool_guide.md#building-from-source).
 2.  Go to the CHIP Tool build directory.
 
 3.  Add the light switch device to the multicast group by running the following

examples/lighting-app-data-mode-no-unique-id/linux/main.cpp

@@ -95,7 +95,7 @@ void ApplicationShutdown()
     }
 }
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     if (ChipLinuxAppInit(argc, argv) != 0)
     {

examples/lighting-app/genio/src/main.cpp

@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 

examples/lighting-app/linux/main.cpp

@@ -95,7 +95,14 @@ void ApplicationShutdown()
     }
 }
 
-extern "C" int main(int argc, char * argv[])
+#ifdef __NuttX__
+// NuttX requires the main function to be defined with C-linkage. However, marking
+// the main as extern "C" is not strictly conformant with the C++ standard. Since
+// clang >= 20 such code triggers -Wmain warning.
+extern "C" {
+#endif
+
+int main(int argc, char * argv[])
 {
     if (ChipLinuxAppInit(argc, argv) != 0)
     {
@@ -124,3 +131,7 @@ extern "C" int main(int argc, char * argv[])
 
     return 0;
 }
+
+#ifdef __NuttX__
+}
+#endif

examples/lighting-app/nxp/common/main.cpp

@@ -30,7 +30,7 @@ extern "C" void main_task(void const * argument)
     chip::NXP::App::GetAppTask().Start();
 }
 #else
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     chip::DeviceLayer::PlatformMgrImpl().HardwareInit();
     chip::NXP::App::GetAppTask().Start();

examples/lock-app/genio/src/main.cpp

@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 

examples/lock-app/nxp/common/main/main.cpp

@@ -39,7 +39,7 @@ extern "C" void main_task(void const * argument)
     chip::NXP::App::GetAppTask().Start();
 }
 #else
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     chip::DeviceLayer::PlatformMgrImpl().HardwareInit();
     chip::NXP::App::GetAppTask().Start();

examples/ota-requestor-app/genio/src/main.cpp

@@ -281,7 +281,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 

examples/platform/openiotsdk/app/openiotsdk_startup_gcc.cpp

@@ -57,7 +57,7 @@ alignas(8) static uint8_t malloc_mutex_obj[80];
 
 // C runtime import: constructor initialization and main
 extern "C" void __libc_init_array(void);
-extern "C" int main(void);
+int main(void);
 
 // IOT SDK serial declarations
 #define STDIN_FILENO 0

examples/platform/silabs/SiWx917/SiWx917/sl_wlan_config.h

@@ -29,6 +29,14 @@
 //! Disable feature
 #define RSI_DISABLE 0
 
+// Temmporary work-around for wifi-init failure in ACX modules with WiseConnect v3.3.3. This can be removed after integrating with
+// WiseConnect v3.4.0
+#if (SL_SI91X_ACX_MODULE == 1)
+#define REGION_CODE IGNORE_REGION
+#else
+#define REGION_CODE US
+#endif
+
 static const sl_wifi_device_configuration_t config = {
     .boot_option = LOAD_NWP_FW,
     .mac_address = NULL,

examples/platform/silabs/efr32/rs911x/rsi_if.cpp

@@ -506,6 +506,9 @@ static void wfx_rsi_save_ap_info(void) // translation
     case SME_WPA2_ENTERPRISE:
         wfx_rsi.sec.security = WFX_SEC_WPA2;
         break;
+    case SME_WPA_WPA2_MIXED_MODE:
+        wfx_rsi.sec.security = WFX_SEC_WPA_WPA2_MIXED;
+        break;
     case SME_WEP:
         wfx_rsi.sec.security = WFX_SEC_WEP;
         break;
@@ -551,6 +554,7 @@ static void wfx_rsi_do_join(void)
         break;
     case WFX_SEC_WPA:
     case WFX_SEC_WPA2:
+    case WFX_SEC_WPA_WPA2_MIXED:
         connect_security_mode = RSI_WPA_WPA2_MIXED;
         break;
 #if WIFI_ENABLE_SECURITY_WPA3_TRANSITION

examples/platform/silabs/uart.cpp

@@ -38,7 +38,6 @@ extern "C" {
 #include "rsi_board.h"
 #include "rsi_debug.h"
 #include "rsi_rom_egpio.h"
-#include "sl_si91x_usart.h"
 #else // For EFR32
 #if (_SILICON_LABS_32B_SERIES < 3)
 #include "em_core.h"

examples/shell/genio/src/main.cpp

@@ -161,7 +161,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 

examples/thermostat/genio/src/main.cpp

@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 

examples/thermostat/nxp/common/main/main.cpp

@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
 
 using namespace ::chip::DeviceLayer;
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     TaskHandle_t taskHandle;