Merge branch '3.5'

.github/workflows/build.yml

@@ -1,57 +1,5 @@
 on: [push, pull_request, workflow_dispatch]
 
-name: Build
-
 jobs:
   build:
-    runs-on: ubuntu-latest
-    container:
-      image: zmkfirmware/zmk-build-arm:stable
-    name: Build
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Cache west modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-zephyr-modules
-        with:
-          path: |
-            modules/
-            tools/
-            zephyr/
-            bootloader/
-            zmk/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - name: West Init
-        run: west init -l config
-      - name: West Update
-        run: west update
-      - name: West Zephyr export
-        run: west zephyr-export
-      - name: West Build (dongle)
-        run: west build -s zmk/app -d build/dongle -b ego62_dongle -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
-      - name: Ego62 Dongle Kconfig file
-        run: grep -vE '(^#|^$)' build/dongle/zephyr/.config
-      - name: West Build (left)
-        run: west build -s zmk/app -d build/left -b ego62_left -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" 
-      - name: Ego62 Left Kconfig file
-        run: grep -vE '(^#|^$)' build/left/zephyr/.config
-      - name: West Build (right)
-        run: west build -s zmk/app -d build/right -b ego62_right -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
-      - name: Ego62 Right Kconfig file
-        run: grep -vE '(^#|^$)' build/right/zephyr/.config
-      - name: Rename zmk.uf2
-        run: cp build/left/zephyr/zmk.uf2 ego62_left.uf2 && cp build/right/zephyr/zmk.uf2 ego62_right.uf2 && cp build/dongle/zephyr/zmk.uf2 ego62_dongle.uf2
-      - name: Archive (Ego62)
-        uses: actions/upload-artifact@v3
-        with:
-          name: firmware
-          path: |
-            ego62_left.uf2
-            ego62_right.uf2
-            ego62_dongle.uf2
+    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main

build.yaml

@@ -11,13 +11,17 @@
 #   - board: nice_nano_v2
 #     shield: reviung41
 #
----
-include:
-  - board: ego62
-    shield: ego62_dongle
-  - board: ego62
-    shield: ego62_left
-  - board: ego62
-    shield: ego62_right
-  - board: ego62
-    shield: settings_reset
+
+board: [ "egokb_control" ]
+shield: [ "ego62_dongle", "ego62_left", "ego62_right", "settings_reset" ]
+
+# ---
+# include:
+#   - board: egokb_control
+#     shield: ego62_dongle
+#   - board: egokb_control
+#     shield: ego62_left
+#   - board: egokb_control
+#     shield: ego62_right
+#   - board: egokb_control
+#     shield: settings_reset

config/boards/arm/ego62/Kconfig → config/boards/arm/egokb_control/Kconfig

@@ -4,4 +4,4 @@ config BOARD_ENABLE_DCDC
 	bool "Enable DCDC mode"
 	select SOC_DCDC_NRF52X
 	default y
-	depends on BOARD_EGO62_DONGLE || BOARD_EGO62_LEFT || BOARD_EGO62_RIGHT
+	depends on BOARD_EGOKB_CONTROL

config/boards/arm/egokb_control/Kconfig.board

@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2021 Polarity Works
+# SPDX-License-Identifier: MIT
+#
+
+config BOARD_EGOKB_CONTROL
+	bool "egokb_control"
+	depends on SOC_NRF52840_QIAA

config/boards/arm/egokb_control/Kconfig.defconfig

@@ -0,0 +1,19 @@
+# BlueMicro840 board configuration
+
+# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# SPDX-License-Identifier: MIT
+
+if BOARD_EGOKB_CONTROL
+    config BOARD
+    default "egokb_control"
+
+    if USB_DEVICE_STACK
+
+        config USB_NRFX
+            default y
+
+    endif # USB_DEVICE_STACK
+
+    config BT_CTLR
+        default BT
+endif

config/boards/arm/egokb_control/board.cmake

@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Nick Winans
+# SPDX-License-Identifier: MIT
+
+set(OPENOCD_NRF5_SUBFAMILY nrf52)
+board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)