From 65c1d491ff11f0de2241d69c56abb3d5ef02e027 Mon Sep 17 00:00:00 2001 From: Arun Padakanti Date: Thu, 17 Oct 2024 14:52:09 +0530 Subject: [PATCH 1/2] Updated sdk to v3.3.3 and made required changes --- .gitmodules | 2 +- examples/platform/silabs/uart.cpp | 1 - src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp | 1 + src/platform/silabs/rs911x/rsi_ble_config.h | 1 - third_party/silabs/SiWx917_sdk.gni | 1 - third_party/silabs/matter_support | 2 +- third_party/silabs/wifi_sdk | 2 +- 7 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index ed472c937c..c26ee8f792 100644 --- a/.gitmodules +++ b/.gitmodules @@ -223,7 +223,7 @@ [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 diff --git a/examples/platform/silabs/uart.cpp b/examples/platform/silabs/uart.cpp index a43a23fa2c..7be4ba9326 100644 --- a/examples/platform/silabs/uart.cpp +++ b/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" diff --git a/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp b/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp index a99ac5ea29..82b558809b 100644 --- a/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp +++ b/src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp @@ -38,6 +38,7 @@ extern "C" { #include "sl_si91x_button_pin_config.h" #include "sl_si91x_led.h" #include "sl_si91x_led_config.h" +#include "sl_si91x_led_instances.h" #if CHIP_CONFIG_ENABLE_ICD_SERVER == 0 void soc_pll_config(void); diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h index de207a99af..9b8321605e 100644 --- a/src/platform/silabs/rs911x/rsi_ble_config.h +++ b/src/platform/silabs/rs911x/rsi_ble_config.h @@ -232,7 +232,6 @@ //! Scan types #define SCAN_TYPE_ACTIVE (0x01) -#define SCAN_TYPE_PASSIVE (0x00) //! Scan filters #define SCAN_FILTER_TYPE_ALL (0x00) diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni index d338ea7d0a..1aecd79cfa 100644 --- a/third_party/silabs/SiWx917_sdk.gni +++ b/third_party/silabs/SiWx917_sdk.gni @@ -649,7 +649,6 @@ template("siwx917_sdk") { "${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/systemlevel/src/rsi_temp_sensor.c", "${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/systemlevel/src/rsi_ulpss_clk.c", "${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/unified_api/src/sl_si91x_driver_gpio.c", - "${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/unified_api/src/sl_si91x_usart.c", "${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/unified_peripheral_drivers/src/sl_si91x_peripheral_gpio.c", "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ahb_interface/src/rsi_hal_mcu_m4_ram.c", "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ahb_interface/src/rsi_hal_mcu_m4_rom.c", diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index 841d43db7e..75c2444243 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit 841d43db7e86877636cd73b5244da4c34d38d544 +Subproject commit 75c24442436a965a208b804bf9a5c66c5eb1263b diff --git a/third_party/silabs/wifi_sdk b/third_party/silabs/wifi_sdk index b5d6422f30..a6390dd746 160000 --- a/third_party/silabs/wifi_sdk +++ b/third_party/silabs/wifi_sdk @@ -1 +1 @@ -Subproject commit b5d6422f300cc075c7eaeec96e9f7e3f4e23bf06 +Subproject commit a6390dd746f0067b855a6b41293159244f3ca1b4 From 6dd99bef6917b94f3876ec998e0aa08f6640771e Mon Sep 17 00:00:00 2001 From: Arun Padakanti Date: Thu, 17 Oct 2024 23:53:55 +0530 Subject: [PATCH 2/2] Reverted the changes that are not needed. --- .gitmodules | 2 +- third_party/silabs/matter_support | 2 +- third_party/silabs/wifi_sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index c26ee8f792..ed472c937c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -223,7 +223,7 @@ [submodule "third_party/silabs/wifi_sdk"] path = third_party/silabs/wifi_sdk url = https://github.com/SiliconLabs/wiseconnect.git - branch = v3.3.3 + branch = v3.3.2 platforms = silabs [submodule "editline"] path = third_party/editline/repo diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index 75c2444243..841d43db7e 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit 75c24442436a965a208b804bf9a5c66c5eb1263b +Subproject commit 841d43db7e86877636cd73b5244da4c34d38d544 diff --git a/third_party/silabs/wifi_sdk b/third_party/silabs/wifi_sdk index a6390dd746..b5d6422f30 160000 --- a/third_party/silabs/wifi_sdk +++ b/third_party/silabs/wifi_sdk @@ -1 +1 @@ -Subproject commit a6390dd746f0067b855a6b41293159244f3ca1b4 +Subproject commit b5d6422f300cc075c7eaeec96e9f7e3f4e23bf06