Skip to content

Commit

Permalink
[Silabs] Window-app refactor (#27390)
Browse files Browse the repository at this point in the history
* 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 <jean-francois.penven@silabs.com>
Co-authored-by: Jean-Francois Penven <67962328+jepenven-silabs@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>
  • Loading branch information
4 people authored and pull[bot] committed Oct 23, 2023
1 parent 3849ea2 commit 1433756
Show file tree
Hide file tree
Showing 31 changed files with 1,424 additions and 2,361 deletions.
5 changes: 1 addition & 4 deletions examples/platform/silabs/SiWx917/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -247,16 +247,13 @@ source_set("siwx917-common") {
"${wifi_sdk_dir}/ethernetif.cpp",
"${wifi_sdk_dir}/lwip_netif.cpp",
"${wifi_sdk_dir}/wfx_notify.cpp",
"BaseApplication.cpp",
"SiWx917/rsi_if.c",
"SiWx917/wfx_rsi_host.c",
"init_ccpPlatform.cpp",
"matter_config.cpp",
]

if (use_base_app) {
sources += [ "BaseApplication.cpp" ]
}

if (chip_enable_pw_rpc || chip_build_libshell) {
sources += [ "uart.cpp" ]
}
Expand Down
1 change: 0 additions & 1 deletion examples/platform/silabs/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ chip_system_project_config_include = "<CHIPProjectConfig.h>"

declare_args() {
app_data_model = ""
use_base_app = true
}
5 changes: 1 addition & 4 deletions examples/platform/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,11 @@ source_set("efr32-common") {
"${silabs_common_plat_dir}/heap_4_silabs.c",
"${silabs_common_plat_dir}/silabs_utils.cpp",
"${silabs_common_plat_dir}/syscalls_stubs.cpp",
"BaseApplication.cpp",
"init_efrPlatform.cpp",
"matter_config.cpp",
]

if (use_base_app) {
sources += [ "BaseApplication.cpp" ]
}

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
sources += [ "uart.cpp" ]
}
Expand Down
18 changes: 13 additions & 5 deletions examples/window-app/silabs/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,17 @@ import("//build_overrides/efr32_sdk.gni")
import("//build_overrides/pigweed.gni")

import("${build_root}/config/defaults.gni")
import("${efr32_sdk_build_root}/silabs_executable.gni")

import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
import("${chip_root}/src/platform/device.gni")
import("${chip_root}/third_party/silabs/silabs_board.gni")
import("${efr32_sdk_build_root}/silabs_executable.gni")

if (chip_enable_pw_rpc) {
import("//build_overrides/pigweed.gni")
import("$dir_pw_build/target_types.gni")
}

assert(current_os == "freertos")

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

sources = [
"${project_dir}/common/src/WindowApp.cpp",
"${project_dir}/common/src/ZclCallbacks.cpp",
"src/WindowAppImpl.cpp",
"src/main.cpp",
"${examples_common_plat_dir}/main.cpp",
"src/AppTask.cpp",
"src/WindowManager.cpp",
"src/ZclCallbacks.cpp",
]

if (!disable_lcd) {
Expand Down
27 changes: 0 additions & 27 deletions examples/window-app/silabs/SiWx917/.gn

This file was deleted.

107 changes: 0 additions & 107 deletions examples/window-app/silabs/SiWx917/BUILD.gn

This file was deleted.

166 changes: 0 additions & 166 deletions examples/window-app/silabs/SiWx917/README.md

This file was deleted.

Loading

0 comments on commit 1433756

Please sign in to comment.