project-chip · turon · Apr 17, 2020
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -133,7 +133,7 @@
         {
             "label": "Build nRF5 Lock App",
             "type": "shell",
-            "command": "cd examples/lock-app/nrf5 && make",
+            "command": "cd apps/lock/nrf5 && make",
             "group": "none",
             "dependsOn": "Clean Tree",
             "problemMatcher": [

diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ The CHIP repository is structured as follows:
 | File / Folder | Contents |
 |----|----|
 | `.default-version` | Default CHIP version if none is available via source code control tags, `.dist-version`, or `.local-version`.|
+| `apps/` | Sample applications and examples |
 | `bootstrap` | GNU autotools bootstrap script for the CHIP build system. |
 | `bootstrap-configure` | Convenience script that will bootstrap the CHIP build system, via `bootstrap`, and invoke `configure`.|
 | `build/` | Build system support content and build output directories |

diff --git a/examples/lock-app/efr32/Makefile → apps/lock/efr32/Makefile b/examples/lock-app/efr32/Makefile → apps/lock/efr32/Makefile
diff --git a/examples/lock-app/efr32/README.md → apps/lock/efr32/README.md b/examples/lock-app/efr32/README.md → apps/lock/efr32/README.md
diff --git a/examples/lock-app/efr32/include/AppConfig.h → apps/lock/efr32/include/AppConfig.h b/examples/lock-app/efr32/include/AppConfig.h → apps/lock/efr32/include/AppConfig.h
diff --git a/examples/lock-app/efr32/include/AppEvent.h → apps/lock/efr32/include/AppEvent.h b/examples/lock-app/efr32/include/AppEvent.h → apps/lock/efr32/include/AppEvent.h
diff --git a/examples/lock-app/efr32/include/AppTask.h → apps/lock/efr32/include/AppTask.h b/examples/lock-app/efr32/include/AppTask.h → apps/lock/efr32/include/AppTask.h
diff --git a/.../lock-app/efr32/include/BoltLockManager.h → apps/lock/efr32/include/BoltLockManager.h b/.../lock-app/efr32/include/BoltLockManager.h → apps/lock/efr32/include/BoltLockManager.h
diff --git a/...es/lock-app/efr32/include/ButtonHandler.h → apps/lock/efr32/include/ButtonHandler.h b/...es/lock-app/efr32/include/ButtonHandler.h → apps/lock/efr32/include/ButtonHandler.h
diff --git a/...ock-app/efr32/include/CHIPProjectConfig.h → apps/lock/efr32/include/CHIPProjectConfig.h b/...ock-app/efr32/include/CHIPProjectConfig.h → apps/lock/efr32/include/CHIPProjectConfig.h
diff --git a/...s/lock-app/efr32/include/FreeRTOSConfig.h → apps/lock/efr32/include/FreeRTOSConfig.h b/...s/lock-app/efr32/include/FreeRTOSConfig.h → apps/lock/efr32/include/FreeRTOSConfig.h
diff --git a/examples/lock-app/efr32/include/LEDWidget.h → apps/lock/efr32/include/LEDWidget.h b/examples/lock-app/efr32/include/LEDWidget.h → apps/lock/efr32/include/LEDWidget.h
diff --git a/...ock-app/efr32/include/ble-configuration.h → apps/lock/efr32/include/ble-configuration.h b/...ock-app/efr32/include/ble-configuration.h → apps/lock/efr32/include/ble-configuration.h
diff --git a/...s/lock-app/efr32/include/board_features.h → apps/lock/efr32/include/board_features.h b/...s/lock-app/efr32/include/board_features.h → apps/lock/efr32/include/board_features.h
diff --git a/...app/efr32/include/hal-config-app-common.h → ...ock/efr32/include/hal-config-app-common.h b/...app/efr32/include/hal-config-app-common.h → ...ock/efr32/include/hal-config-app-common.h
diff --git a/examples/lock-app/efr32/include/hal-config.h → apps/lock/efr32/include/hal-config.h b/examples/lock-app/efr32/include/hal-config.h → apps/lock/efr32/include/hal-config.h
diff --git a/examples/lock-app/efr32/include/init_board.h → apps/lock/efr32/include/init_board.h b/examples/lock-app/efr32/include/init_board.h → apps/lock/efr32/include/init_board.h
diff --git a/examples/lock-app/efr32/include/init_lcd.h → apps/lock/efr32/include/init_lcd.h b/examples/lock-app/efr32/include/init_lcd.h → apps/lock/efr32/include/init_lcd.h
diff --git a/examples/lock-app/efr32/include/init_mcu.h → apps/lock/efr32/include/init_mcu.h b/examples/lock-app/efr32/include/init_mcu.h → apps/lock/efr32/include/init_mcu.h
diff --git a/...s/lock-app/efr32/include/mbedtls-config.h → apps/lock/efr32/include/mbedtls-config.h b/...s/lock-app/efr32/include/mbedtls-config.h → apps/lock/efr32/include/mbedtls-config.h
diff --git a/...s/lock-app/efr32/include/sample_qr_code.h → apps/lock/efr32/include/sample_qr_code.h b/...s/lock-app/efr32/include/sample_qr_code.h → apps/lock/efr32/include/sample_qr_code.h
diff --git a/...r32/ldscripts/efr32-lock-example-MG12P.ld → ...r32/ldscripts/efr32-lock-example-MG12P.ld b/...r32/ldscripts/efr32-lock-example-MG12P.ld → ...r32/ldscripts/efr32-lock-example-MG12P.ld
diff --git a/...fr32/ldscripts/efr32-lock-example-MG21.ld → ...fr32/ldscripts/efr32-lock-example-MG21.ld b/...fr32/ldscripts/efr32-lock-example-MG21.ld → ...fr32/ldscripts/efr32-lock-example-MG21.ld
diff --git a/examples/lock-app/efr32/src/AppTask.cpp → apps/lock/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp → apps/lock/efr32/src/AppTask.cpp
diff --git a/...ples/lock-app/efr32/src/ButtonHandler.cpp → apps/lock/efr32/src/ButtonHandler.cpp b/...ples/lock-app/efr32/src/ButtonHandler.cpp → apps/lock/efr32/src/ButtonHandler.cpp
diff --git a/examples/lock-app/efr32/src/LEDWidget.cpp → apps/lock/efr32/src/LEDWidget.cpp b/examples/lock-app/efr32/src/LEDWidget.cpp → apps/lock/efr32/src/LEDWidget.cpp
diff --git a/...s/lock-app/efr32/src/display/efr32-lcd.mk → apps/lock/efr32/src/display/efr32-lcd.mk b/...s/lock-app/efr32/src/display/efr32-lcd.mk → apps/lock/efr32/src/display/efr32-lcd.mk
diff --git a/...les/lock-app/efr32/src/display/init_lcd.c → apps/lock/efr32/src/display/init_lcd.c b/...les/lock-app/efr32/src/display/init_lcd.c → apps/lock/efr32/src/display/init_lcd.c
diff --git a/...ck-app/efr32/src/display/sample_qr_code.c → apps/lock/efr32/src/display/sample_qr_code.c b/...ck-app/efr32/src/display/sample_qr_code.c → apps/lock/efr32/src/display/sample_qr_code.c
diff --git a/examples/lock-app/efr32/src/init_board.c → apps/lock/efr32/src/init_board.c b/examples/lock-app/efr32/src/init_board.c → apps/lock/efr32/src/init_board.c
diff --git a/examples/lock-app/efr32/src/init_mcu.c → apps/lock/efr32/src/init_mcu.c b/examples/lock-app/efr32/src/init_mcu.c → apps/lock/efr32/src/init_mcu.c
diff --git a/examples/lock-app/efr32/src/main.cpp → apps/lock/efr32/src/main.cpp b/examples/lock-app/efr32/src/main.cpp → apps/lock/efr32/src/main.cpp
diff --git a/...ock-app/efr32/third_party/connectedhomeip → apps/lock/efr32/third_party/connectedhomeip b/...ock-app/efr32/third_party/connectedhomeip → apps/lock/efr32/third_party/connectedhomeip
diff --git a/examples/lock-app/nrf5/Makefile → apps/lock/nrf5/Makefile b/examples/lock-app/nrf5/Makefile → apps/lock/nrf5/Makefile
diff --git a/examples/lock-app/nrf5/README.md → apps/lock/nrf5/README.md b/examples/lock-app/nrf5/README.md → apps/lock/nrf5/README.md
@@ -150,7 +150,7 @@ Alternatively, you can run `Build nRF5 Lock App` VSCode task.
 
 * Run make to build the application
 
-        $ cd ~/connectedhomeip/examples/lock-app/nrf5
+        $ cd ~/connectedhomeip/apps/lock/nrf5
         $ make clean
         $ make
 
@@ -169,7 +169,7 @@ should be erased and the Nordic SoftDevice image installed.
 
 * Use the Makefile to erase the flash and program the Nordic SoftDevice image.
 
-        $ cd ~/connectedhomeip/examples/lock-app/nrf5
+        $ cd ~/connectedhomeip/apps/lock/nrf5
         $ make erase
         $ make flash-softdevice
 
@@ -184,7 +184,7 @@ and application again.
 
 To flash the example app, run the following commands:
 
-        $ cd ~/connectedhomeip/examples/lock-app/nrf5
+        $ cd ~/connectedhomeip/apps/lock/nrf5
         $ make flash-app
 
 > The [VSCode devcontainer](#using-chips-vscode-devcontainer) cannot communicate

diff --git a/.../lock-app/nrf5/doc/images/nrf52840-dk.jpg → apps/lock/nrf5/doc/images/nrf52840-dk.jpg b/.../lock-app/nrf5/doc/images/nrf52840-dk.jpg → apps/lock/nrf5/doc/images/nrf52840-dk.jpg
diff --git a/examples/lock-app/nrf5/gdb-startup-cmds.txt → apps/lock/nrf5/gdb-startup-cmds.txt b/examples/lock-app/nrf5/gdb-startup-cmds.txt → apps/lock/nrf5/gdb-startup-cmds.txt
diff --git a/examples/lock-app/nrf5/main/AppTask.cpp → apps/lock/nrf5/main/AppTask.cpp b/examples/lock-app/nrf5/main/AppTask.cpp → apps/lock/nrf5/main/AppTask.cpp
diff --git a/...es/lock-app/nrf5/main/BoltLockManager.cpp → apps/lock/nrf5/main/BoltLockManager.cpp b/...es/lock-app/nrf5/main/BoltLockManager.cpp → apps/lock/nrf5/main/BoltLockManager.cpp
diff --git a/examples/lock-app/nrf5/main/LEDWidget.cpp → apps/lock/nrf5/main/LEDWidget.cpp b/examples/lock-app/nrf5/main/LEDWidget.cpp → apps/lock/nrf5/main/LEDWidget.cpp
diff --git a/...les/lock-app/nrf5/main/include/AppEvent.h → apps/lock/nrf5/main/include/AppEvent.h b/...les/lock-app/nrf5/main/include/AppEvent.h → apps/lock/nrf5/main/include/AppEvent.h
diff --git a/...ples/lock-app/nrf5/main/include/AppTask.h → apps/lock/nrf5/main/include/AppTask.h b/...ples/lock-app/nrf5/main/include/AppTask.h → apps/lock/nrf5/main/include/AppTask.h
diff --git a/...k-app/nrf5/main/include/BoltLockManager.h → .../lock/nrf5/main/include/BoltLockManager.h b/...k-app/nrf5/main/include/BoltLockManager.h → .../lock/nrf5/main/include/BoltLockManager.h
diff --git a/...app/nrf5/main/include/CHIPProjectConfig.h → ...ock/nrf5/main/include/CHIPProjectConfig.h b/...app/nrf5/main/include/CHIPProjectConfig.h → ...ock/nrf5/main/include/CHIPProjectConfig.h
diff --git a/...ck-app/nrf5/main/include/FreeRTOSConfig.h → apps/lock/nrf5/main/include/FreeRTOSConfig.h b/...ck-app/nrf5/main/include/FreeRTOSConfig.h → apps/lock/nrf5/main/include/FreeRTOSConfig.h
diff --git a/...es/lock-app/nrf5/main/include/LEDWidget.h → apps/lock/nrf5/main/include/LEDWidget.h b/...es/lock-app/nrf5/main/include/LEDWidget.h → apps/lock/nrf5/main/include/LEDWidget.h
diff --git a/...-app/nrf5/main/include/OpenThreadConfig.h → ...lock/nrf5/main/include/OpenThreadConfig.h b/...-app/nrf5/main/include/OpenThreadConfig.h → ...lock/nrf5/main/include/OpenThreadConfig.h
diff --git a/...s/lock-app/nrf5/main/include/app_config.h → apps/lock/nrf5/main/include/app_config.h b/...s/lock-app/nrf5/main/include/app_config.h → apps/lock/nrf5/main/include/app_config.h
diff --git a/...main/include/freertos_tasks_c_additions.h → ...main/include/freertos_tasks_c_additions.h b/...main/include/freertos_tasks_c_additions.h → ...main/include/freertos_tasks_c_additions.h
diff --git a/...nrf5/main/include/nrf_log_ctrl_internal.h → ...nrf5/main/include/nrf_log_ctrl_internal.h b/...nrf5/main/include/nrf_log_ctrl_internal.h → ...nrf5/main/include/nrf_log_ctrl_internal.h
diff --git a/...n/ldscripts/chip-nrf52840-lock-example.ld → ...n/ldscripts/chip-nrf52840-lock-example.ld b/...n/ldscripts/chip-nrf52840-lock-example.ld → ...n/ldscripts/chip-nrf52840-lock-example.ld
diff --git a/examples/lock-app/nrf5/main/main.cpp → apps/lock/nrf5/main/main.cpp b/examples/lock-app/nrf5/main/main.cpp → apps/lock/nrf5/main/main.cpp
diff --git a/...es/lock-app/nrf5/main/support/AltPrintf.c → apps/lock/nrf5/main/support/AltPrintf.c b/...es/lock-app/nrf5/main/support/AltPrintf.c → apps/lock/nrf5/main/support/AltPrintf.c
diff --git a/...p/nrf5/main/support/CXXExceptionStubs.cpp → ...k/nrf5/main/support/CXXExceptionStubs.cpp b/...p/nrf5/main/support/CXXExceptionStubs.cpp → ...k/nrf5/main/support/CXXExceptionStubs.cpp
diff --git a/.../main/support/FreeRTOSNewlibLockSupport.c → .../main/support/FreeRTOSNewlibLockSupport.c b/.../main/support/FreeRTOSNewlibLockSupport.c → .../main/support/FreeRTOSNewlibLockSupport.c
diff --git a/...les/lock-app/nrf5/main/support/nRF5Sbrk.c → apps/lock/nrf5/main/support/nRF5Sbrk.c b/...les/lock-app/nrf5/main/support/nRF5Sbrk.c → apps/lock/nrf5/main/support/nRF5Sbrk.c
diff --git a/examples/lock-app/nrf5/start-gdb.sh → apps/lock/nrf5/start-gdb.sh b/examples/lock-app/nrf5/start-gdb.sh → apps/lock/nrf5/start-gdb.sh
diff --git a/...s/lock-app/nrf5/start-jlink-gdb-server.sh → apps/lock/nrf5/start-jlink-gdb-server.sh b/...s/lock-app/nrf5/start-jlink-gdb-server.sh → apps/lock/nrf5/start-jlink-gdb-server.sh
diff --git a/...lock-app/nrf5/third_party/connectedhomeip → apps/lock/nrf5/third_party/connectedhomeip b/...lock-app/nrf5/third_party/connectedhomeip → apps/lock/nrf5/third_party/connectedhomeip
diff --git a/integrations/docker/run_build.sh b/integrations/docker/run_build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 # This script assumes it's being run from the ToT
 
-./bootstrap && mkdir -p build/default && (cd build/default && ../../configure --enable-coverage) && make -C build/default "${@:-distcheck}" && git clean -Xdf && (cd examples/lock-app/nrf5 && make)
+./bootstrap && mkdir -p build/default && (cd build/default && ../../configure --enable-coverage) && make -C build/default "${@:-distcheck}" && git clean -Xdf && (cd apps/lock/nrf5 && make)