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

[Silabs] Modified folder structure #24031

Merged
merged 2 commits into from
Dec 13, 2022
Merged

[Silabs] Modified folder structure #24031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
575fac2
Modified folder structure
ShubhamMalasane Dec 12, 2022
558da86
modified symbolic link
ShubhamMalasane Dec 12, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
timeout-minutes: 15
run: |
scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
- name: Clean out build output
Expand Down
1 change: 0 additions & 1 deletion examples/light-switch-app/efr32/build_overrides
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion examples/light-switch-app/efr32/third_party/connectedhomeip
View file
Open in desktop

This file was deleted.

0 examples/light-switch-app/efr32/.gn → examples/light-switch-app/silabs/efr32/.gn
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/light-switch-app/efr32/BUILD.gn → ...es/light-switch-app/silabs/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) {

assert(current_os == "freertos")

efr32_project_dir = "${chip_root}/examples/light-switch-app/efr32"
efr32_project_dir = "${chip_root}/examples/light-switch-app/silabs/efr32"
examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
examples_common_plat_dir = "${chip_root}/examples/platform/silabs"

Expand Down
0 examples/light-switch-app/efr32/README.md → ...s/light-switch-app/silabs/efr32/README.md
View file
Open in desktop
File renamed without changes.
0 examples/light-switch-app/efr32/args.gni → ...es/light-switch-app/silabs/efr32/args.gni
View file
Open in desktop
File renamed without changes.
0 ...-switch-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni
View file
Open in desktop
File renamed without changes.
0 ...switch-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions examples/light-switch-app/silabs/efr32/build_overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../build_overrides
0 ...ight-switch-app/efr32/include/AppConfig.h → ...itch-app/silabs/efr32/include/AppConfig.h
View file
Open in desktop
File renamed without changes.
0 ...light-switch-app/efr32/include/AppEvent.h → ...witch-app/silabs/efr32/include/AppEvent.h
View file
Open in desktop
File renamed without changes.
0 .../light-switch-app/efr32/include/AppTask.h → ...switch-app/silabs/efr32/include/AppTask.h
View file
Open in desktop
File renamed without changes.
0 ...tch-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h
View file
Open in desktop
File renamed without changes.
0 ...witch-app/efr32/include/binding-handler.h → ...pp/silabs/efr32/include/binding-handler.h
View file
Open in desktop
File renamed without changes.
0 ...es/light-switch-app/efr32/src/AppTask.cpp → ...t-switch-app/silabs/efr32/src/AppTask.cpp
View file
Open in desktop
File renamed without changes.
0 ...ght-switch-app/efr32/src/ZclCallbacks.cpp → ...tch-app/silabs/efr32/src/ZclCallbacks.cpp
View file
Open in desktop
File renamed without changes.
0 ...-switch-app/efr32/src/binding-handler.cpp → ...-app/silabs/efr32/src/binding-handler.cpp
View file
Open in desktop
File renamed without changes.
0 examples/light-switch-app/efr32/src/main.cpp → ...ight-switch-app/silabs/efr32/src/main.cpp
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions examples/light-switch-app/silabs/efr32/third_party/connectedhomeip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../..
1 change: 0 additions & 1 deletion examples/lock-app/efr32/build_overrides
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion examples/lock-app/efr32/third_party/connectedhomeip
View file
Open in desktop

This file was deleted.

0 examples/lock-app/efr32/.gn → examples/lock-app/silabs/efr32/.gn
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/lock-app/efr32/BUILD.gn → examples/lock-app/silabs/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) {

assert(current_os == "freertos")

efr32_project_dir = "${chip_root}/examples/lock-app/efr32"
efr32_project_dir = "${chip_root}/examples/lock-app/silabs/efr32"
examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
examples_common_plat_dir = "${chip_root}/examples/platform/silabs"

Expand Down
0 examples/lock-app/efr32/README.md → examples/lock-app/silabs/efr32/README.md
View file
Open in desktop
File renamed without changes.
0 examples/lock-app/efr32/args.gni → examples/lock-app/silabs/efr32/args.gni
View file
Open in desktop
File renamed without changes.
0 ...es/lock-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni
View file
Open in desktop
File renamed without changes.
0 ...s/lock-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions examples/lock-app/silabs/efr32/build_overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../build_overrides
0 examples/lock-app/efr32/include/AppConfig.h → ...lock-app/silabs/efr32/include/AppConfig.h
View file
Open in desktop
File renamed without changes.
0 examples/lock-app/efr32/include/AppEvent.h → .../lock-app/silabs/efr32/include/AppEvent.h
View file
Open in desktop
File renamed without changes.
0 examples/lock-app/efr32/include/AppTask.h → ...s/lock-app/silabs/efr32/include/AppTask.h
View file
Open in desktop
File renamed without changes.
0 ...ock-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h
View file
Open in desktop
File renamed without changes.
0 ...-app/efr32/include/EventHandlerLibShell.h → ...labs/efr32/include/EventHandlerLibShell.h
View file
Open in desktop
File renamed without changes.
0 ...ples/lock-app/efr32/include/LockManager.h → ...ck-app/silabs/efr32/include/LockManager.h
View file
Open in desktop
File renamed without changes.
0 examples/lock-app/efr32/src/AppTask.cpp → ...les/lock-app/silabs/efr32/src/AppTask.cpp
View file
Open in desktop
File renamed without changes.
0 ...ck-app/efr32/src/EventHandlerLibShell.cpp → ...silabs/efr32/src/EventHandlerLibShell.cpp
View file
Open in desktop
File renamed without changes.
0 examples/lock-app/efr32/src/LockManager.cpp → ...lock-app/silabs/efr32/src/LockManager.cpp
View file
Open in desktop
File renamed without changes.
0 examples/lock-app/efr32/src/ZclCallbacks.cpp → ...ock-app/silabs/efr32/src/ZclCallbacks.cpp
View file
Open in desktop
File renamed without changes.
0 examples/lock-app/efr32/src/main.cpp → examples/lock-app/silabs/efr32/src/main.cpp
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions examples/lock-app/silabs/efr32/third_party/connectedhomeip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../..
0 examples/lock-app/efr32/with_pw_rpc.gni → ...les/lock-app/silabs/efr32/with_pw_rpc.gni
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion examples/window-app/efr32/build_overrides
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion examples/window-app/efr32/third_party/connectedhomeip
View file
Open in desktop

This file was deleted.

0 examples/window-app/efr32/.gn → examples/window-app/silabs/efr32/.gn
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/window-app/efr32/BUILD.gn → examples/window-app/silabs/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import("${efr32_sdk_build_root}/efr32_sdk.gni")
assert(current_os == "freertos")

project_dir = "${chip_root}/examples/window-app"
efr32_project_dir = "${project_dir}/efr32"
efr32_project_dir = "${project_dir}/silabs/efr32"
examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
examples_common_plat_dir = "${chip_root}/examples/platform/silabs"

Expand Down
0 examples/window-app/efr32/README.md → examples/window-app/silabs/efr32/README.md
View file
Open in desktop
File renamed without changes.
0 examples/window-app/efr32/args.gni → examples/window-app/silabs/efr32/args.gni
View file
Open in desktop
File renamed without changes.
0 .../window-app/efr32/build_for_wifi_args.gni → ...-app/silabs/efr32/build_for_wifi_args.gni
View file
Open in desktop
File renamed without changes.
0 ...window-app/efr32/build_for_wifi_gnfile.gn → ...app/silabs/efr32/build_for_wifi_gnfile.gn
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions examples/window-app/silabs/efr32/build_overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../build_overrides
0 ...ples/window-app/efr32/include/AppConfig.h → ...ndow-app/silabs/efr32/include/AppConfig.h
View file
Open in desktop
File renamed without changes.
0 ...dow-app/efr32/include/CHIPProjectConfig.h → .../silabs/efr32/include/CHIPProjectConfig.h
View file
Open in desktop
File renamed without changes.
0 ...les/window-app/efr32/include/LcdPainter.h → ...dow-app/silabs/efr32/include/LcdPainter.h
View file
Open in desktop
File renamed without changes.
0 .../window-app/efr32/include/WindowAppImpl.h → ...-app/silabs/efr32/include/WindowAppImpl.h
View file
Open in desktop
File renamed without changes.
0 examples/window-app/efr32/src/LcdPainter.cpp → ...indow-app/silabs/efr32/src/LcdPainter.cpp
View file
Open in desktop
File renamed without changes.
0 ...es/window-app/efr32/src/WindowAppImpl.cpp → ...ow-app/silabs/efr32/src/WindowAppImpl.cpp
View file
Open in desktop
File renamed without changes.
0 examples/window-app/efr32/src/main.cpp → ...ples/window-app/silabs/efr32/src/main.cpp
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions examples/window-app/silabs/efr32/third_party/connectedhomeip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../..
4 changes: 1 addition & 3 deletions scripts/build/builders/efr32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,8 @@ def FlashBundleName(self):
def BuildRoot(self, root):
if self == Efr32App.UNIT_TEST:
return os.path.join(root, 'src', 'test_driver', 'efr32')
if self == Efr32App.LIGHT:
return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32')
else:
return os.path.join(root, 'examples', self.ExampleName(), 'efr32')
return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32')


class Efr32Board(Enum):
Expand Down