Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EFR32 builds - window covering is not rpc-aware #10227

Merged
merged 3 commits into from
Oct 5, 2021
Merged

Fix EFR32 builds - window covering is not rpc-aware #10227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15f5665
Only subset of efr targets are RPC aware
andy31415 Oct 5, 2021
9b22830
Fix unit tests
andy31415 Oct 5, 2021
9246df2
Restyle fixes
andy31415 Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,11 @@
"android-arm64-chip-tool",
"android-x64-chip-tool",
"android-x86-chip-tool",
"efr32-brd4161a-light-light-rpc",
"efr32-brd4161a-light-light",
"efr32-brd4161a-light-lock-rpc",
"efr32-brd4161a-light-lock",
"efr32-brd4161a-light-window-covering-rpc",
"efr32-brd4161a-light-window-covering",
"efr32-brd4161a-light-rpc",
"efr32-brd4161a-light",
"efr32-brd4161a-lock-rpc",
"efr32-brd4161a-lock",
"efr32-brd4161a-window-covering",
"esp32-c3devkit-all-clusters",
"esp32-devkitc-all-clusters",
"esp32-devkitc-bridge",
Expand Down
15 changes: 8 additions & 7 deletions scripts/build/build/targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,17 @@ def Esp32Targets():


def Efr32Targets():
target = Target('efr32-brd4161a-light', Efr32Builder,
board=Efr32Board.BRD4161A)
efr_target = Target('efr32-brd4161a', Efr32Builder,
board=Efr32Board.BRD4161A)

targets = [
target.Extend('light', app=Efr32App.LIGHT),
target.Extend('lock', app=Efr32App.LOCK),
target.Extend('window-covering', app=Efr32App.WINDOW_COVERING),
yield efr_target.Extend('window-covering', app=Efr32App.WINDOW_COVERING)

rpc_aware_targets = [
efr_target.Extend('light', app=Efr32App.LIGHT),
efr_target.Extend('lock', app=Efr32App.LOCK),
]

for target in targets:
for target in rpc_aware_targets:
yield target
yield target.Extend('rpc', enable_rpcs=True)

Expand Down
11 changes: 5 additions & 6 deletions scripts/build/testdata/all_targets_except_host.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ android-arm-chip-tool
android-arm64-chip-tool
android-x64-chip-tool
android-x86-chip-tool
efr32-brd4161a-light-light
efr32-brd4161a-light-light-rpc
efr32-brd4161a-light-lock
efr32-brd4161a-light-lock-rpc
efr32-brd4161a-light-window-covering
efr32-brd4161a-light-window-covering-rpc
efr32-brd4161a-light
efr32-brd4161a-light-rpc
efr32-brd4161a-lock
efr32-brd4161a-lock-rpc
efr32-brd4161a-window-covering
esp32-c3devkit-all-clusters
esp32-devkitc-all-clusters
esp32-devkitc-bridge
Expand Down
46 changes: 20 additions & 26 deletions scripts/build/testdata/build_all_except_host.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,20 @@ gn gen --check --fail-on-unused-args {out}/android-x86-chip-tool '--args=target_
# Accepting NDK licenses
bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'

# Generating efr32-brd4161a-light-light
gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light-light
# Generating efr32-brd4161a-light
gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light

# Generating efr32-brd4161a-light-light-rpc
gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-light-rpc
# Generating efr32-brd4161a-light-rpc
gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc

# Generating efr32-brd4161a-light-lock
gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light-lock
# Generating efr32-brd4161a-lock
gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-lock

# Generating efr32-brd4161a-light-lock-rpc
gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-lock-rpc
# Generating efr32-brd4161a-lock-rpc
gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-lock-rpc

# Generating efr32-brd4161a-light-window-covering
gn gen --check --fail-on-unused-args --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light-window-covering

# Generating efr32-brd4161a-light-window-covering-rpc
gn gen --check --fail-on-unused-args --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-window-covering-rpc
# Generating efr32-brd4161a-window-covering
gn gen --check --fail-on-unused-args --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-window-covering

# Generating esp32-c3devkit-all-clusters
cd "{root}"
Expand Down Expand Up @@ -249,23 +246,20 @@ cp {out}/android-x86-chip-tool/lib/src/platform/android/AndroidPlatform.jar {roo
# Building APP android-x86-chip-tool
{root}/src/android/CHIPTool/gradlew -p {root}/src/android/CHIPTool -PbuildDir={out}/android-x86-chip-tool assembleDebug

# Building efr32-brd4161a-light-light
ninja -C {out}/efr32-brd4161a-light-light

# Building efr32-brd4161a-light-light-rpc
ninja -C {out}/efr32-brd4161a-light-light-rpc
# Building efr32-brd4161a-light
ninja -C {out}/efr32-brd4161a-light

# Building efr32-brd4161a-light-lock
ninja -C {out}/efr32-brd4161a-light-lock
# Building efr32-brd4161a-light-rpc
ninja -C {out}/efr32-brd4161a-light-rpc

# Building efr32-brd4161a-light-lock-rpc
ninja -C {out}/efr32-brd4161a-light-lock-rpc
# Building efr32-brd4161a-lock
ninja -C {out}/efr32-brd4161a-lock

# Building efr32-brd4161a-light-window-covering
ninja -C {out}/efr32-brd4161a-light-window-covering
# Building efr32-brd4161a-lock-rpc
ninja -C {out}/efr32-brd4161a-lock-rpc

# Building efr32-brd4161a-light-window-covering-rpc
ninja -C {out}/efr32-brd4161a-light-window-covering-rpc
# Building efr32-brd4161a-window-covering
ninja -C {out}/efr32-brd4161a-window-covering

# Building esp32-c3devkit-all-clusters
bash -c 'source $IDF_PATH/export.sh; ninja -C '"'"'{out}/esp32-c3devkit-all-clusters'"'"''
Expand Down