Skip to content

Commit

Permalink
Fix wf200 openthread include (#22347)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jepenven-silabs @pull
jepenven-silabs authored and pull[bot] committed Sep 1, 2023
1 parent c4f4f0e commit d099d51
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 7 deletions.
4 changes: 3 additions & 1 deletion examples/chef/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
assert(!(use_wf200 && chip_enable_openthread))
if (chip_enable_wifi) {
assert(use_rs911x || use_wf200)
enable_openthread_cli = false
}

chip_data_model("chef-common") {
Expand Down Expand Up @@ -192,7 +193,8 @@ efr32_executable("chef_app") {
"src/main.cpp",
]

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
use_wf200) {
sources += [ "${examples_plat_dir}/uart.cpp" ]
}

Expand Down
4 changes: 3 additions & 1 deletion examples/light-switch-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
assert(!(use_wf200 && chip_enable_openthread))
if (chip_enable_wifi) {
assert(use_rs911x || use_wf200)
enable_openthread_cli = false
}

# ThunderBoards and Explorer Kit (No LCD)
Expand Down Expand Up @@ -185,7 +186,8 @@ efr32_executable("light_switch_app") {
"src/main.cpp",
]

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
use_wf200) {
sources += [ "${examples_plat_dir}/uart.cpp" ]
}

Expand Down
4 changes: 3 additions & 1 deletion examples/lighting-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
assert(!(use_wf200 && chip_enable_openthread))
if (chip_enable_wifi) {
assert(use_rs911x || use_wf200)
enable_openthread_cli = false
}

# ThunderBoards and Explorer Kit (No LCD)
Expand Down Expand Up @@ -190,7 +191,8 @@ efr32_executable("lighting_app") {
"src/main.cpp",
]

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
use_wf200) {
sources += [ "${examples_plat_dir}/uart.cpp" ]
}

Expand Down
4 changes: 3 additions & 1 deletion examples/lock-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ assert(!(use_rs911x && chip_enable_openthread))
assert(!(use_wf200 && chip_enable_openthread))
if (chip_enable_wifi) {
assert(use_rs911x || use_wf200)
enable_openthread_cli = false
}

# ThunderBoards and Explorer Kit (No LCD)
Expand Down Expand Up @@ -184,7 +185,8 @@ efr32_executable("lock_app") {
"src/main.cpp",
]

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
use_wf200) {
sources += [ "${examples_plat_dir}/uart.cpp" ]
}

Expand Down
3 changes: 2 additions & 1 deletion examples/shell/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ efr32_executable("shell_app") {
"src/main.cpp",
]

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
use_wf200) {
sources += [ "${examples_plat_dir}/uart.cpp" ]
}

Expand Down
4 changes: 3 additions & 1 deletion examples/thermostat/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ assert(!(use_rs911x && chip_enable_openthread))
assert(!(use_wf200 && chip_enable_openthread))
if (chip_enable_wifi) {
assert(use_rs911x || use_wf200)
enable_openthread_cli = false
}

# ThunderBoards and Explorer Kit (No LCD)
Expand Down Expand Up @@ -181,7 +182,8 @@ efr32_executable("thermostat_app") {
"src/main.cpp",
]

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
use_wf200) {
sources += [ "${examples_plat_dir}/uart.cpp" ]
}

Expand Down
3 changes: 2 additions & 1 deletion examples/window-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ assert(!(use_rs911x && chip_enable_openthread))
assert(!(use_wf200 && chip_enable_openthread))
if (chip_enable_wifi) {
assert(use_rs911x || use_wf200)
enable_openthread_cli = false
}

# ThunderBoards and Explorer Kit (No LCD)
Expand Down Expand Up @@ -178,7 +179,7 @@ efr32_executable("window_app") {
"src/main.cpp",
]

if (chip_build_libshell || enable_openthread_cli || enable_openthread_cli) {
if (chip_build_libshell || enable_openthread_cli || use_wf200) {
sources += [ "${examples_plat_dir}/uart.cpp" ]
}

Expand Down
2 changes: 2 additions & 0 deletions third_party/silabs/efr32_sdk.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ template("efr32_sdk") {
# USART include files
if ((defined(invoker.chip_enable_pw_rpc) && invoker.chip_enable_pw_rpc) ||
chip_build_libshell || enable_openthread_cli ||
(defined(invoker.use_wf200) && invoker.use_wf200) ||
(defined(invoker.show_qr_code) && invoker.show_qr_code) ||
(defined(invoker.disable_lcd) && !invoker.disable_lcd) ||
(defined(invoker.use_external_flash) && use_external_flash)) {
Expand Down Expand Up @@ -532,6 +533,7 @@ template("efr32_sdk") {
# USART sources files
if ((defined(invoker.chip_enable_pw_rpc) && invoker.chip_enable_pw_rpc) ||
chip_build_libshell || enable_openthread_cli ||
(defined(invoker.use_wf200) && invoker.use_wf200) ||
(defined(invoker.show_qr_code) && invoker.show_qr_code) ||
(defined(invoker.disable_lcd) && !invoker.disable_lcd) ||
(defined(invoker.use_external_flash) && use_external_flash)) {
Expand Down

0 comments on commit d099d51

Please sign in to comment.