Skip to content

Commit 1473388

Browse files
andygallay-silabsjepenven-silabsrestyled-commits
authored andcommitted
[Silabs] Window-app refactor (#27390)
* Window-app refactor. * Fix WiFi build * Restyled by whitespace * Restyled by clang-format * Fixed misspell in WindowManager.cpp * Removed obsolete data model usage for Silabs Window App --------- Co-authored-by: jepenven-silabs <[email protected]> Co-authored-by: Jean-Francois Penven <[email protected]> Co-authored-by: Restyled.io <[email protected]>
1 parent 58613af commit 1473388

31 files changed

+1424
-2361
lines changed

examples/platform/silabs/SiWx917/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -247,16 +247,13 @@ source_set("siwx917-common") {
247247
"${wifi_sdk_dir}/ethernetif.cpp",
248248
"${wifi_sdk_dir}/lwip_netif.cpp",
249249
"${wifi_sdk_dir}/wfx_notify.cpp",
250+
"BaseApplication.cpp",
250251
"SiWx917/rsi_if.c",
251252
"SiWx917/wfx_rsi_host.c",
252253
"init_ccpPlatform.cpp",
253254
"matter_config.cpp",
254255
]
255256

256-
if (use_base_app) {
257-
sources += [ "BaseApplication.cpp" ]
258-
}
259-
260257
if (chip_enable_pw_rpc || chip_build_libshell) {
261258
sources += [ "uart.cpp" ]
262259
}

examples/platform/silabs/args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ chip_system_project_config_include = "<CHIPProjectConfig.h>"
2222

2323
declare_args() {
2424
app_data_model = ""
25-
use_base_app = true
2625
}

examples/platform/silabs/efr32/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,11 @@ source_set("efr32-common") {
280280
"${silabs_common_plat_dir}/heap_4_silabs.c",
281281
"${silabs_common_plat_dir}/silabs_utils.cpp",
282282
"${silabs_common_plat_dir}/syscalls_stubs.cpp",
283+
"BaseApplication.cpp",
283284
"init_efrPlatform.cpp",
284285
"matter_config.cpp",
285286
]
286287

287-
if (use_base_app) {
288-
sources += [ "BaseApplication.cpp" ]
289-
}
290-
291288
if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
292289
sources += [ "uart.cpp" ]
293290
}

examples/window-app/silabs/BUILD.gn

+13-5
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,17 @@ import("//build_overrides/efr32_sdk.gni")
1818
import("//build_overrides/pigweed.gni")
1919

2020
import("${build_root}/config/defaults.gni")
21+
import("${efr32_sdk_build_root}/silabs_executable.gni")
22+
23+
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
2124
import("${chip_root}/src/platform/device.gni")
2225
import("${chip_root}/third_party/silabs/silabs_board.gni")
23-
import("${efr32_sdk_build_root}/silabs_executable.gni")
26+
27+
if (chip_enable_pw_rpc) {
28+
import("//build_overrides/pigweed.gni")
29+
import("$dir_pw_build/target_types.gni")
30+
}
31+
2432
assert(current_os == "freertos")
2533

2634
project_dir = "${chip_root}/examples/window-app"
@@ -106,10 +114,10 @@ silabs_executable("window_app") {
106114
defines = []
107115

108116
sources = [
109-
"${project_dir}/common/src/WindowApp.cpp",
110-
"${project_dir}/common/src/ZclCallbacks.cpp",
111-
"src/WindowAppImpl.cpp",
112-
"src/main.cpp",
117+
"${examples_common_plat_dir}/main.cpp",
118+
"src/AppTask.cpp",
119+
"src/WindowManager.cpp",
120+
"src/ZclCallbacks.cpp",
113121
]
114122

115123
if (!disable_lcd) {

examples/window-app/silabs/SiWx917/.gn

-27
This file was deleted.

examples/window-app/silabs/SiWx917/BUILD.gn

-107
This file was deleted.

examples/window-app/silabs/SiWx917/README.md

-166
This file was deleted.

0 commit comments

Comments
 (0)