Move Zephyr app into subdirectory.

57 files changed, 1 insertions, 9 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 90a76bbe74..55b0fac7d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,39 +9,31 @@ jobs:
       # you must check out the repository
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Move files into workspace subdirectory
-        run: |
-          mkdir -p workspace/zmk
-          mv * workspace/zmk || true
       - name: West Init
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-init
         with:
           command: 'init'
-          command-args: '-l workspace/zmk'
+          command-args: '-l app'
       - name: West Update
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-update
-        working-directory: 'workspace/zmk'
         with:
           command: 'update'
       - name: West Config Zephyr Base
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-config
-        working-directory: 'workspace/zmk'
         with:
           command: 'config'
           command-args: '--global zephyr.base-prefer configfile'
       - name: West Zephyr Export
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-zephyr-export
-        working-directory: 'workspace/zmk'
         with:
           command: 'zephyr-export'
       - name: West Build
         uses: ./.github/actions/zephyr-west # Uses an action in the root directory
         id: west-build
-        working-directory: 'workspace/zmk'
         with:
           command: 'build'
           command-args: '-b nucleo_wb55rg -- -DSHIELD=petejohanson_handwire'
diff --git a/.gitignore b/app/.gitignore
index 567609b123..567609b123 100644
--- a/.gitignore
+++ b/app/.gitignore
diff --git a/CMakeLists.txt b/app/CMakeLists.txt
index c5868ee195..c5868ee195 100644
--- a/CMakeLists.txt
+++ b/app/CMakeLists.txt
diff --git a/Kconfig b/app/Kconfig
index 7871b91988..7871b91988 100644
--- a/Kconfig
+++ b/app/Kconfig
diff --git a/boards/Kconfig b/app/boards/Kconfig
index 1c645e6b29..1c645e6b29 100644
--- a/boards/Kconfig
+++ b/app/boards/Kconfig
diff --git a/boards/arm/planck/CMakeLists.txt b/app/boards/arm/planck/CMakeLists.txt
index f26de66e16..f26de66e16 100644
--- a/boards/arm/planck/CMakeLists.txt
+++ b/app/boards/arm/planck/CMakeLists.txt
diff --git a/boards/arm/planck/Kconfig.board b/app/boards/arm/planck/Kconfig.board
index 280b48f7cb..280b48f7cb 100644
--- a/boards/arm/planck/Kconfig.board
+++ b/app/boards/arm/planck/Kconfig.board
diff --git a/boards/arm/planck/Kconfig.defconfig b/app/boards/arm/planck/Kconfig.defconfig
index 3ccd178395..3ccd178395 100644
--- a/boards/arm/planck/Kconfig.defconfig
+++ b/app/boards/arm/planck/Kconfig.defconfig
diff --git a/boards/arm/planck/board.cmake b/app/boards/arm/planck/board.cmake
index e2bdf4827e..e2bdf4827e 100644
--- a/boards/arm/planck/board.cmake
+++ b/app/boards/arm/planck/board.cmake
diff --git a/boards/arm/planck/pinmux.c b/app/boards/arm/planck/pinmux.c
index 76bd6d1372..76bd6d1372 100644
--- a/boards/arm/planck/pinmux.c
+++ b/app/boards/arm/planck/pinmux.c
diff --git a/boards/arm/planck/planck_rev6.dts b/app/boards/arm/planck/planck_rev6.dts
index 58de7a4434..58de7a4434 100644
--- a/boards/arm/planck/planck_rev6.dts
+++ b/app/boards/arm/planck/planck_rev6.dts
diff --git a/boards/arm/planck/planck_rev6.yaml b/app/boards/arm/planck/planck_rev6.yaml
index 9c5af3fae9..9c5af3fae9 100644
--- a/boards/arm/planck/planck_rev6.yaml
+++ b/app/boards/arm/planck/planck_rev6.yaml
diff --git a/boards/arm/planck/planck_rev6_defconfig b/app/boards/arm/planck/planck_rev6_defconfig
index 17330e2c0f..17330e2c0f 100644
--- a/boards/arm/planck/planck_rev6_defconfig
+++ b/app/boards/arm/planck/planck_rev6_defconfig
diff --git a/boards/native_posix.conf b/app/boards/native_posix.conf
index 5bfb366ca9..5bfb366ca9 100644
--- a/boards/native_posix.conf
+++ b/app/boards/native_posix.conf
diff --git a/boards/native_posix.overlay b/app/boards/native_posix.overlay
index 9d92beeb33..9d92beeb33 100644
--- a/boards/native_posix.overlay
+++ b/app/boards/native_posix.overlay
diff --git a/boards/shields/petejohanson_handwire/Kconfig.defconfig b/app/boards/shields/petejohanson_handwire/Kconfig.defconfig
index 7da09aca52..7da09aca52 100644
--- a/boards/shields/petejohanson_handwire/Kconfig.defconfig
+++ b/app/boards/shields/petejohanson_handwire/Kconfig.defconfig
diff --git a/boards/shields/petejohanson_handwire/Kconfig.shield b/app/boards/shields/petejohanson_handwire/Kconfig.shield
index f6e8a3fd77..f6e8a3fd77 100644
--- a/boards/shields/petejohanson_handwire/Kconfig.shield
+++ b/app/boards/shields/petejohanson_handwire/Kconfig.shield
diff --git a/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h b/app/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h
index 01cd9e5b13..01cd9e5b13 100644
--- a/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h
+++ b/app/boards/shields/petejohanson_handwire/keymaps/default/include/keymap.h
diff --git a/boards/shields/petejohanson_handwire/keymaps/default/keymap.c b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.c
index 067cd08e16..067cd08e16 100644
--- a/boards/shields/petejohanson_handwire/keymaps/default/keymap.c
+++ b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.c
diff --git a/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay
index d87363f908..d87363f908 100644
--- a/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay
+++ b/app/boards/shields/petejohanson_handwire/keymaps/default/keymap.overlay
diff --git a/boards/shields/petejohanson_handwire/petejohanson_handwire.conf b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.conf
index 63829ba382..63829ba382 100644
--- a/boards/shields/petejohanson_handwire/petejohanson_handwire.conf
+++ b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.conf
diff --git a/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
index d65b3b1dcd..d65b3b1dcd 100644
--- a/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
+++ b/app/boards/shields/petejohanson_handwire/petejohanson_handwire.overlay
diff --git a/cmake/keymap.cmake b/app/cmake/keymap.cmake
index 2d3c629273..2d3c629273 100644
--- a/cmake/keymap.cmake
+++ b/app/cmake/keymap.cmake
diff --git a/drivers/zephyr/CMakeLists.txt b/app/drivers/zephyr/CMakeLists.txt
index 03a97c6ee6..03a97c6ee6 100644
--- a/drivers/zephyr/CMakeLists.txt
+++ b/app/drivers/zephyr/CMakeLists.txt
diff --git a/drivers/zephyr/Kconfig b/app/drivers/zephyr/Kconfig
index 2dcb3a827b..2dcb3a827b 100644
--- a/drivers/zephyr/Kconfig
+++ b/app/drivers/zephyr/Kconfig
diff --git a/drivers/zephyr/dts/bindings/gpio-kscan.yaml b/app/drivers/zephyr/dts/bindings/gpio-kscan.yaml
index 0698c3efc6..0698c3efc6 100644
--- a/drivers/zephyr/dts/bindings/gpio-kscan.yaml
+++ b/app/drivers/zephyr/dts/bindings/gpio-kscan.yaml
diff --git a/drivers/zephyr/kscan_gpio.c b/app/drivers/zephyr/kscan_gpio.c
index a53e2f9120..a53e2f9120 100644
--- a/drivers/zephyr/kscan_gpio.c
+++ b/app/drivers/zephyr/kscan_gpio.c
diff --git a/drivers/zephyr/module.yaml b/app/drivers/zephyr/module.yaml
index cbff6a1aef..cbff6a1aef 100644
--- a/drivers/zephyr/module.yaml
+++ b/app/drivers/zephyr/module.yaml
diff --git a/dts/bindings/zmk,keymap.yaml b/app/dts/bindings/zmk,keymap.yaml
index 8c56f93c87..8c56f93c87 100644
--- a/dts/bindings/zmk,keymap.yaml
+++ b/app/dts/bindings/zmk,keymap.yaml
diff --git a/dts/bindings/zmk,kscan-composite.yaml b/app/dts/bindings/zmk,kscan-composite.yaml
index 6126c30340..6126c30340 100644
--- a/dts/bindings/zmk,kscan-composite.yaml
+++ b/app/dts/bindings/zmk,kscan-composite.yaml
diff --git a/dts/bindings/zmk,kscan-mock.yaml b/app/dts/bindings/zmk,kscan-mock.yaml
index 41dd5b8177..41dd5b8177 100644
--- a/dts/bindings/zmk,kscan-mock.yaml
+++ b/app/dts/bindings/zmk,kscan-mock.yaml
diff --git a/dts/bindings/zmk,layers.yaml b/app/dts/bindings/zmk,layers.yaml
index c9b462a146..c9b462a146 100644
--- a/dts/bindings/zmk,layers.yaml
+++ b/app/dts/bindings/zmk,layers.yaml
diff --git a/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h
index c91d27b115..c91d27b115 100644
--- a/include/dt-bindings/zmk/keys.h
+++ b/app/include/dt-bindings/zmk/keys.h
diff --git a/include/zmk/ble.h b/app/include/zmk/ble.h
index a77237d8ef..a77237d8ef 100644
--- a/include/zmk/ble.h
+++ b/app/include/zmk/ble.h
diff --git a/include/zmk/endpoints.h b/app/include/zmk/endpoints.h
index 255ca54d50..255ca54d50 100644
--- a/include/zmk/endpoints.h
+++ b/app/include/zmk/endpoints.h
diff --git a/include/zmk/handlers.h b/app/include/zmk/handlers.h
index a10851f879..a10851f879 100644
--- a/include/zmk/handlers.h
+++ b/app/include/zmk/handlers.h
diff --git a/include/zmk/hid.h b/app/include/zmk/hid.h
index 7e3560d582..7e3560d582 100644
--- a/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
diff --git a/include/zmk/hog.h b/app/include/zmk/hog.h
index e2f976a20d..e2f976a20d 100644
--- a/include/zmk/hog.h
+++ b/app/include/zmk/hog.h
diff --git a/include/zmk/keymap.h b/app/include/zmk/keymap.h
index 285b071810..285b071810 100644
--- a/include/zmk/keymap.h
+++ b/app/include/zmk/keymap.h
diff --git a/include/zmk/keys.h b/app/include/zmk/keys.h
index 6966bbac05..6966bbac05 100644
--- a/include/zmk/keys.h
+++ b/app/include/zmk/keys.h
diff --git a/include/zmk/kscan-mock.h b/app/include/zmk/kscan-mock.h
index d481899f1c..d481899f1c 100644
--- a/include/zmk/kscan-mock.h
+++ b/app/include/zmk/kscan-mock.h
diff --git a/include/zmk/kscan.h b/app/include/zmk/kscan.h
index ebffccdafe..ebffccdafe 100644
--- a/include/zmk/kscan.h
+++ b/app/include/zmk/kscan.h
diff --git a/include/zmk/matrix.h b/app/include/zmk/matrix.h
index 783c98e20d..783c98e20d 100644
--- a/include/zmk/matrix.h
+++ b/app/include/zmk/matrix.h
diff --git a/include/zmk/usb_hid.h b/app/include/zmk/usb_hid.h
index 5d7c744a5c..5d7c744a5c 100644
--- a/include/zmk/usb_hid.h
+++ b/app/include/zmk/usb_hid.h
diff --git a/prj.conf b/app/prj.conf
index c4d6d352c2..c4d6d352c2 100644
--- a/prj.conf
+++ b/app/prj.conf
diff --git a/src/ble.c b/app/src/ble.c
index 51607c662b..51607c662b 100644
--- a/src/ble.c
+++ b/app/src/ble.c
diff --git a/src/endpoints.c b/app/src/endpoints.c
index f46d42dffd..f46d42dffd 100644
--- a/src/endpoints.c
+++ b/app/src/endpoints.c
diff --git a/src/handlers.c b/app/src/handlers.c
index 464b1abde1..464b1abde1 100644
--- a/src/handlers.c
+++ b/app/src/handlers.c
diff --git a/src/hid.c b/app/src/hid.c
index b3d47cf90b..b3d47cf90b 100644
--- a/src/hid.c
+++ b/app/src/hid.c
diff --git a/src/hog.c b/app/src/hog.c
index 087af4238c..087af4238c 100644
--- a/src/hog.c
+++ b/app/src/hog.c
diff --git a/src/keymap.c b/app/src/keymap.c
index 569a2cc79f..569a2cc79f 100644
--- a/src/keymap.c
+++ b/app/src/keymap.c
diff --git a/src/kscan.c b/app/src/kscan.c
index 1f54a147a3..1f54a147a3 100644
--- a/src/kscan.c
+++ b/app/src/kscan.c
diff --git a/src/kscan_composite.c b/app/src/kscan_composite.c
index d46484b7bf..d46484b7bf 100644
--- a/src/kscan_composite.c
+++ b/app/src/kscan_composite.c
diff --git a/src/kscan_mock.c b/app/src/kscan_mock.c
index 7d2d24d27d..7d2d24d27d 100644
--- a/src/kscan_mock.c
+++ b/app/src/kscan_mock.c
diff --git a/src/main.c b/app/src/main.c
index 1ced310d7c..1ced310d7c 100644
--- a/src/main.c
+++ b/app/src/main.c
diff --git a/src/usb_hid.c b/app/src/usb_hid.c
index 2862d56650..2862d56650 100644
--- a/src/usb_hid.c
+++ b/app/src/usb_hid.c
diff --git a/west.yml b/app/west.yml
index 156bc857bb..156bc857bb 100644
--- a/west.yml
+++ b/app/west.yml