Skip to content

Commit 476b1d3

Browse files
bhmanda-silabsrestyled-commitsCopilot
authored
[Silabs] Cleanup RS911x macros and file names (project-chip#41490)
* Cleanup rs911x macros and file names * Addressed review comments * Renamed ble files folder to siwx917_ble * Restyled by prettier-markdown * Added matter_support pointer * Removed rs911x references and moved blefiles * Resolved BUILD.gn issues * Update src/platform/silabs/SiWx/ble/sl_si91x_ble_init.h Co-authored-by: Copilot <[email protected]> * Remove wiseconnect-wifi-bt-sdk submodule * Cleaned 917 related variable names in gni * Renamed rs9117.gni to args.gni * Restyled by whitespace * Restyled by gn * Restyled by prettier-markdown * Fixed restyling error * Restyled by clang-format * Added RSI_BLE_MAX_NBR_PERIPHERALS same as wifi sdk * Created build.gn for SiWx NCP files * Deleted args.gni and resolved review comments * Restyled by gn * Update src/platform/silabs/SiWx/ble/BUILD.gn Co-authored-by: Copilot <[email protected]> * Resolved review comments * Restyled by gn * Resolved review comments * Restyled by gn * Added SiWx BLE defines in public_configs and consumed in efr_sdk and siwx917_sdk gni files * Restyled by gn * Added chip_enable_ble_siwx as true for SiWx917 SoC * Restyled by gn * Resolved review comments * Added matter_support pointer * Restyled by gn --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent febcdae commit 476b1d3

File tree

49 files changed

+248
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+248
-236
lines changed

‎docs/platforms/silabs/silabs_getting_started.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,17 @@ the BRD4187C DK is
115115
./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/ ./out/lighting-app BRD4187C
116116
```
117117

118-
To build the lighting app as an Wi-Fi MG24 + SiWx917 NCP, the default build
119-
command for the BRD4187C is
118+
To build the lighting app as an Wi-Fi MG24 + SiWx NCP, the default build command
119+
for the BRD4187C is
120120

121121
```shell
122-
./scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs/ out/lighting-app_siwx917 BRD4187C use_external_flash=false chip_enable_ble_rs911x=true --wifi SiWx917
122+
./scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs/ out/lighting-app_siwx917 BRD4187C use_external_flash=false sl_matter_enable_siwx_ble=true --wifi SiWx917
123123
```
124124

125125
> **Note**: The build argument `--wifi SiWx917` is necessary to build BRD4187C
126-
> image with the necessary code for the NCP combo. `chip_enable_ble_rs911x=true`
127-
> enables the SiWx917 NCP bluetooth. The MG24 + SiWx917 NCP combo does not yet
128-
> support external flash.
126+
> image with the necessary code for the NCP combo. `chip_enable_ble_siwx=true`
127+
> enables the SiWx NCP bluetooth. The MG24 + SiWx NCP combo does not yet support
128+
> external flash.
129129
130130
To build the lighting app as an Wi-Fi MG24 + wf200 NCP, the default build
131131
command for the BRD4187C is

‎examples/air-quality-sensor-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if (wifi_soc) {
6161
]
6262

6363
include_dirs = [
64-
"${chip_root}/src/platform/silabs/SiWx917",
64+
"${chip_root}/src/platform/silabs/SiWx",
6565
"${silabs_project_dir}/include",
6666
"${examples_plat_dir}",
6767
"${chip_root}/src/lib",

‎examples/closure-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if (wifi_soc) {
7474
]
7575

7676
include_dirs = [
77-
"${chip_root}/src/platform/silabs/SiWx917",
77+
"${chip_root}/src/platform/silabs/SiWx",
7878
"${silabs_project_dir}/include",
7979
"${examples_plat_dir}",
8080
"${chip_root}/src/lib",

‎examples/dishwasher-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if (wifi_soc) {
7474
]
7575

7676
include_dirs = [
77-
"${chip_root}/src/platform/silabs/SiWx917",
77+
"${chip_root}/src/platform/silabs/SiWx",
7878
"${silabs_project_dir}/include",
7979
"${examples_plat_dir}",
8080
"${chip_root}/src/lib",

‎examples/energy-management-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ if (wifi_soc) {
8888
]
8989

9090
include_dirs = [
91-
"${chip_root}/src/platform/silabs/SiWx917",
91+
"${chip_root}/src/platform/silabs/SiWx",
9292
"${silabs_project_dir}/include",
9393
"${examples_plat_dir}",
9494
"${chip_root}/src/lib",

‎examples/light-switch-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if (wifi_soc) {
5757
]
5858

5959
include_dirs = [
60-
"${chip_root}/src/platform/silabs/SiWx917",
60+
"${chip_root}/src/platform/silabs/SiWx",
6161
"${silabs_project_dir}/include",
6262
"${examples_plat_dir}",
6363
"${chip_root}/src/lib",

‎examples/lighting-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if (wifi_soc) {
7373
]
7474

7575
include_dirs = [
76-
"${chip_root}/src/platform/silabs/SiWx917",
76+
"${chip_root}/src/platform/silabs/SiWx",
7777
"${silabs_project_dir}/include",
7878
"${examples_plat_dir}",
7979
"${chip_root}/src/lib",

‎examples/lit-icd-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if (wifi_soc) {
5858
]
5959

6060
include_dirs = [
61-
"${chip_root}/src/platform/silabs/SiWx917",
61+
"${chip_root}/src/platform/silabs/SiWx",
6262
"${silabs_project_dir}/include",
6363
"${examples_plat_dir}",
6464
"${chip_root}/src/lib",

‎examples/lock-app/silabs/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if (wifi_soc) {
5757
]
5858

5959
include_dirs = [
60-
"${chip_root}/src/platform/silabs/SiWx917",
60+
"${chip_root}/src/platform/silabs/SiWx",
6161
"${silabs_project_dir}/include",
6262
"${examples_plat_dir}",
6363
"${chip_root}/src/lib",

‎examples/platform/silabs/MatterConfig.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
// TODO: We shouldn't need any platform specific includes in this file
4747
#if (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
48-
#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
48+
#include <platform/silabs/SiWx/SiWxPlatformInterface.h>
4949
#endif // (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
5050
#endif // SL_WIFI
5151

0 commit comments

Comments
 (0)