From 2278936444441251d50a941bad3b04eaf9c89ed9 Mon Sep 17 00:00:00 2001 From: Jean-Francois Penven <67962328+jepenven-silabs@users.noreply.github.com> Date: Wed, 24 May 2023 21:25:07 -0400 Subject: [PATCH] [Silabs] Rename examples folder (#26766) * rename build scripts * Rename Lighting-silabs * Rename light-switch-app * Rename Lock-app * rename thermostat * rename silabs chef * Fix build CI * fix doc * fix doc * regen matter * fix ci --------- Co-authored-by: Andrei Litvin --- .github/workflows/examples-efr32.yaml | 6 ++-- .github/workflows/release_artifacts.yaml | 2 +- docs/guides/darwin.md | 2 +- examples/chef/chef.py | 2 +- examples/chef/{efr32 => silabs}/.gn | 0 examples/chef/{efr32 => silabs}/BUILD.gn | 0 examples/chef/{efr32 => silabs}/args.gni | 0 .../{efr32 => silabs}/build_for_wifi_args.gni | 0 .../build_for_wifi_gnfile.gn | 0 .../chef/{efr32 => silabs}/build_overrides | 0 .../{efr32 => silabs}/include/AppConfig.h | 0 .../chef/{efr32 => silabs}/include/AppEvent.h | 0 .../chef/{efr32 => silabs}/include/AppTask.h | 0 .../include/CHIPProjectConfig.h | 0 .../include/LightingManager.h | 0 .../chef/{efr32 => silabs}/src/AppTask.cpp | 0 .../{efr32 => silabs}/src/LightingManager.cpp | 0 .../{efr32 => silabs}/src/ZclCallbacks.cpp | 0 .../third_party/connectedhomeip | 0 .../chef/{efr32 => silabs}/with_pw_rpc.gni | 0 .../light-switch-app/silabs/{efr32 => }/.gn | 0 .../silabs/{efr32 => }/BUILD.gn | 16 +++------- .../silabs/{efr32 => }/README.md | 22 ++++++------- .../{efr32 => }/build_for_wifi_args.gni | 0 .../{efr32 => }/build_for_wifi_gnfile.gn | 0 .../light-switch-app/silabs/build_overrides | 1 + .../silabs/efr32/build_overrides | 1 - .../silabs/efr32/third_party/connectedhomeip | 1 - .../silabs/{efr32 => }/include/AppConfig.h | 0 .../silabs/{efr32 => }/include/AppEvent.h | 0 .../silabs/{efr32 => }/include/AppTask.h | 0 .../{common => include}/BindingHandler.h | 0 .../{efr32 => }/include/CHIPProjectConfig.h | 0 .../{common => include}/LightSwitchMgr.h | 0 .../{common => include}/ShellCommands.h | 0 .../silabs/{efr32 => }/openthread.gn | 0 .../silabs/{efr32 => }/openthread.gni | 0 .../silabs/{efr32 => }/src/AppTask.cpp | 0 .../silabs/{common => src}/BindingHandler.cpp | 0 .../silabs/{common => src}/LightSwitchMgr.cpp | 0 .../silabs/{common => src}/ShellCommands.cpp | 0 .../silabs/{efr32 => }/src/ZclCallbacks.cpp | 0 .../silabs/third_party/connectedhomeip | 1 + examples/lighting-app/silabs/{efr32 => }/.gn | 0 .../lighting-app/silabs/{efr32 => }/BUILD.gn | 2 +- .../lighting-app/silabs/{efr32 => }/README.md | 20 ++++++------ examples/lighting-app/silabs/SiWx917/args.gni | 21 ------------ .../silabs/SiWx917/with_pw_rpc.gni | 32 ------------------- .../{efr32 => }/build_for_wifi_args.gni | 2 +- .../{efr32 => }/build_for_wifi_gnfile.gn | 0 examples/lighting-app/silabs/build_overrides | 1 + .../silabs/{efr32 => }/data_model/BUILD.gn | 0 .../data_model/lighting-thread-app.matter | 0 .../data_model/lighting-thread-app.zap | 4 +-- .../data_model/lighting-wifi-app.matter | 0 .../data_model/lighting-wifi-app.zap | 4 +-- .../lighting-app/silabs/efr32/build_overrides | 1 - .../silabs/efr32/third_party/connectedhomeip | 1 - .../silabs/{efr32 => }/include/AppConfig.h | 0 .../silabs/{efr32 => }/include/AppEvent.h | 0 .../silabs/{efr32 => }/include/AppTask.h | 0 .../{efr32 => }/include/CHIPProjectConfig.h | 0 .../{efr32 => }/include/LightingManager.h | 0 .../silabs/{efr32 => }/openthread.gn | 0 .../silabs/{efr32 => }/openthread.gni | 2 +- .../silabs/{efr32 => }/src/AppTask.cpp | 0 .../{efr32 => }/src/LightingManager.cpp | 0 .../silabs/{efr32 => }/src/ZclCallbacks.cpp | 0 .../silabs/third_party/connectedhomeip | 1 + .../silabs/{efr32 => }/with_pw_rpc.gni | 0 examples/lock-app/silabs/{efr32 => }/.gn | 0 examples/lock-app/silabs/{efr32 => }/BUILD.gn | 2 +- .../lock-app/silabs/{efr32 => }/README.md | 18 +++++------ examples/lock-app/silabs/{efr32 => }/args.gni | 0 .../{efr32 => }/build_for_wifi_args.gni | 0 .../{efr32 => }/build_for_wifi_gnfile.gn | 0 examples/lock-app/silabs/build_overrides | 1 + .../lock-app/silabs/efr32/build_overrides | 1 - .../silabs/efr32/third_party/connectedhomeip | 1 - .../silabs/{efr32 => }/include/AppConfig.h | 0 .../silabs/{efr32 => }/include/AppEvent.h | 0 .../silabs/{efr32 => }/include/AppTask.h | 0 .../{efr32 => }/include/CHIPProjectConfig.h | 0 .../include/EventHandlerLibShell.h | 0 .../silabs/{efr32 => }/include/LockManager.h | 0 .../lock-app/silabs/{efr32 => }/openthread.gn | 0 .../silabs/{efr32 => }/openthread.gni | 0 .../silabs/{efr32 => }/src/AppTask.cpp | 0 .../{efr32 => }/src/EventHandlerLibShell.cpp | 0 .../silabs/{efr32 => }/src/LockManager.cpp | 0 .../silabs/{efr32 => }/src/ZclCallbacks.cpp | 0 .../silabs/third_party/connectedhomeip | 1 + .../silabs/{efr32 => }/with_pw_rpc.gni | 0 examples/thermostat/silabs/{efr32 => }/.gn | 0 .../thermostat/silabs/{efr32 => }/BUILD.gn | 2 +- .../thermostat/silabs/{efr32 => }/README.md | 22 ++++++------- .../{efr32 => }/build_for_wifi_args.gni | 0 .../{efr32 => }/build_for_wifi_gnfile.gn | 0 examples/thermostat/silabs/build_overrides | 1 + .../thermostat/silabs/efr32/build_overrides | 1 - .../silabs/efr32/third_party/connectedhomeip | 1 - .../silabs/{efr32 => }/include/AppConfig.h | 0 .../silabs/{efr32 => }/include/AppEvent.h | 0 .../silabs/{efr32 => }/include/AppTask.h | 0 .../{efr32 => }/include/CHIPProjectConfig.h | 0 .../{efr32 => }/include/SensorManager.h | 0 .../{efr32 => }/include/TemperatureManager.h | 0 .../{efr32 => }/include/ThermostatIcons.h | 0 .../silabs/{efr32 => }/include/ThermostatUI.h | 0 .../silabs/{efr32 => }/openthread.gn | 0 .../silabs/{efr32 => }/openthread.gni | 0 .../silabs/{efr32 => }/src/AppTask.cpp | 0 .../silabs/{efr32 => }/src/SensorManager.cpp | 0 .../{efr32 => }/src/TemperatureManager.cpp | 0 .../silabs/{efr32 => }/src/ThermostatUI.cpp | 0 .../silabs/{efr32 => }/src/ZclCallbacks.cpp | 0 .../silabs/third_party/connectedhomeip | 1 + examples/window-app/silabs/{efr32 => }/.gn | 0 .../window-app/silabs/{efr32 => }/BUILD.gn | 2 +- .../window-app/silabs/{efr32 => }/README.md | 18 +++++------ .../window-app/silabs/{efr32 => }/args.gni | 0 .../{efr32 => }/build_for_wifi_args.gni | 0 .../{efr32 => }/build_for_wifi_gnfile.gn | 0 examples/window-app/silabs/build_overrides | 1 + .../window-app/silabs/efr32/build_overrides | 1 - .../silabs/efr32/third_party/connectedhomeip | 1 - .../silabs/{efr32 => }/include/AppConfig.h | 0 .../{efr32 => }/include/CHIPProjectConfig.h | 0 .../silabs/{efr32 => }/include/LcdPainter.h | 0 .../{efr32 => }/include/WindowAppImpl.h | 0 .../silabs/{efr32 => }/openthread.gn | 0 .../silabs/{efr32 => }/openthread.gni | 0 .../silabs/{efr32 => }/src/LcdPainter.cpp | 0 .../silabs/{efr32 => }/src/WindowAppImpl.cpp | 0 .../silabs/{efr32 => }/src/main.cpp | 0 .../silabs/third_party/connectedhomeip | 1 + scripts/build/builders/efr32.py | 2 +- ...un_efr32-brd4161a-light-rpc-no-version.txt | 2 +- ..._efr32_example.sh => gn_silabs_example.sh} | 2 +- 139 files changed, 84 insertions(+), 143 deletions(-) rename examples/chef/{efr32 => silabs}/.gn (100%) rename examples/chef/{efr32 => silabs}/BUILD.gn (100%) rename examples/chef/{efr32 => silabs}/args.gni (100%) rename examples/chef/{efr32 => silabs}/build_for_wifi_args.gni (100%) rename examples/chef/{efr32 => silabs}/build_for_wifi_gnfile.gn (100%) rename examples/chef/{efr32 => silabs}/build_overrides (100%) rename examples/chef/{efr32 => silabs}/include/AppConfig.h (100%) rename examples/chef/{efr32 => silabs}/include/AppEvent.h (100%) rename examples/chef/{efr32 => silabs}/include/AppTask.h (100%) rename examples/chef/{efr32 => silabs}/include/CHIPProjectConfig.h (100%) rename examples/chef/{efr32 => silabs}/include/LightingManager.h (100%) rename examples/chef/{efr32 => silabs}/src/AppTask.cpp (100%) rename examples/chef/{efr32 => silabs}/src/LightingManager.cpp (100%) rename examples/chef/{efr32 => silabs}/src/ZclCallbacks.cpp (100%) rename examples/chef/{efr32 => silabs}/third_party/connectedhomeip (100%) rename examples/chef/{efr32 => silabs}/with_pw_rpc.gni (100%) rename examples/light-switch-app/silabs/{efr32 => }/.gn (100%) rename examples/light-switch-app/silabs/{efr32 => }/BUILD.gn (92%) rename examples/light-switch-app/silabs/{efr32 => }/README.md (92%) rename examples/light-switch-app/silabs/{efr32 => }/build_for_wifi_args.gni (100%) rename examples/light-switch-app/silabs/{efr32 => }/build_for_wifi_gnfile.gn (100%) create mode 120000 examples/light-switch-app/silabs/build_overrides delete mode 120000 examples/light-switch-app/silabs/efr32/build_overrides delete mode 120000 examples/light-switch-app/silabs/efr32/third_party/connectedhomeip rename examples/light-switch-app/silabs/{efr32 => }/include/AppConfig.h (100%) rename examples/light-switch-app/silabs/{efr32 => }/include/AppEvent.h (100%) rename examples/light-switch-app/silabs/{efr32 => }/include/AppTask.h (100%) rename examples/light-switch-app/silabs/{common => include}/BindingHandler.h (100%) rename examples/light-switch-app/silabs/{efr32 => }/include/CHIPProjectConfig.h (100%) rename examples/light-switch-app/silabs/{common => include}/LightSwitchMgr.h (100%) rename examples/light-switch-app/silabs/{common => include}/ShellCommands.h (100%) rename examples/light-switch-app/silabs/{efr32 => }/openthread.gn (100%) rename examples/light-switch-app/silabs/{efr32 => }/openthread.gni (100%) rename examples/light-switch-app/silabs/{efr32 => }/src/AppTask.cpp (100%) rename examples/light-switch-app/silabs/{common => src}/BindingHandler.cpp (100%) rename examples/light-switch-app/silabs/{common => src}/LightSwitchMgr.cpp (100%) rename examples/light-switch-app/silabs/{common => src}/ShellCommands.cpp (100%) rename examples/light-switch-app/silabs/{efr32 => }/src/ZclCallbacks.cpp (100%) create mode 120000 examples/light-switch-app/silabs/third_party/connectedhomeip rename examples/lighting-app/silabs/{efr32 => }/.gn (100%) rename examples/lighting-app/silabs/{efr32 => }/BUILD.gn (98%) rename examples/lighting-app/silabs/{efr32 => }/README.md (92%) delete mode 100644 examples/lighting-app/silabs/SiWx917/args.gni delete mode 100644 examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni rename examples/lighting-app/silabs/{efr32 => }/build_for_wifi_args.gni (91%) rename examples/lighting-app/silabs/{efr32 => }/build_for_wifi_gnfile.gn (100%) create mode 120000 examples/lighting-app/silabs/build_overrides rename examples/lighting-app/silabs/{efr32 => }/data_model/BUILD.gn (100%) rename examples/lighting-app/silabs/{efr32 => }/data_model/lighting-thread-app.matter (100%) rename examples/lighting-app/silabs/{efr32 => }/data_model/lighting-thread-app.zap (99%) rename examples/lighting-app/silabs/{efr32 => }/data_model/lighting-wifi-app.matter (100%) rename examples/lighting-app/silabs/{efr32 => }/data_model/lighting-wifi-app.zap (99%) delete mode 120000 examples/lighting-app/silabs/efr32/build_overrides delete mode 120000 examples/lighting-app/silabs/efr32/third_party/connectedhomeip rename examples/lighting-app/silabs/{efr32 => }/include/AppConfig.h (100%) rename examples/lighting-app/silabs/{efr32 => }/include/AppEvent.h (100%) rename examples/lighting-app/silabs/{efr32 => }/include/AppTask.h (100%) rename examples/lighting-app/silabs/{efr32 => }/include/CHIPProjectConfig.h (100%) rename examples/lighting-app/silabs/{efr32 => }/include/LightingManager.h (100%) rename examples/lighting-app/silabs/{efr32 => }/openthread.gn (100%) rename examples/lighting-app/silabs/{efr32 => }/openthread.gni (92%) rename examples/lighting-app/silabs/{efr32 => }/src/AppTask.cpp (100%) rename examples/lighting-app/silabs/{efr32 => }/src/LightingManager.cpp (100%) rename examples/lighting-app/silabs/{efr32 => }/src/ZclCallbacks.cpp (100%) create mode 120000 examples/lighting-app/silabs/third_party/connectedhomeip rename examples/lighting-app/silabs/{efr32 => }/with_pw_rpc.gni (100%) rename examples/lock-app/silabs/{efr32 => }/.gn (100%) rename examples/lock-app/silabs/{efr32 => }/BUILD.gn (98%) rename examples/lock-app/silabs/{efr32 => }/README.md (93%) rename examples/lock-app/silabs/{efr32 => }/args.gni (100%) rename examples/lock-app/silabs/{efr32 => }/build_for_wifi_args.gni (100%) rename examples/lock-app/silabs/{efr32 => }/build_for_wifi_gnfile.gn (100%) create mode 120000 examples/lock-app/silabs/build_overrides delete mode 120000 examples/lock-app/silabs/efr32/build_overrides delete mode 120000 examples/lock-app/silabs/efr32/third_party/connectedhomeip rename examples/lock-app/silabs/{efr32 => }/include/AppConfig.h (100%) rename examples/lock-app/silabs/{efr32 => }/include/AppEvent.h (100%) rename examples/lock-app/silabs/{efr32 => }/include/AppTask.h (100%) rename examples/lock-app/silabs/{efr32 => }/include/CHIPProjectConfig.h (100%) rename examples/lock-app/silabs/{efr32 => }/include/EventHandlerLibShell.h (100%) rename examples/lock-app/silabs/{efr32 => }/include/LockManager.h (100%) rename examples/lock-app/silabs/{efr32 => }/openthread.gn (100%) rename examples/lock-app/silabs/{efr32 => }/openthread.gni (100%) rename examples/lock-app/silabs/{efr32 => }/src/AppTask.cpp (100%) rename examples/lock-app/silabs/{efr32 => }/src/EventHandlerLibShell.cpp (100%) rename examples/lock-app/silabs/{efr32 => }/src/LockManager.cpp (100%) rename examples/lock-app/silabs/{efr32 => }/src/ZclCallbacks.cpp (100%) create mode 120000 examples/lock-app/silabs/third_party/connectedhomeip rename examples/lock-app/silabs/{efr32 => }/with_pw_rpc.gni (100%) rename examples/thermostat/silabs/{efr32 => }/.gn (100%) rename examples/thermostat/silabs/{efr32 => }/BUILD.gn (98%) rename examples/thermostat/silabs/{efr32 => }/README.md (91%) rename examples/thermostat/silabs/{efr32 => }/build_for_wifi_args.gni (100%) rename examples/thermostat/silabs/{efr32 => }/build_for_wifi_gnfile.gn (100%) create mode 120000 examples/thermostat/silabs/build_overrides delete mode 120000 examples/thermostat/silabs/efr32/build_overrides delete mode 120000 examples/thermostat/silabs/efr32/third_party/connectedhomeip rename examples/thermostat/silabs/{efr32 => }/include/AppConfig.h (100%) rename examples/thermostat/silabs/{efr32 => }/include/AppEvent.h (100%) rename examples/thermostat/silabs/{efr32 => }/include/AppTask.h (100%) rename examples/thermostat/silabs/{efr32 => }/include/CHIPProjectConfig.h (100%) rename examples/thermostat/silabs/{efr32 => }/include/SensorManager.h (100%) rename examples/thermostat/silabs/{efr32 => }/include/TemperatureManager.h (100%) rename examples/thermostat/silabs/{efr32 => }/include/ThermostatIcons.h (100%) rename examples/thermostat/silabs/{efr32 => }/include/ThermostatUI.h (100%) rename examples/thermostat/silabs/{efr32 => }/openthread.gn (100%) rename examples/thermostat/silabs/{efr32 => }/openthread.gni (100%) rename examples/thermostat/silabs/{efr32 => }/src/AppTask.cpp (100%) rename examples/thermostat/silabs/{efr32 => }/src/SensorManager.cpp (100%) rename examples/thermostat/silabs/{efr32 => }/src/TemperatureManager.cpp (100%) rename examples/thermostat/silabs/{efr32 => }/src/ThermostatUI.cpp (100%) rename examples/thermostat/silabs/{efr32 => }/src/ZclCallbacks.cpp (100%) create mode 120000 examples/thermostat/silabs/third_party/connectedhomeip rename examples/window-app/silabs/{efr32 => }/.gn (100%) rename examples/window-app/silabs/{efr32 => }/BUILD.gn (98%) rename examples/window-app/silabs/{efr32 => }/README.md (93%) rename examples/window-app/silabs/{efr32 => }/args.gni (100%) rename examples/window-app/silabs/{efr32 => }/build_for_wifi_args.gni (100%) rename examples/window-app/silabs/{efr32 => }/build_for_wifi_gnfile.gn (100%) create mode 120000 examples/window-app/silabs/build_overrides delete mode 120000 examples/window-app/silabs/efr32/build_overrides delete mode 120000 examples/window-app/silabs/efr32/third_party/connectedhomeip rename examples/window-app/silabs/{efr32 => }/include/AppConfig.h (100%) rename examples/window-app/silabs/{efr32 => }/include/CHIPProjectConfig.h (100%) rename examples/window-app/silabs/{efr32 => }/include/LcdPainter.h (100%) rename examples/window-app/silabs/{efr32 => }/include/WindowAppImpl.h (100%) rename examples/window-app/silabs/{efr32 => }/openthread.gn (100%) rename examples/window-app/silabs/{efr32 => }/openthread.gni (100%) rename examples/window-app/silabs/{efr32 => }/src/LcdPainter.cpp (100%) rename examples/window-app/silabs/{efr32 => }/src/WindowAppImpl.cpp (100%) rename examples/window-app/silabs/{efr32 => }/src/main.cpp (100%) create mode 120000 examples/window-app/silabs/third_party/connectedhomeip rename scripts/examples/{gn_efr32_example.sh => gn_silabs_example.sh} (98%) diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 17e0b5617b2230..d8961dde06c5a1 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -87,7 +87,7 @@ jobs: - name: Test SLC gen timeout-minutes: 30 run: | - scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32 ./out/light-app BRD4187C --slc_generate --docker + scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker rm -rf ./out/ - name: Build some BRD4187C variants timeout-minutes: 90 @@ -120,7 +120,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/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker + scripts/examples/gn_silabs_example.sh examples/lock-app/silabs out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \ out/lock_app_wifi_wf200/BRD4161A/matter-silabs-lock-example.out /tmp/bloat_reports/ - name: Clean out build output @@ -128,7 +128,7 @@ jobs: - name: Build example EFR32+RS9116 WiFi Lighting app for BRD4161A timeout-minutes: 15 run: | - scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker + scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs9116 lighting-app \ out/lighting_app_wifi_rs9116/BRD4161A/matter-silabs-lighting-example.out /tmp/bloat_reports/ - name: Clean out build output diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index 314600d3e588ff..fc371f695ab25e 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -124,7 +124,7 @@ jobs: .environment/pigweed-venv/*.log - name: Build example EFR32 Lock App - run: scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ + run: scripts/examples/gn_silabs_example.sh examples/lock-app/efr32/ out/lock_app_debug $SILABS_BOARD - name: Upload artifact diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md index b83a943e325731..197023c3c99580 100644 --- a/docs/guides/darwin.md +++ b/docs/guides/darwin.md @@ -252,7 +252,7 @@ Example: ##### Guides - [Bouffalo Lab](/examples/lighting-app/bouffalolab/README.md) -- [EFR32 Window Covering](/examples/window-app/silabs/efr32/README.md) +- [EFR32 Window Covering](/examples/window-app/silabs/README.md) - [ESP32 All Clusters](/examples/all-clusters-app/esp32/README.md) - [ESP32 Lighting](/examples/lighting-app/esp32/README.md) - [ESP32 Temperature Sensor](/examples/temperature-measurement-app/esp32/README.md) diff --git a/examples/chef/chef.py b/examples/chef/chef.py index 516d51e3abde4e..b663a49f495676 100755 --- a/examples/chef/chef.py +++ b/examples/chef/chef.py @@ -662,7 +662,7 @@ def main() -> int: shell.run_cmd(f"rm -rf out/{options.sample_device_type_name}") efr32_cmd_args = [] efr32_cmd_args.append( - f'{_REPO_BASE_PATH}/scripts/examples/gn_efr32_example.sh') + f'{_REPO_BASE_PATH}/scripts/examples/gn_silabs_example.sh') efr32_cmd_args.append('./') efr32_cmd_args.append(f'out/{options.sample_device_type_name}') efr32_cmd_args.append(f'{silabs_board}') diff --git a/examples/chef/efr32/.gn b/examples/chef/silabs/.gn similarity index 100% rename from examples/chef/efr32/.gn rename to examples/chef/silabs/.gn diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/silabs/BUILD.gn similarity index 100% rename from examples/chef/efr32/BUILD.gn rename to examples/chef/silabs/BUILD.gn diff --git a/examples/chef/efr32/args.gni b/examples/chef/silabs/args.gni similarity index 100% rename from examples/chef/efr32/args.gni rename to examples/chef/silabs/args.gni diff --git a/examples/chef/efr32/build_for_wifi_args.gni b/examples/chef/silabs/build_for_wifi_args.gni similarity index 100% rename from examples/chef/efr32/build_for_wifi_args.gni rename to examples/chef/silabs/build_for_wifi_args.gni diff --git a/examples/chef/efr32/build_for_wifi_gnfile.gn b/examples/chef/silabs/build_for_wifi_gnfile.gn similarity index 100% rename from examples/chef/efr32/build_for_wifi_gnfile.gn rename to examples/chef/silabs/build_for_wifi_gnfile.gn diff --git a/examples/chef/efr32/build_overrides b/examples/chef/silabs/build_overrides similarity index 100% rename from examples/chef/efr32/build_overrides rename to examples/chef/silabs/build_overrides diff --git a/examples/chef/efr32/include/AppConfig.h b/examples/chef/silabs/include/AppConfig.h similarity index 100% rename from examples/chef/efr32/include/AppConfig.h rename to examples/chef/silabs/include/AppConfig.h diff --git a/examples/chef/efr32/include/AppEvent.h b/examples/chef/silabs/include/AppEvent.h similarity index 100% rename from examples/chef/efr32/include/AppEvent.h rename to examples/chef/silabs/include/AppEvent.h diff --git a/examples/chef/efr32/include/AppTask.h b/examples/chef/silabs/include/AppTask.h similarity index 100% rename from examples/chef/efr32/include/AppTask.h rename to examples/chef/silabs/include/AppTask.h diff --git a/examples/chef/efr32/include/CHIPProjectConfig.h b/examples/chef/silabs/include/CHIPProjectConfig.h similarity index 100% rename from examples/chef/efr32/include/CHIPProjectConfig.h rename to examples/chef/silabs/include/CHIPProjectConfig.h diff --git a/examples/chef/efr32/include/LightingManager.h b/examples/chef/silabs/include/LightingManager.h similarity index 100% rename from examples/chef/efr32/include/LightingManager.h rename to examples/chef/silabs/include/LightingManager.h diff --git a/examples/chef/efr32/src/AppTask.cpp b/examples/chef/silabs/src/AppTask.cpp similarity index 100% rename from examples/chef/efr32/src/AppTask.cpp rename to examples/chef/silabs/src/AppTask.cpp diff --git a/examples/chef/efr32/src/LightingManager.cpp b/examples/chef/silabs/src/LightingManager.cpp similarity index 100% rename from examples/chef/efr32/src/LightingManager.cpp rename to examples/chef/silabs/src/LightingManager.cpp diff --git a/examples/chef/efr32/src/ZclCallbacks.cpp b/examples/chef/silabs/src/ZclCallbacks.cpp similarity index 100% rename from examples/chef/efr32/src/ZclCallbacks.cpp rename to examples/chef/silabs/src/ZclCallbacks.cpp diff --git a/examples/chef/efr32/third_party/connectedhomeip b/examples/chef/silabs/third_party/connectedhomeip similarity index 100% rename from examples/chef/efr32/third_party/connectedhomeip rename to examples/chef/silabs/third_party/connectedhomeip diff --git a/examples/chef/efr32/with_pw_rpc.gni b/examples/chef/silabs/with_pw_rpc.gni similarity index 100% rename from examples/chef/efr32/with_pw_rpc.gni rename to examples/chef/silabs/with_pw_rpc.gni diff --git a/examples/light-switch-app/silabs/efr32/.gn b/examples/light-switch-app/silabs/.gn similarity index 100% rename from examples/light-switch-app/silabs/efr32/.gn rename to examples/light-switch-app/silabs/.gn diff --git a/examples/light-switch-app/silabs/efr32/BUILD.gn b/examples/light-switch-app/silabs/BUILD.gn similarity index 92% rename from examples/light-switch-app/silabs/efr32/BUILD.gn rename to examples/light-switch-app/silabs/BUILD.gn index f7351646feb518..0707f6dbf52622 100644 --- a/examples/light-switch-app/silabs/efr32/BUILD.gn +++ b/examples/light-switch-app/silabs/BUILD.gn @@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") -silabs_project_dir = "${chip_root}/examples/light-switch-app/silabs/efr32" +silabs_project_dir = "${chip_root}/examples/light-switch-app/silabs" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" if (wifi_soc) { @@ -80,7 +80,6 @@ if (wifi_soc) { ] include_dirs = [ - "${chip_root}/examples/light-switch-app/silabs/common", "${chip_root}/src/platform/silabs/efr32", "${silabs_project_dir}/include", "${examples_plat_dir}", @@ -114,17 +113,14 @@ if (wifi_soc) { silabs_executable("light_switch_app") { output_name = "matter-silabs-light-switch-example.out" - include_dirs = [ - "include", - "${chip_root}/examples/light-switch-app/silabs/common/", - ] + include_dirs = [ "include" ] defines = [] sources = [ - "${chip_root}/examples/light-switch-app/silabs/common/BindingHandler.cpp", - "${chip_root}/examples/light-switch-app/silabs/common/LightSwitchMgr.cpp", "${examples_common_plat_dir}/main.cpp", "src/AppTask.cpp", + "src/BindingHandler.cpp", + "src/LightSwitchMgr.cpp", "src/ZclCallbacks.cpp", ] @@ -140,9 +136,7 @@ silabs_executable("light_switch_app") { } if (chip_build_libshell) { - sources += [ - "${chip_root}/examples/light-switch-app/silabs/common/ShellCommands.cpp", - ] + sources += [ "src/ShellCommands.cpp" ] } if (chip_enable_pw_rpc) { diff --git a/examples/light-switch-app/silabs/efr32/README.md b/examples/light-switch-app/silabs/README.md similarity index 92% rename from examples/light-switch-app/silabs/efr32/README.md rename to examples/light-switch-app/silabs/README.md index a5f71d14620277..9ca79a80e2bd41 100644 --- a/examples/light-switch-app/silabs/efr32/README.md +++ b/examples/light-switch-app/silabs/README.md @@ -106,7 +106,7 @@ Silicon Labs platform. * Build the example application: cd ~/connectedhomeip - ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app BRD4187C + ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app BRD4187C - To delete generated executable, libraries and object files use: @@ -129,11 +129,11 @@ Silicon Labs platform. * Build the example with Matter shell - ./scripts/examples/gn_efr32_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app BRD4187C chip_build_libshell=true + ./scripts/examples/gn_silabs_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app BRD4187C chip_build_libshell=true * Build the example as Sleepy End Device (SED) - $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app_SED BRD4187C --sed + $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app_SED BRD4187C --sed or use gn as previously mentioned but adding the following arguments: @@ -141,7 +141,7 @@ Silicon Labs platform. * Build the example with pigweed RCP - $ ./scripts/examples/gn_efr32_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app_rpc BRD4187C 'import("//with_pw_rpc.gni")' + $ ./scripts/examples/gn_silabs_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app_rpc BRD4187C 'import("//with_pw_rpc.gni")' or use GN/Ninja Directly @@ -155,7 +155,7 @@ Silicon Labs platform. For more build options, help is provided when running the build script without arguments - ./scripts/examples/gn_efr32_example.sh + ./scripts/examples/gn_silabs_example.sh ## Flashing the Application @@ -243,7 +243,7 @@ combination with JLinkRTTClient as follows: - For this example to work, it is necessary to have a second efr32 device running the - [lighting app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/lighting-app/silabs/efr32/README.md) + [lighting app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/lighting-app/silabs/README.md) commissioned on the same openthread network - User interface : **LCD** The LCD on Silabs WSTK shows a QR Code. This QR @@ -409,7 +409,7 @@ tracking code inside the `trackAlloc` and `trackFree` function For the description of Software Update process with EFR32 example applications see -[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md) +[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md) ## Building options @@ -421,19 +421,19 @@ features can easily be toggled on or off. Here is a short list of options : chip_progress_logging, chip_detail_logging, chip_automation_logging - $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" ### Debug build / release build is_debug - $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "is_debug=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "is_debug=false" ### Disabling LCD show_qr_code - $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "show_qr_code=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "show_qr_code=false" ### KVS maximum entry count @@ -442,4 +442,4 @@ kvs_max_entries Set the maximum Kvs entries that can be stored in NVM (Default 75) Thresholds: 30 <= kvs_max_entries <= 255 - $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A kvs_max_entries=50 + $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A kvs_max_entries=50 diff --git a/examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni b/examples/light-switch-app/silabs/build_for_wifi_args.gni similarity index 100% rename from examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni rename to examples/light-switch-app/silabs/build_for_wifi_args.gni diff --git a/examples/light-switch-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/light-switch-app/silabs/build_for_wifi_gnfile.gn similarity index 100% rename from examples/light-switch-app/silabs/efr32/build_for_wifi_gnfile.gn rename to examples/light-switch-app/silabs/build_for_wifi_gnfile.gn diff --git a/examples/light-switch-app/silabs/build_overrides b/examples/light-switch-app/silabs/build_overrides new file mode 120000 index 00000000000000..e578e73312ebd1 --- /dev/null +++ b/examples/light-switch-app/silabs/build_overrides @@ -0,0 +1 @@ +../../build_overrides \ No newline at end of file diff --git a/examples/light-switch-app/silabs/efr32/build_overrides b/examples/light-switch-app/silabs/efr32/build_overrides deleted file mode 120000 index 995884e6163eb5..00000000000000 --- a/examples/light-switch-app/silabs/efr32/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../../build_overrides \ No newline at end of file diff --git a/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip b/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip deleted file mode 120000 index 59307833b4fee9..00000000000000 --- a/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../.. \ No newline at end of file diff --git a/examples/light-switch-app/silabs/efr32/include/AppConfig.h b/examples/light-switch-app/silabs/include/AppConfig.h similarity index 100% rename from examples/light-switch-app/silabs/efr32/include/AppConfig.h rename to examples/light-switch-app/silabs/include/AppConfig.h diff --git a/examples/light-switch-app/silabs/efr32/include/AppEvent.h b/examples/light-switch-app/silabs/include/AppEvent.h similarity index 100% rename from examples/light-switch-app/silabs/efr32/include/AppEvent.h rename to examples/light-switch-app/silabs/include/AppEvent.h diff --git a/examples/light-switch-app/silabs/efr32/include/AppTask.h b/examples/light-switch-app/silabs/include/AppTask.h similarity index 100% rename from examples/light-switch-app/silabs/efr32/include/AppTask.h rename to examples/light-switch-app/silabs/include/AppTask.h diff --git a/examples/light-switch-app/silabs/common/BindingHandler.h b/examples/light-switch-app/silabs/include/BindingHandler.h similarity index 100% rename from examples/light-switch-app/silabs/common/BindingHandler.h rename to examples/light-switch-app/silabs/include/BindingHandler.h diff --git a/examples/light-switch-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/light-switch-app/silabs/include/CHIPProjectConfig.h similarity index 100% rename from examples/light-switch-app/silabs/efr32/include/CHIPProjectConfig.h rename to examples/light-switch-app/silabs/include/CHIPProjectConfig.h diff --git a/examples/light-switch-app/silabs/common/LightSwitchMgr.h b/examples/light-switch-app/silabs/include/LightSwitchMgr.h similarity index 100% rename from examples/light-switch-app/silabs/common/LightSwitchMgr.h rename to examples/light-switch-app/silabs/include/LightSwitchMgr.h diff --git a/examples/light-switch-app/silabs/common/ShellCommands.h b/examples/light-switch-app/silabs/include/ShellCommands.h similarity index 100% rename from examples/light-switch-app/silabs/common/ShellCommands.h rename to examples/light-switch-app/silabs/include/ShellCommands.h diff --git a/examples/light-switch-app/silabs/efr32/openthread.gn b/examples/light-switch-app/silabs/openthread.gn similarity index 100% rename from examples/light-switch-app/silabs/efr32/openthread.gn rename to examples/light-switch-app/silabs/openthread.gn diff --git a/examples/light-switch-app/silabs/efr32/openthread.gni b/examples/light-switch-app/silabs/openthread.gni similarity index 100% rename from examples/light-switch-app/silabs/efr32/openthread.gni rename to examples/light-switch-app/silabs/openthread.gni diff --git a/examples/light-switch-app/silabs/efr32/src/AppTask.cpp b/examples/light-switch-app/silabs/src/AppTask.cpp similarity index 100% rename from examples/light-switch-app/silabs/efr32/src/AppTask.cpp rename to examples/light-switch-app/silabs/src/AppTask.cpp diff --git a/examples/light-switch-app/silabs/common/BindingHandler.cpp b/examples/light-switch-app/silabs/src/BindingHandler.cpp similarity index 100% rename from examples/light-switch-app/silabs/common/BindingHandler.cpp rename to examples/light-switch-app/silabs/src/BindingHandler.cpp diff --git a/examples/light-switch-app/silabs/common/LightSwitchMgr.cpp b/examples/light-switch-app/silabs/src/LightSwitchMgr.cpp similarity index 100% rename from examples/light-switch-app/silabs/common/LightSwitchMgr.cpp rename to examples/light-switch-app/silabs/src/LightSwitchMgr.cpp diff --git a/examples/light-switch-app/silabs/common/ShellCommands.cpp b/examples/light-switch-app/silabs/src/ShellCommands.cpp similarity index 100% rename from examples/light-switch-app/silabs/common/ShellCommands.cpp rename to examples/light-switch-app/silabs/src/ShellCommands.cpp diff --git a/examples/light-switch-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/light-switch-app/silabs/src/ZclCallbacks.cpp similarity index 100% rename from examples/light-switch-app/silabs/efr32/src/ZclCallbacks.cpp rename to examples/light-switch-app/silabs/src/ZclCallbacks.cpp diff --git a/examples/light-switch-app/silabs/third_party/connectedhomeip b/examples/light-switch-app/silabs/third_party/connectedhomeip new file mode 120000 index 00000000000000..c866b86874994d --- /dev/null +++ b/examples/light-switch-app/silabs/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../.. \ No newline at end of file diff --git a/examples/lighting-app/silabs/efr32/.gn b/examples/lighting-app/silabs/.gn similarity index 100% rename from examples/lighting-app/silabs/efr32/.gn rename to examples/lighting-app/silabs/.gn diff --git a/examples/lighting-app/silabs/efr32/BUILD.gn b/examples/lighting-app/silabs/BUILD.gn similarity index 98% rename from examples/lighting-app/silabs/efr32/BUILD.gn rename to examples/lighting-app/silabs/BUILD.gn index 32022379e8fc8f..a9687bb3fe061d 100644 --- a/examples/lighting-app/silabs/efr32/BUILD.gn +++ b/examples/lighting-app/silabs/BUILD.gn @@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") -silabs_project_dir = "${chip_root}/examples/lighting-app/silabs/efr32" +silabs_project_dir = "${chip_root}/examples/lighting-app/silabs" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" if (wifi_soc) { diff --git a/examples/lighting-app/silabs/efr32/README.md b/examples/lighting-app/silabs/README.md similarity index 92% rename from examples/lighting-app/silabs/efr32/README.md rename to examples/lighting-app/silabs/README.md index d4293677238f33..4d7c873aeff09a 100644 --- a/examples/lighting-app/silabs/efr32/README.md +++ b/examples/lighting-app/silabs/README.md @@ -102,7 +102,7 @@ Silicon Labs platform. * Build the example application: cd ~/connectedhomeip - ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app BRD4187C + ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app BRD4187C - To delete generated executable, libraries and object files use: @@ -125,7 +125,7 @@ Silicon Labs platform. * Build the example as Sleepy End Device (SED) - $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app_SED BRD4187C --sed + $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app_SED BRD4187C --sed or use gn as previously mentioned but adding the following arguments: @@ -133,7 +133,7 @@ Silicon Labs platform. * Build the example with pigweed RPC - $ ./scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_rpc BRD4187C 'import("//with_pw_rpc.gni")' + $ ./scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_rpc BRD4187C 'import("//with_pw_rpc.gni")' or use GN/Ninja Directly @@ -149,7 +149,7 @@ Silicon Labs platform. For more build options, help is provided when running the build script without arguments - ./scripts/examples/gn_efr32_example.sh + ./scripts/examples/gn_silabs_example.sh ## Flashing the Application @@ -348,13 +348,13 @@ tracking code inside the `trackAlloc` and `trackFree` function For the description of Software Update process with EFR32 example applications see -[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md) +[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md) ## Group Communication (Multicast) With this lighting example you can also use group communication to send Lighting commands to multiples devices at once. Please refer to the -[chip-tool documentation](../../../chip-tool/README.md) _Configuring the server +[chip-tool documentation](../../chip-tool/README.md) _Configuring the server side for Group Commands_ and _Using the Client to Send Group (Multicast) Matter Commands_ @@ -369,19 +369,19 @@ passed to the build scripts. `chip_progress_logging, chip_detail_logging, chip_automation_logging` - $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" ### Debug build / release build `is_debug` - $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "is_debug=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "is_debug=false" ### Disabling LCD `show_qr_code` - $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "show_qr_code=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "show_qr_code=false" ### KVS maximum entry count @@ -390,4 +390,4 @@ passed to the build scripts. Set the maximum Kvs entries that can be stored in NVM (Default 75) Thresholds: 30 <= kvs_max_entries <= 255 - $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A kvs_max_entries=50 + $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A kvs_max_entries=50 diff --git a/examples/lighting-app/silabs/SiWx917/args.gni b/examples/lighting-app/silabs/SiWx917/args.gni deleted file mode 100644 index 7157754d68f864..00000000000000 --- a/examples/lighting-app/silabs/SiWx917/args.gni +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -import("//build_overrides/chip.gni") -import("${chip_root}/config/standalone/args.gni") - -silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain") -import("${chip_root}/src/platform/silabs/args.gni") - -app_data_model = "${chip_root}/examples/lighting-app/silabs/SiWx917/data_model:silabs-lighting" -chip_enable_ota_requestor = true diff --git a/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni b/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni deleted file mode 100644 index a2f55709d5a7c4..00000000000000 --- a/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2021 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# add this gni as import in your build args to use pigweed in the example -# 'import("//with_pw_rpc.gni")' - -import("//build_overrides/chip.gni") -import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni") -import("${chip_root}/examples/platform/silabs/SiWx917/args.gni") - -silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain") - -app_data_model = "${chip_root}/examples/lighting-app/lighting-common" -chip_enable_pw_rpc = true -chip_enable_openthread = true -chip_build_pw_trace_lib = true - -cpp_standard = "gnu++17" - -# Light app on EFR enables tracing server -pw_trace_BACKEND = "$dir_pw_trace_tokenized" diff --git a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni b/examples/lighting-app/silabs/build_for_wifi_args.gni similarity index 91% rename from examples/lighting-app/silabs/efr32/build_for_wifi_args.gni rename to examples/lighting-app/silabs/build_for_wifi_args.gni index 08cb8f35603b47..bbb57ae35a4343 100644 --- a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni +++ b/examples/lighting-app/silabs/build_for_wifi_args.gni @@ -20,4 +20,4 @@ import("${chip_root}/src/platform/silabs/wifi_args.gni") chip_enable_ota_requestor = true app_data_model = - "${chip_root}/examples/lighting-app/silabs/efr32/data_model:silabs-lighting" + "${chip_root}/examples/lighting-app/silabs/data_model:silabs-lighting" diff --git a/examples/lighting-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/lighting-app/silabs/build_for_wifi_gnfile.gn similarity index 100% rename from examples/lighting-app/silabs/efr32/build_for_wifi_gnfile.gn rename to examples/lighting-app/silabs/build_for_wifi_gnfile.gn diff --git a/examples/lighting-app/silabs/build_overrides b/examples/lighting-app/silabs/build_overrides new file mode 120000 index 00000000000000..e578e73312ebd1 --- /dev/null +++ b/examples/lighting-app/silabs/build_overrides @@ -0,0 +1 @@ +../../build_overrides \ No newline at end of file diff --git a/examples/lighting-app/silabs/efr32/data_model/BUILD.gn b/examples/lighting-app/silabs/data_model/BUILD.gn similarity index 100% rename from examples/lighting-app/silabs/efr32/data_model/BUILD.gn rename to examples/lighting-app/silabs/data_model/BUILD.gn diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter similarity index 100% rename from examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter rename to examples/lighting-app/silabs/data_model/lighting-thread-app.matter diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap similarity index 99% rename from examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap rename to examples/lighting-app/silabs/data_model/lighting-thread-app.zap index 5ca225af311490..4129c583036388 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -18,7 +18,7 @@ "package": [ { "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/zcl/zcl.json", + "path": "../../../../src/app/zap-templates/zcl/zcl.json", "type": "zcl-properties", "category": "matter", "version": 1, @@ -26,7 +26,7 @@ }, { "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/app-templates.json", + "path": "../../../../src/app/zap-templates/app-templates.json", "type": "gen-templates-json", "version": "chip-v1" } diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter similarity index 100% rename from examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter rename to examples/lighting-app/silabs/data_model/lighting-wifi-app.matter diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap similarity index 99% rename from examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap rename to examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index c769ae54178b5d..e0b17ec63aea08 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -18,7 +18,7 @@ "package": [ { "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/zcl/zcl.json", + "path": "../../../../src/app/zap-templates/zcl/zcl.json", "type": "zcl-properties", "category": "matter", "version": 1, @@ -26,7 +26,7 @@ }, { "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/app-templates.json", + "path": "../../../../src/app/zap-templates/app-templates.json", "type": "gen-templates-json", "version": "chip-v1" } diff --git a/examples/lighting-app/silabs/efr32/build_overrides b/examples/lighting-app/silabs/efr32/build_overrides deleted file mode 120000 index 995884e6163eb5..00000000000000 --- a/examples/lighting-app/silabs/efr32/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../../build_overrides \ No newline at end of file diff --git a/examples/lighting-app/silabs/efr32/third_party/connectedhomeip b/examples/lighting-app/silabs/efr32/third_party/connectedhomeip deleted file mode 120000 index 59307833b4fee9..00000000000000 --- a/examples/lighting-app/silabs/efr32/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../.. \ No newline at end of file diff --git a/examples/lighting-app/silabs/efr32/include/AppConfig.h b/examples/lighting-app/silabs/include/AppConfig.h similarity index 100% rename from examples/lighting-app/silabs/efr32/include/AppConfig.h rename to examples/lighting-app/silabs/include/AppConfig.h diff --git a/examples/lighting-app/silabs/efr32/include/AppEvent.h b/examples/lighting-app/silabs/include/AppEvent.h similarity index 100% rename from examples/lighting-app/silabs/efr32/include/AppEvent.h rename to examples/lighting-app/silabs/include/AppEvent.h diff --git a/examples/lighting-app/silabs/efr32/include/AppTask.h b/examples/lighting-app/silabs/include/AppTask.h similarity index 100% rename from examples/lighting-app/silabs/efr32/include/AppTask.h rename to examples/lighting-app/silabs/include/AppTask.h diff --git a/examples/lighting-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/lighting-app/silabs/include/CHIPProjectConfig.h similarity index 100% rename from examples/lighting-app/silabs/efr32/include/CHIPProjectConfig.h rename to examples/lighting-app/silabs/include/CHIPProjectConfig.h diff --git a/examples/lighting-app/silabs/efr32/include/LightingManager.h b/examples/lighting-app/silabs/include/LightingManager.h similarity index 100% rename from examples/lighting-app/silabs/efr32/include/LightingManager.h rename to examples/lighting-app/silabs/include/LightingManager.h diff --git a/examples/lighting-app/silabs/efr32/openthread.gn b/examples/lighting-app/silabs/openthread.gn similarity index 100% rename from examples/lighting-app/silabs/efr32/openthread.gn rename to examples/lighting-app/silabs/openthread.gn diff --git a/examples/lighting-app/silabs/efr32/openthread.gni b/examples/lighting-app/silabs/openthread.gni similarity index 92% rename from examples/lighting-app/silabs/efr32/openthread.gni rename to examples/lighting-app/silabs/openthread.gni index e7783cb5d09727..71fa3271ea5073 100644 --- a/examples/lighting-app/silabs/efr32/openthread.gni +++ b/examples/lighting-app/silabs/openthread.gni @@ -19,7 +19,7 @@ import("${chip_root}/src/platform/silabs/efr32/args.gni") silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain") app_data_model = - "${chip_root}/examples/lighting-app/silabs/efr32/data_model:silabs-lighting" + "${chip_root}/examples/lighting-app/silabs/data_model:silabs-lighting" chip_enable_ota_requestor = true chip_enable_openthread = true diff --git a/examples/lighting-app/silabs/efr32/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp similarity index 100% rename from examples/lighting-app/silabs/efr32/src/AppTask.cpp rename to examples/lighting-app/silabs/src/AppTask.cpp diff --git a/examples/lighting-app/silabs/efr32/src/LightingManager.cpp b/examples/lighting-app/silabs/src/LightingManager.cpp similarity index 100% rename from examples/lighting-app/silabs/efr32/src/LightingManager.cpp rename to examples/lighting-app/silabs/src/LightingManager.cpp diff --git a/examples/lighting-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/silabs/src/ZclCallbacks.cpp similarity index 100% rename from examples/lighting-app/silabs/efr32/src/ZclCallbacks.cpp rename to examples/lighting-app/silabs/src/ZclCallbacks.cpp diff --git a/examples/lighting-app/silabs/third_party/connectedhomeip b/examples/lighting-app/silabs/third_party/connectedhomeip new file mode 120000 index 00000000000000..c866b86874994d --- /dev/null +++ b/examples/lighting-app/silabs/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../.. \ No newline at end of file diff --git a/examples/lighting-app/silabs/efr32/with_pw_rpc.gni b/examples/lighting-app/silabs/with_pw_rpc.gni similarity index 100% rename from examples/lighting-app/silabs/efr32/with_pw_rpc.gni rename to examples/lighting-app/silabs/with_pw_rpc.gni diff --git a/examples/lock-app/silabs/efr32/.gn b/examples/lock-app/silabs/.gn similarity index 100% rename from examples/lock-app/silabs/efr32/.gn rename to examples/lock-app/silabs/.gn diff --git a/examples/lock-app/silabs/efr32/BUILD.gn b/examples/lock-app/silabs/BUILD.gn similarity index 98% rename from examples/lock-app/silabs/efr32/BUILD.gn rename to examples/lock-app/silabs/BUILD.gn index ab1479df760bb0..7e50ac8b119a1c 100644 --- a/examples/lock-app/silabs/efr32/BUILD.gn +++ b/examples/lock-app/silabs/BUILD.gn @@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") -silabs_project_dir = "${chip_root}/examples/lock-app/silabs/efr32" +silabs_project_dir = "${chip_root}/examples/lock-app/silabs" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" if (wifi_soc) { diff --git a/examples/lock-app/silabs/efr32/README.md b/examples/lock-app/silabs/README.md similarity index 93% rename from examples/lock-app/silabs/efr32/README.md rename to examples/lock-app/silabs/README.md index 46d6f87ef77fae..2d6cb8722a8dce 100644 --- a/examples/lock-app/silabs/efr32/README.md +++ b/examples/lock-app/silabs/README.md @@ -102,7 +102,7 @@ Mac OS X ``` cd ~/connectedhomeip - ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock_app BRD4187C + ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock_app BRD4187C ``` - To delete generated executable, libraries and object files use: @@ -133,7 +133,7 @@ Mac OS X * Build the example as Sleepy End Device (SED) ``` - $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock-app_SED BRD4187C --sed + $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock-app_SED BRD4187C --sed ``` or use gn as previously mentioned but adding the following arguments: @@ -145,7 +145,7 @@ Mac OS X * Build the example with pigweed RCP ``` - $ ./scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_rpc BRD4187C 'import("//with_pw_rpc.gni")' + $ ./scripts/examples/gn_silabs_example.sh examples/lock-app/silabs/efr32/ out/lock_app_rpc BRD4187C 'import("//with_pw_rpc.gni")' ``` or use GN/Ninja Directly @@ -163,7 +163,7 @@ For more build options, help is provided when running the build script without arguments ``` - ./scripts/examples/gn_efr32_example.sh + ./scripts/examples/gn_silabs_example.sh ``` ## Flashing the Application @@ -380,7 +380,7 @@ tracking code inside the `trackAlloc` and `trackFree` function For the description of Software Update process with EFR32 example applications see -[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md) +[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md) ## Building options @@ -393,7 +393,7 @@ features can easily be toggled on or off. Here is a short list of options : `chip_progress_logging, chip_detail_logging, chip_automation_logging` ``` - $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" ``` ### Debug build / release build @@ -401,7 +401,7 @@ features can easily be toggled on or off. Here is a short list of options : `is_debug` ``` - $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "is_debug=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "is_debug=false" ``` ### Disabling LCD @@ -409,7 +409,7 @@ features can easily be toggled on or off. Here is a short list of options : `show_qr_code` ``` - $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "show_qr_code=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "show_qr_code=false" ``` ### KVS maximum entry count @@ -420,5 +420,5 @@ features can easily be toggled on or off. Here is a short list of options : Set the maximum Kvs entries that can be stored in NVM (Default 75) Thresholds: 30 <= kvs_max_entries <= 255 - $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A kvs_max_entries=50 + $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A kvs_max_entries=50 ``` diff --git a/examples/lock-app/silabs/efr32/args.gni b/examples/lock-app/silabs/args.gni similarity index 100% rename from examples/lock-app/silabs/efr32/args.gni rename to examples/lock-app/silabs/args.gni diff --git a/examples/lock-app/silabs/efr32/build_for_wifi_args.gni b/examples/lock-app/silabs/build_for_wifi_args.gni similarity index 100% rename from examples/lock-app/silabs/efr32/build_for_wifi_args.gni rename to examples/lock-app/silabs/build_for_wifi_args.gni diff --git a/examples/lock-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/lock-app/silabs/build_for_wifi_gnfile.gn similarity index 100% rename from examples/lock-app/silabs/efr32/build_for_wifi_gnfile.gn rename to examples/lock-app/silabs/build_for_wifi_gnfile.gn diff --git a/examples/lock-app/silabs/build_overrides b/examples/lock-app/silabs/build_overrides new file mode 120000 index 00000000000000..e578e73312ebd1 --- /dev/null +++ b/examples/lock-app/silabs/build_overrides @@ -0,0 +1 @@ +../../build_overrides \ No newline at end of file diff --git a/examples/lock-app/silabs/efr32/build_overrides b/examples/lock-app/silabs/efr32/build_overrides deleted file mode 120000 index 995884e6163eb5..00000000000000 --- a/examples/lock-app/silabs/efr32/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../../build_overrides \ No newline at end of file diff --git a/examples/lock-app/silabs/efr32/third_party/connectedhomeip b/examples/lock-app/silabs/efr32/third_party/connectedhomeip deleted file mode 120000 index 59307833b4fee9..00000000000000 --- a/examples/lock-app/silabs/efr32/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../.. \ No newline at end of file diff --git a/examples/lock-app/silabs/efr32/include/AppConfig.h b/examples/lock-app/silabs/include/AppConfig.h similarity index 100% rename from examples/lock-app/silabs/efr32/include/AppConfig.h rename to examples/lock-app/silabs/include/AppConfig.h diff --git a/examples/lock-app/silabs/efr32/include/AppEvent.h b/examples/lock-app/silabs/include/AppEvent.h similarity index 100% rename from examples/lock-app/silabs/efr32/include/AppEvent.h rename to examples/lock-app/silabs/include/AppEvent.h diff --git a/examples/lock-app/silabs/efr32/include/AppTask.h b/examples/lock-app/silabs/include/AppTask.h similarity index 100% rename from examples/lock-app/silabs/efr32/include/AppTask.h rename to examples/lock-app/silabs/include/AppTask.h diff --git a/examples/lock-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/lock-app/silabs/include/CHIPProjectConfig.h similarity index 100% rename from examples/lock-app/silabs/efr32/include/CHIPProjectConfig.h rename to examples/lock-app/silabs/include/CHIPProjectConfig.h diff --git a/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h b/examples/lock-app/silabs/include/EventHandlerLibShell.h similarity index 100% rename from examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h rename to examples/lock-app/silabs/include/EventHandlerLibShell.h diff --git a/examples/lock-app/silabs/efr32/include/LockManager.h b/examples/lock-app/silabs/include/LockManager.h similarity index 100% rename from examples/lock-app/silabs/efr32/include/LockManager.h rename to examples/lock-app/silabs/include/LockManager.h diff --git a/examples/lock-app/silabs/efr32/openthread.gn b/examples/lock-app/silabs/openthread.gn similarity index 100% rename from examples/lock-app/silabs/efr32/openthread.gn rename to examples/lock-app/silabs/openthread.gn diff --git a/examples/lock-app/silabs/efr32/openthread.gni b/examples/lock-app/silabs/openthread.gni similarity index 100% rename from examples/lock-app/silabs/efr32/openthread.gni rename to examples/lock-app/silabs/openthread.gni diff --git a/examples/lock-app/silabs/efr32/src/AppTask.cpp b/examples/lock-app/silabs/src/AppTask.cpp similarity index 100% rename from examples/lock-app/silabs/efr32/src/AppTask.cpp rename to examples/lock-app/silabs/src/AppTask.cpp diff --git a/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp b/examples/lock-app/silabs/src/EventHandlerLibShell.cpp similarity index 100% rename from examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp rename to examples/lock-app/silabs/src/EventHandlerLibShell.cpp diff --git a/examples/lock-app/silabs/efr32/src/LockManager.cpp b/examples/lock-app/silabs/src/LockManager.cpp similarity index 100% rename from examples/lock-app/silabs/efr32/src/LockManager.cpp rename to examples/lock-app/silabs/src/LockManager.cpp diff --git a/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/lock-app/silabs/src/ZclCallbacks.cpp similarity index 100% rename from examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp rename to examples/lock-app/silabs/src/ZclCallbacks.cpp diff --git a/examples/lock-app/silabs/third_party/connectedhomeip b/examples/lock-app/silabs/third_party/connectedhomeip new file mode 120000 index 00000000000000..c866b86874994d --- /dev/null +++ b/examples/lock-app/silabs/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../.. \ No newline at end of file diff --git a/examples/lock-app/silabs/efr32/with_pw_rpc.gni b/examples/lock-app/silabs/with_pw_rpc.gni similarity index 100% rename from examples/lock-app/silabs/efr32/with_pw_rpc.gni rename to examples/lock-app/silabs/with_pw_rpc.gni diff --git a/examples/thermostat/silabs/efr32/.gn b/examples/thermostat/silabs/.gn similarity index 100% rename from examples/thermostat/silabs/efr32/.gn rename to examples/thermostat/silabs/.gn diff --git a/examples/thermostat/silabs/efr32/BUILD.gn b/examples/thermostat/silabs/BUILD.gn similarity index 98% rename from examples/thermostat/silabs/efr32/BUILD.gn rename to examples/thermostat/silabs/BUILD.gn index 92063a31c878aa..684ab738804105 100644 --- a/examples/thermostat/silabs/efr32/BUILD.gn +++ b/examples/thermostat/silabs/BUILD.gn @@ -31,7 +31,7 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") -silabs_project_dir = "${chip_root}/examples/thermostat/silabs/efr32" +silabs_project_dir = "${chip_root}/examples/thermostat/silabs" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" if (wifi_soc) { diff --git a/examples/thermostat/silabs/efr32/README.md b/examples/thermostat/silabs/README.md similarity index 91% rename from examples/thermostat/silabs/efr32/README.md rename to examples/thermostat/silabs/README.md index 6cd6a3d11dfd59..6dc53dc6b2ca2d 100644 --- a/examples/thermostat/silabs/efr32/README.md +++ b/examples/thermostat/silabs/README.md @@ -106,7 +106,7 @@ Silicon Labs platform. * Build the example application: cd ~/connectedhomeip - ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app BRD4187C + ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app BRD4187C - To delete generated executable, libraries and object files use: @@ -129,11 +129,11 @@ Silicon Labs platform. * Build the example with Matter shell - ./scripts/examples/gn_efr32_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app BRD4187C chip_build_libshell=true + ./scripts/examples/gn_silabs_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app BRD4187C chip_build_libshell=true * Build the example as Sleepy End Device (SED) - $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app_SED BRD4187C --sed + $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app_SED BRD4187C --sed or use gn as previously mentioned but adding the following arguments: @@ -141,7 +141,7 @@ Silicon Labs platform. * Build the example with pigweed RCP - $ ./scripts/examples/gn_efr32_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app_rpc BRD4187C 'import("//with_pw_rpc.gni")' + $ ./scripts/examples/gn_silabs_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app_rpc BRD4187C 'import("//with_pw_rpc.gni")' or use GN/Ninja Directly @@ -155,7 +155,7 @@ Silicon Labs platform. For more build options, help is provided when running the build script without arguments - ./scripts/examples/gn_efr32_example.sh + ./scripts/examples/gn_silabs_example.sh ## Flashing the Application @@ -232,7 +232,7 @@ combination with JLinkRTTClient as follows: - For this example to work, it is necessary to have a second efr32 device running the - [thermostat app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/thermostat/silabs/efr32/README.md) + [thermostat app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/thermostat/silabs/README.md) commissioned on the same openthread network - User interface : **LCD** The LCD on Silabs WSTK shows a QR Code. This QR @@ -341,7 +341,7 @@ tracking code inside the `trackAlloc` and `trackFree` function For the description of Software Update process with EFR32 example applications see -[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md) +[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md) ## Building options @@ -353,19 +353,19 @@ features can easily be toggled on or off. Here is a short list of options : chip_progress_logging, chip_detail_logging, chip_automation_logging - $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" ### Debug build / release build is_debug - $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "is_debug=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "is_debug=false" ### Disabling LCD show_qr_code - $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "show_qr_code=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "show_qr_code=false" ### KVS maximum entry count @@ -374,4 +374,4 @@ kvs_max_entries Set the maximum Kvs entries that can be stored in NVM (Default 75) Thresholds: 30 <= kvs_max_entries <= 255 - $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A kvs_max_entries=50 + $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A kvs_max_entries=50 diff --git a/examples/thermostat/silabs/efr32/build_for_wifi_args.gni b/examples/thermostat/silabs/build_for_wifi_args.gni similarity index 100% rename from examples/thermostat/silabs/efr32/build_for_wifi_args.gni rename to examples/thermostat/silabs/build_for_wifi_args.gni diff --git a/examples/thermostat/silabs/efr32/build_for_wifi_gnfile.gn b/examples/thermostat/silabs/build_for_wifi_gnfile.gn similarity index 100% rename from examples/thermostat/silabs/efr32/build_for_wifi_gnfile.gn rename to examples/thermostat/silabs/build_for_wifi_gnfile.gn diff --git a/examples/thermostat/silabs/build_overrides b/examples/thermostat/silabs/build_overrides new file mode 120000 index 00000000000000..e578e73312ebd1 --- /dev/null +++ b/examples/thermostat/silabs/build_overrides @@ -0,0 +1 @@ +../../build_overrides \ No newline at end of file diff --git a/examples/thermostat/silabs/efr32/build_overrides b/examples/thermostat/silabs/efr32/build_overrides deleted file mode 120000 index 995884e6163eb5..00000000000000 --- a/examples/thermostat/silabs/efr32/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../../build_overrides \ No newline at end of file diff --git a/examples/thermostat/silabs/efr32/third_party/connectedhomeip b/examples/thermostat/silabs/efr32/third_party/connectedhomeip deleted file mode 120000 index 59307833b4fee9..00000000000000 --- a/examples/thermostat/silabs/efr32/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../.. \ No newline at end of file diff --git a/examples/thermostat/silabs/efr32/include/AppConfig.h b/examples/thermostat/silabs/include/AppConfig.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/AppConfig.h rename to examples/thermostat/silabs/include/AppConfig.h diff --git a/examples/thermostat/silabs/efr32/include/AppEvent.h b/examples/thermostat/silabs/include/AppEvent.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/AppEvent.h rename to examples/thermostat/silabs/include/AppEvent.h diff --git a/examples/thermostat/silabs/efr32/include/AppTask.h b/examples/thermostat/silabs/include/AppTask.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/AppTask.h rename to examples/thermostat/silabs/include/AppTask.h diff --git a/examples/thermostat/silabs/efr32/include/CHIPProjectConfig.h b/examples/thermostat/silabs/include/CHIPProjectConfig.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/CHIPProjectConfig.h rename to examples/thermostat/silabs/include/CHIPProjectConfig.h diff --git a/examples/thermostat/silabs/efr32/include/SensorManager.h b/examples/thermostat/silabs/include/SensorManager.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/SensorManager.h rename to examples/thermostat/silabs/include/SensorManager.h diff --git a/examples/thermostat/silabs/efr32/include/TemperatureManager.h b/examples/thermostat/silabs/include/TemperatureManager.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/TemperatureManager.h rename to examples/thermostat/silabs/include/TemperatureManager.h diff --git a/examples/thermostat/silabs/efr32/include/ThermostatIcons.h b/examples/thermostat/silabs/include/ThermostatIcons.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/ThermostatIcons.h rename to examples/thermostat/silabs/include/ThermostatIcons.h diff --git a/examples/thermostat/silabs/efr32/include/ThermostatUI.h b/examples/thermostat/silabs/include/ThermostatUI.h similarity index 100% rename from examples/thermostat/silabs/efr32/include/ThermostatUI.h rename to examples/thermostat/silabs/include/ThermostatUI.h diff --git a/examples/thermostat/silabs/efr32/openthread.gn b/examples/thermostat/silabs/openthread.gn similarity index 100% rename from examples/thermostat/silabs/efr32/openthread.gn rename to examples/thermostat/silabs/openthread.gn diff --git a/examples/thermostat/silabs/efr32/openthread.gni b/examples/thermostat/silabs/openthread.gni similarity index 100% rename from examples/thermostat/silabs/efr32/openthread.gni rename to examples/thermostat/silabs/openthread.gni diff --git a/examples/thermostat/silabs/efr32/src/AppTask.cpp b/examples/thermostat/silabs/src/AppTask.cpp similarity index 100% rename from examples/thermostat/silabs/efr32/src/AppTask.cpp rename to examples/thermostat/silabs/src/AppTask.cpp diff --git a/examples/thermostat/silabs/efr32/src/SensorManager.cpp b/examples/thermostat/silabs/src/SensorManager.cpp similarity index 100% rename from examples/thermostat/silabs/efr32/src/SensorManager.cpp rename to examples/thermostat/silabs/src/SensorManager.cpp diff --git a/examples/thermostat/silabs/efr32/src/TemperatureManager.cpp b/examples/thermostat/silabs/src/TemperatureManager.cpp similarity index 100% rename from examples/thermostat/silabs/efr32/src/TemperatureManager.cpp rename to examples/thermostat/silabs/src/TemperatureManager.cpp diff --git a/examples/thermostat/silabs/efr32/src/ThermostatUI.cpp b/examples/thermostat/silabs/src/ThermostatUI.cpp similarity index 100% rename from examples/thermostat/silabs/efr32/src/ThermostatUI.cpp rename to examples/thermostat/silabs/src/ThermostatUI.cpp diff --git a/examples/thermostat/silabs/efr32/src/ZclCallbacks.cpp b/examples/thermostat/silabs/src/ZclCallbacks.cpp similarity index 100% rename from examples/thermostat/silabs/efr32/src/ZclCallbacks.cpp rename to examples/thermostat/silabs/src/ZclCallbacks.cpp diff --git a/examples/thermostat/silabs/third_party/connectedhomeip b/examples/thermostat/silabs/third_party/connectedhomeip new file mode 120000 index 00000000000000..c866b86874994d --- /dev/null +++ b/examples/thermostat/silabs/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../.. \ No newline at end of file diff --git a/examples/window-app/silabs/efr32/.gn b/examples/window-app/silabs/.gn similarity index 100% rename from examples/window-app/silabs/efr32/.gn rename to examples/window-app/silabs/.gn diff --git a/examples/window-app/silabs/efr32/BUILD.gn b/examples/window-app/silabs/BUILD.gn similarity index 98% rename from examples/window-app/silabs/efr32/BUILD.gn rename to examples/window-app/silabs/BUILD.gn index ac16344b59c597..3536280e5e7ce8 100644 --- a/examples/window-app/silabs/efr32/BUILD.gn +++ b/examples/window-app/silabs/BUILD.gn @@ -24,7 +24,7 @@ import("${efr32_sdk_build_root}/silabs_executable.gni") assert(current_os == "freertos") project_dir = "${chip_root}/examples/window-app" -silabs_project_dir = "${project_dir}/silabs/efr32" +silabs_project_dir = "${project_dir}/silabs" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" if (wifi_soc) { diff --git a/examples/window-app/silabs/efr32/README.md b/examples/window-app/silabs/README.md similarity index 93% rename from examples/window-app/silabs/efr32/README.md rename to examples/window-app/silabs/README.md index 29ef7d7fb9f414..6152acb87a5503 100644 --- a/examples/window-app/silabs/efr32/README.md +++ b/examples/window-app/silabs/README.md @@ -99,7 +99,7 @@ Silicon Labs platform. * Build the example application: cd ~/connectedhomeip - ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app BRD4187C + ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app BRD4187C - To delete generated executable, libraries and object files use: @@ -122,7 +122,7 @@ Silicon Labs platform. * Build the example as Sleepy End Device (SED) - $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app_SED BRD4187C --sed + $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app_SED BRD4187C --sed or use gn as previously mentioned but adding the following arguments: @@ -130,7 +130,7 @@ Silicon Labs platform. * Build the example with pigweed RCP - $ ./scripts/examples/gn_efr32_example.sh examples/window-app/silabs/efr32/ out/window_app_rpc BRD4187C 'import("//with_pw_rpc.gni")' + $ ./scripts/examples/gn_silabs_example.sh examples/window-app/silabs/efr32/ out/window_app_rpc BRD4187C 'import("//with_pw_rpc.gni")' or use GN/Ninja Directly @@ -144,7 +144,7 @@ Silicon Labs platform. For more build options, help is provided when running the build script without arguments - ./scripts/examples/gn_efr32_example.sh + ./scripts/examples/gn_silabs_example.sh ## Flashing the Application @@ -341,7 +341,7 @@ combination with JLinkRTTClient as follows: For the description of Software Update process with EFR32 example applications see -[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md) +[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md) ## Building options @@ -353,19 +353,19 @@ features can easily be toggled on or off. Here is a short list of options : chip_progress_logging, chip_detail_logging, chip_automation_logging - $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false" ### Debug build / release build is_debug - $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "is_debug=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "is_debug=false" ### Disabling LCD show_qr_code - $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "show_qr_code=false" + $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "show_qr_code=false" ### KVS maximum entry count @@ -374,4 +374,4 @@ kvs_max_entries Set the maximum Kvs entries that can be stored in NVM (Default 75) Thresholds: 30 <= kvs_max_entries <= 255 - $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A kvs_max_entries=50 + $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A kvs_max_entries=50 diff --git a/examples/window-app/silabs/efr32/args.gni b/examples/window-app/silabs/args.gni similarity index 100% rename from examples/window-app/silabs/efr32/args.gni rename to examples/window-app/silabs/args.gni diff --git a/examples/window-app/silabs/efr32/build_for_wifi_args.gni b/examples/window-app/silabs/build_for_wifi_args.gni similarity index 100% rename from examples/window-app/silabs/efr32/build_for_wifi_args.gni rename to examples/window-app/silabs/build_for_wifi_args.gni diff --git a/examples/window-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/window-app/silabs/build_for_wifi_gnfile.gn similarity index 100% rename from examples/window-app/silabs/efr32/build_for_wifi_gnfile.gn rename to examples/window-app/silabs/build_for_wifi_gnfile.gn diff --git a/examples/window-app/silabs/build_overrides b/examples/window-app/silabs/build_overrides new file mode 120000 index 00000000000000..e578e73312ebd1 --- /dev/null +++ b/examples/window-app/silabs/build_overrides @@ -0,0 +1 @@ +../../build_overrides \ No newline at end of file diff --git a/examples/window-app/silabs/efr32/build_overrides b/examples/window-app/silabs/efr32/build_overrides deleted file mode 120000 index 995884e6163eb5..00000000000000 --- a/examples/window-app/silabs/efr32/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../../build_overrides \ No newline at end of file diff --git a/examples/window-app/silabs/efr32/third_party/connectedhomeip b/examples/window-app/silabs/efr32/third_party/connectedhomeip deleted file mode 120000 index 59307833b4fee9..00000000000000 --- a/examples/window-app/silabs/efr32/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../../.. \ No newline at end of file diff --git a/examples/window-app/silabs/efr32/include/AppConfig.h b/examples/window-app/silabs/include/AppConfig.h similarity index 100% rename from examples/window-app/silabs/efr32/include/AppConfig.h rename to examples/window-app/silabs/include/AppConfig.h diff --git a/examples/window-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/window-app/silabs/include/CHIPProjectConfig.h similarity index 100% rename from examples/window-app/silabs/efr32/include/CHIPProjectConfig.h rename to examples/window-app/silabs/include/CHIPProjectConfig.h diff --git a/examples/window-app/silabs/efr32/include/LcdPainter.h b/examples/window-app/silabs/include/LcdPainter.h similarity index 100% rename from examples/window-app/silabs/efr32/include/LcdPainter.h rename to examples/window-app/silabs/include/LcdPainter.h diff --git a/examples/window-app/silabs/efr32/include/WindowAppImpl.h b/examples/window-app/silabs/include/WindowAppImpl.h similarity index 100% rename from examples/window-app/silabs/efr32/include/WindowAppImpl.h rename to examples/window-app/silabs/include/WindowAppImpl.h diff --git a/examples/window-app/silabs/efr32/openthread.gn b/examples/window-app/silabs/openthread.gn similarity index 100% rename from examples/window-app/silabs/efr32/openthread.gn rename to examples/window-app/silabs/openthread.gn diff --git a/examples/window-app/silabs/efr32/openthread.gni b/examples/window-app/silabs/openthread.gni similarity index 100% rename from examples/window-app/silabs/efr32/openthread.gni rename to examples/window-app/silabs/openthread.gni diff --git a/examples/window-app/silabs/efr32/src/LcdPainter.cpp b/examples/window-app/silabs/src/LcdPainter.cpp similarity index 100% rename from examples/window-app/silabs/efr32/src/LcdPainter.cpp rename to examples/window-app/silabs/src/LcdPainter.cpp diff --git a/examples/window-app/silabs/efr32/src/WindowAppImpl.cpp b/examples/window-app/silabs/src/WindowAppImpl.cpp similarity index 100% rename from examples/window-app/silabs/efr32/src/WindowAppImpl.cpp rename to examples/window-app/silabs/src/WindowAppImpl.cpp diff --git a/examples/window-app/silabs/efr32/src/main.cpp b/examples/window-app/silabs/src/main.cpp similarity index 100% rename from examples/window-app/silabs/efr32/src/main.cpp rename to examples/window-app/silabs/src/main.cpp diff --git a/examples/window-app/silabs/third_party/connectedhomeip b/examples/window-app/silabs/third_party/connectedhomeip new file mode 120000 index 00000000000000..c866b86874994d --- /dev/null +++ b/examples/window-app/silabs/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../.. \ No newline at end of file diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py index 32edf5b966606e..e0058edc262e2b 100644 --- a/scripts/build/builders/efr32.py +++ b/scripts/build/builders/efr32.py @@ -78,7 +78,7 @@ def BuildRoot(self, root): if self == Efr32App.UNIT_TEST: return os.path.join(root, 'src', 'test_driver', 'efr32') else: - return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32') + return os.path.join(root, 'examples', self.ExampleName(), 'silabs') class Efr32Board(Enum): diff --git a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt index d48088b2048379..309cdd49b9f256 100644 --- a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt +++ b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt @@ -2,7 +2,7 @@ cd "{root}" # Generating efr32-brd4161a-light-rpc-no-version -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs/efr32 '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc-no-version +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc-no-version # Building efr32-brd4161a-light-rpc-no-version ninja -C {out}/efr32-brd4161a-light-rpc-no-version diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_silabs_example.sh similarity index 98% rename from scripts/examples/gn_efr32_example.sh rename to scripts/examples/gn_silabs_example.sh index 4b00c3aff8fb60..25d181efe26a7d 100755 --- a/scripts/examples/gn_efr32_example.sh +++ b/scripts/examples/gn_silabs_example.sh @@ -40,7 +40,7 @@ GN_PATH_PROVIDED=false DOTFILE=".gn" SILABS_THREAD_TARGET=\""../silabs:ot-efr32-cert"\" -USAGE="./scripts/examples/gn_efr32_example.sh []" +USAGE="./scripts/examples/gn_silabs_example.sh []" if [ "$#" == "0" ]; then echo "Build script for EFR32 Matter apps