chore(main): release 0.4.0

Override kscan tick wait time on RP2350 as well, to match RP2040.

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/zmkfirmware/zmk-dev-arm:3.5
+FROM docker.io/zmkfirmware/zmk-dev-arm:4.1-branch
 
 COPY .bashrc tmp
 RUN mv /tmp/.bashrc ~/.bashrc

.github/workflows/ble-test.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Find test directories
         id: test-dirs
         run: |
@@ -35,10 +35,10 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:4.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Cache west modules
         uses: actions/cache@v4
         env:

.github/workflows/build-user-config.yml

@@ -30,17 +30,28 @@ jobs:
     name: Fetch Build Keyboards
     outputs:
       build_matrix: ${{ env.build_matrix }}
+      has_valid_build_matrix: ${{ steps.fetch.outputs.has_valid_build_matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Fetch Build Matrix
+        id: fetch
         run: |
-          echo "build_matrix=$(yq -oj -I0 '${{ inputs.build_matrix_path }}')" >> $GITHUB_ENV
+          matrix_content=$(yq -oj -I0 '${{ inputs.build_matrix_path }}')
-          yq -oj "${{ inputs.build_matrix_path }}"
+
+          if [ -z "$matrix_content" ] || [ "$matrix_content" = "null" ]; then
+            echo "::notice file=${{inputs.build_matrix_path}},title=Empty build matrix file::To add a keyboard to the build, see https://zmk.dev/docs/user-setup#add-a-keyboard."
+            echo "has_valid_build_matrix=false" >> $GITHUB_OUTPUT
+          else
+            echo "build_matrix=$matrix_content" >> $GITHUB_ENV
+            echo "has_valid_build_matrix=true" >> $GITHUB_OUTPUT
+            echo "$matrix_content"
+          fi
 
   build:
     runs-on: ubuntu-latest
+    if: needs.matrix.outputs.has_valid_build_matrix == 'true'
     container:
       image: zmkfirmware/zmk-build-arm:stable
     needs: matrix
@@ -49,15 +60,21 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }}
     steps:
+      - name: Act Workaround # https://github.com/nektos/act/issues/973
+        if: ${{ env.ACT }}
+        run: |
+          apt-get update && apt-get install -y curl unzip
+          curl -fsSL https://deb.nodesource.com/setup_22.x | bash && apt install -y nodejs
+
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Create build directory
         run: |
           echo "build_dir=$(mktemp -d)" >> $GITHUB_ENV
 
       - name: Prepare variables
-        shell: sh -x {0}
+        shell: bash -x {0}
         env:
           board: ${{ matrix.board }}
           shield: ${{ matrix.shield }}
@@ -81,7 +98,7 @@ jobs:
           echo "extra_west_args=${extra_west_args}" >> $GITHUB_ENV
           echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV
           echo "display_name=${shield:+$shield - }${board}" >> $GITHUB_ENV
-          echo "artifact_name=${artifact_name:-${shield:+$shield-}${board}-zmk}" >> $GITHUB_ENV
+          echo "artifact_name=${artifact_name:-${shield:+$shield-}${board//\//_}-zmk}" >> $GITHUB_ENV
 
       - name: Copy config files to isolated temporary directory
         run: |
@@ -116,6 +133,13 @@ jobs:
         working-directory: ${{ env.base_dir }}
         run: west update --fetch-opt=--filter=tree:0
 
+      - name: Check ZMK revision
+        working-directory: ${{ env.base_dir }}
+        run: |
+          zmk_revision=$(west list -f "{revision}" zmk)
+          echo "zmk_revision=${zmk_revision}" >> $GITHUB_ENV
+          echo "ZMK revision: ${zmk_revision}"
+
       - name: West Zephyr export
         working-directory: ${{ env.base_dir }}
         run: west zephyr-export
@@ -125,6 +149,38 @@ jobs:
         shell: sh -x {0}
         run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" ${{ env.extra_west_args }} -- -DZMK_CONFIG=${{ env.base_dir }}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}
 
+      - name: Warn about building from main if build fails
+        if: failure() && env.zmk_revision == 'main'
+        run: |
+          echo "# Consider Pinning ZMK" >> $GITHUB_STEP_SUMMARY
+          echo "Your recent build failure might be the result of breaking changes made to ZMK's main branch." >> $GITHUB_STEP_SUMMARY
+          echo "Consider [pinning your ZMK version](https://zmk.dev/blog/2025/06/20/pinned-zmk) to a release for increased stability." >> $GITHUB_STEP_SUMMARY
+          echo "See also the [list of released versions](https://github.com/zmkfirmware/zmk/releases)." >> $GITHUB_STEP_SUMMARY
+          echo "If you wish to stay on main, check the most recent pending release PR for breaking changes. [Our blog](https://zmk.dev/blog) may have upgrade information if breaking changes are significant." >> $GITHUB_STEP_SUMMARY
+
+      - name: Check if building a board without explicit ZMK compat
+        if: always()
+        working-directory: "${{ env.base_dir }}/${{ inputs.config_path }}"
+        run: |
+          if ! (grep "CONFIG_ZMK_BOARD_COMPAT=y" "${{ env.build_dir }}/zephyr/.config" > /dev/null)
+          then
+            original_board=$(echo "${{ matrix.board }}" | sed -e 's$/.*$$')
+            west_board=$(west boards --board-root ${{ env.base_dir }}/zmk/app/module --board-root ${{ env.base_dir }}/zmk/app --board "${original_board}")
+            if [ -z "$west_board" ]; then
+              echo "Not found the board listed with west boards. Skipping further checking."
+              exit 0
+            fi
+
+            west boards --board-root ${{ env.base_dir }}/zmk/app/module --board-root ${{ env.base_dir }}/zmk/app --board "${original_board}" --format "{qualifiers}" | grep "zmk" > /dev/null
+            if [ $? -ne 0 ]
+            then
+              echo "::warning file=build/zephyr/.config,title=Missing ZMK Compat::The selected board does not report explicit ZMK compat. Please verify you've selected the correct board and ZMK variant if one exists"
+            else
+              echo "::error file=build/zephyr/.config,title=Missing ZMK Compat::The selected board is not set up for ZMK and there is a ZMK variant available. See https://zmk.dev/blog/2025/12/09/zephyr-4-1#zmk-board-variant."
+              exit 1
+            fi
+          fi
+
       - name: ${{ env.display_name }} Kconfig file
         run: |
           if [ -f "${{ env.build_dir }}/zephyr/.config" ]
@@ -168,6 +224,7 @@ jobs:
 
   merge:
     runs-on: ubuntu-latest
+    if: needs.matrix.outputs.has_valid_build_matrix == 'true'
     needs: build
     name: Merge Output Artifacts
     steps:

.github/workflows/build.yml

@@ -23,14 +23,14 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:4.1
     needs: compile-matrix
     strategy:
       matrix:
         include: ${{ fromJSON(needs.compile-matrix.outputs.include-list) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Cache west modules
@@ -61,7 +61,7 @@ jobs:
         with:
           node-version: "14.x"
       - name: Install @actions/artifact
-        run: npm install @actions/artifact
+        run: npm install @actions/artifact@5.0.3
       - name: Build
         uses: actions/github-script@v7
         id: boards-list
@@ -123,7 +123,7 @@ jobs:
                 }
 
                 const cmakeName = shieldArgs['cmake-args'] ? '-' + (shieldArgs.nickname || shieldArgs['cmake-args'].split(' ').join('')) : '';
-                const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`;
+                const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`.replaceAll('/', '_');
 
                 await artifact.uploadArtifact(artifactName, files, rootDirectory, options);
               } catch (e) {
@@ -187,7 +187,7 @@ jobs:
       core-include: ${{ steps.core-list.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Use Node.js
@@ -218,7 +218,7 @@ jobs:
       boards-include: ${{ steps.boards-list.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -277,6 +277,7 @@ jobs:
                       );
                     } else {
                       console.error("Board without keys or interconnect");
+                      return [];
                     }
                     break;
                   case "shield":
@@ -345,7 +346,7 @@ jobs:
       organized-metadata: ${{ steps.organize-metadata.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Use Node.js
@@ -427,7 +428,7 @@ jobs:
       core-changes: ${{ steps.core-changes.outputs.result }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - uses: tj-actions/changed-files@9200e69727eb73eb060652b19946b8a2fdfb654b # pin to v45.0.8 due to https://github.com/tj-actions/changed-files/issues/2463 https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised

.github/workflows/doc-checks.yml

@@ -14,7 +14,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: bahmutov/npm-install@v1
         with:
           working-directory: docs
@@ -24,7 +24,7 @@ jobs:
   typecheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: bahmutov/npm-install@v1
         with:
           working-directory: docs

.github/workflows/hardware-metadata-validation.yml

@@ -18,9 +18,9 @@ jobs:
   validate-metadata:
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-dev-arm:3.5
+      image: docker.io/zmkfirmware/zmk-dev-arm:4.1
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: pip install --break-system-packages -r app/scripts/requirements.txt
       - name: West init

.github/workflows/pre-commit.yml

@@ -8,7 +8,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x

.github/workflows/release-please.yml

@@ -35,7 +35,7 @@ jobs:
       ZMK_RELEASE_PLEASE_TOKEN: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
       VERSION: v${{ needs.handle-commit.outputs.major }}.${{ needs.handle-commit.outputs.minor }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Create major.minor branch
         if: ${{ needs.handle-commit.outputs.patch == '0' }}

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Find test directories
         id: test-dirs
         run: |
@@ -37,10 +37,10 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:4.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Cache west modules
         uses: actions/cache@v4
         env:
@@ -66,7 +66,7 @@ jobs:
         run: west zephyr-export
       - name: Test ${{ matrix.test }}
         working-directory: app
-        run: west test tests/${{ matrix.test }}
+        run: ZMK_TESTS_VERBOSE=1 west test tests/${{ matrix.test }}
       - name: Archive artifacts
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

.gitignore

@@ -1,6 +1,7 @@
 /.west
 /bootloader
 /modules
+/optional
 /tools
 /zephyr
 /zmk-config

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.3.0"}
+{".":"0.4.0"}

CHANGELOG.md

@@ -1,5 +1,99 @@
 # Changelog
 
+## [0.4.0](https://github.com/zmkfirmware/zmk/compare/v0.3.0...v0.4.0) (2026-03-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* Move to zephyr v4.1 ([#3060](https://github.com/zmkfirmware/zmk/issues/3060))
+* **core:** Allow layer behaviors to "lock" layers on (https://github.com/zmkfirmware/zmk/pull/2717)
+
+### Features
+
+* Add double tap to enter bootloader functionality ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* Add nBOOT_SEL bit setup for STM32 G0/C0 targets ([f85ec7e](https://github.com/zmkfirmware/zmk/commit/f85ec7e7a24be10f1cf59025a192569dc0b33167))
+* Add ZMK_BOARD_COMPAT Kconfig symbol, and check for it ([a23aa00](https://github.com/zmkfirmware/zmk/commit/a23aa009d7a07d67fe5609caca7372e16610f238))
+* Allow layer behaviors to "lock" layers on (https://github.com/zmkfirmware/zmk/pull/2717) ([5138c6f](https://github.com/zmkfirmware/zmk/commit/5138c6fb14783b756c5a3e61581625c700f3555b))
+* **behaviors:** Add retention boot mode to reset. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **ble:** Use appearance set in the BT_DEVICE_APPEARANCE config ([#3115](https://github.com/zmkfirmware/zmk/issues/3115)) ([ad7fbfe](https://github.com/zmkfirmware/zmk/commit/ad7fbfef920d9907ca8f143e273fa9eb7d84b25a))
+* **boards/shields:** Add settings for Rpi Pico and add tester_rpi_pico shield ([#2900](https://github.com/zmkfirmware/zmk/issues/2900)) ([ccf20a1](https://github.com/zmkfirmware/zmk/commit/ccf20a1f5c1534a197d32279abbe0eaf651099d8))
+* **boards:** add support for nrf52840dongle_nrf52840 ([#3011](https://github.com/zmkfirmware/zmk/issues/3011)) ([c7fae18](https://github.com/zmkfirmware/zmk/commit/c7fae18ae122b2465080507380dd55d096edd666))
+* **core:** (Optionally) use Zephyr keyboard input devices ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **core:** mapper for magic bootloader values. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **display:** Add thread name to dedicated display queue. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **docs:** Update New Behavior Guide ([#3107](https://github.com/zmkfirmware/zmk/issues/3107)) ([e34793e](https://github.com/zmkfirmware/zmk/commit/e34793e8c7193bc868b95ec38d78f67956f759cb))
+* **endpoints:** add "no endpoint" value ([6e7e0de](https://github.com/zmkfirmware/zmk/commit/6e7e0de2b621073392816b284ab4931bee709ee8))
+* **endpoints:** add "no endpoint" value ([#3140](https://github.com/zmkfirmware/zmk/issues/3140)) ([6e7e0de](https://github.com/zmkfirmware/zmk/commit/6e7e0de2b621073392816b284ab4931bee709ee8))
+* **layouts:** Add physical layout for Redox shield ([61de01a](https://github.com/zmkfirmware/zmk/commit/61de01abb00a73349a188ef2e10ad1cd040d31b3))
+* Move to zephyr v4.1 ([#3060](https://github.com/zmkfirmware/zmk/issues/3060)) ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **pointing:** Handle INPUT_BTN_TOUCH codes for mouse buttons ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **pointing:** Release pressed keys on disconnect ([#3204](https://github.com/zmkfirmware/zmk/issues/3204)) ([24487bd](https://github.com/zmkfirmware/zmk/commit/24487bd9744f504724089f0e1cec98431a2d3333))
+* **shields:** Add Studio support to boardsource3x4 ([#3154](https://github.com/zmkfirmware/zmk/issues/3154)) ([40e06f3](https://github.com/zmkfirmware/zmk/commit/40e06f3c0084751f7ae012a71d92d5801ac3b7a0))
+* **split:** Add HID indicators and physical layout set to Wired split ([#3103](https://github.com/zmkfirmware/zmk/issues/3103)) ([7738924](https://github.com/zmkfirmware/zmk/commit/773892434931b74bdf54474b73c909779daa9471))
+
+
+### Bug Fixes
+
+* Add "optional" folder to .gitignore ([#3141](https://github.com/zmkfirmware/zmk/issues/3141)) ([c099041](https://github.com/zmkfirmware/zmk/commit/c0990410da4c0a0c3776448e8c05ca2ce8778c8a))
+* **behaviors:** correctly handle sensor rotation remainder ([#3084](https://github.com/zmkfirmware/zmk/issues/3084)) ([958fa78](https://github.com/zmkfirmware/zmk/commit/958fa788067e18c2228d016fcd826000bb8f0320))
+* **boards:** Add xiao_ble sd_partition label for nosd snippet compat ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **boards:** Fix pillbug board.yml to report extension ([a23aa00](https://github.com/zmkfirmware/zmk/commit/a23aa009d7a07d67fe5609caca7372e16610f238))
+* **boards:** Remove nano overlays for old nice_nano_v2 board ID. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **boards:** Remove some references to old nice_nano_v2 board ID. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **boards:** Retore bootloader support on XIAO BLE. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **ci:** Better safeguards for ZMK variant build check ([#3277](https://github.com/zmkfirmware/zmk/issues/3277)) ([8feeb52](https://github.com/zmkfirmware/zmk/commit/8feeb52eafc716c1697cfe0515e98b78281c3543))
+* **ci:** disable nrf5340dk from being built in our CI ([#3066](https://github.com/zmkfirmware/zmk/issues/3066)) ([522971f](https://github.com/zmkfirmware/zmk/commit/522971f41d62d7e5d6664eb61c84d190781feeb9))
+* **ci:** Fix release please template bump ([#3021](https://github.com/zmkfirmware/zmk/issues/3021)) ([f3233c1](https://github.com/zmkfirmware/zmk/commit/f3233c1b60e4cb4c095572740bcbcaf7111eb804))
+* **ci:** Pin @actions/artifact to a compatible release ([#3230](https://github.com/zmkfirmware/zmk/issues/3230)) ([ada1542](https://github.com/zmkfirmware/zmk/commit/ada1542940c3a01c0866c9fe9c30f489bc087328))
+* **ci:** Prevent slash characters in artifact names. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **ci:** Skip build on empty build matrix ([#3271](https://github.com/zmkfirmware/zmk/issues/3271)) ([df2e979](https://github.com/zmkfirmware/zmk/commit/df2e979d7e03ba84a503e3d90975a599d484b9e0)), closes [#3179](https://github.com/zmkfirmware/zmk/issues/3179)
+* **core:** Don't force CBPRINTF_NANO, for proper formatting. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **core:** Generate correct keymap layer names for all builds ([#3047](https://github.com/zmkfirmware/zmk/issues/3047)) ([0b5a103](https://github.com/zmkfirmware/zmk/commit/0b5a103c187ad337b9f50d824667866c4d7252e1)), closes [#3045](https://github.com/zmkfirmware/zmk/issues/3045)
+* **core:** One tick kscan wait on RP2350 ([#3255](https://github.com/zmkfirmware/zmk/issues/3255)) ([9278505](https://github.com/zmkfirmware/zmk/commit/9278505975759e9cf01b4e6e8ead359b14a11400))
+* **core:** Set a system work queue stack size of 2048 by default ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **core:** support magic bootloader values for nRF52833 ([#3163](https://github.com/zmkfirmware/zmk/issues/3163)) ([308de56](https://github.com/zmkfirmware/zmk/commit/308de56fb938057da7648a411ce0dce780dfc3f1))
+* Disable Nordic dt-bindings header checks. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **display:** Adjust stack sizes for display usage. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **display:** Fix setting the small font for the mono theme. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **display:** port nice!view display code ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **docs:** Improve ZMK setup instructions ([#3209](https://github.com/zmkfirmware/zmk/issues/3209)) ([354cff9](https://github.com/zmkfirmware/zmk/commit/354cff9c36b49eee6abbb8a61e6b927539aebbf2))
+* **docs:** Tweak layer tap example to be clearer ([#3023](https://github.com/zmkfirmware/zmk/issues/3023)) ([919bce7](https://github.com/zmkfirmware/zmk/commit/919bce7962db78139415ccf0e80fb858c89adb3d))
+* Don't enable ZMK Display by default for a few shields ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **endpoints:** Add endpoint setting upgrade ([6e7e0de](https://github.com/zmkfirmware/zmk/commit/6e7e0de2b621073392816b284ab4931bee709ee8))
+* Fix redundant const warning ([#3139](https://github.com/zmkfirmware/zmk/issues/3139)) ([8987f39](https://github.com/zmkfirmware/zmk/commit/8987f3979d7877114ede2f34edb5570a6b454460))
+* **hid:** initialize missing d_scroll_x field in mouse report ([#3196](https://github.com/zmkfirmware/zmk/issues/3196)) ([abce9de](https://github.com/zmkfirmware/zmk/commit/abce9deab76124d72c61a824aaa1affc3dbc1260))
+* **keymap:** Fix overflow in get/set bindings ([#3205](https://github.com/zmkfirmware/zmk/issues/3205)) ([ab46f48](https://github.com/zmkfirmware/zmk/commit/ab46f48dde8aa70e44a2fc2d2a1b81ae703d4981))
+* nice!view built-in widgets render failure from insufficient memory ([#3243](https://github.com/zmkfirmware/zmk/issues/3243)) ([536375e](https://github.com/zmkfirmware/zmk/commit/536375e45ef6d01a9c194803525bf9dd5e119421)), closes [#3219](https://github.com/zmkfirmware/zmk/issues/3219)
+* **pointing:** Refactor for changes to input API ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* Refactor for new Zephyr PM API ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* Remove usage of renamed Kconfig from core coverage. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* replace removed `K_THREAD_STACK_MEMBER` with `K_KERNEL_STACK_MEMBER` ([#3218](https://github.com/zmkfirmware/zmk/issues/3218)) ([f6c629e](https://github.com/zmkfirmware/zmk/commit/f6c629e895bbe3957ec243afb80b11e1e4b4e503))
+* **sensors:** Initialize sensor data to 0 before fetching. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* Set default transport according to enabled transports ([6e7e0de](https://github.com/zmkfirmware/zmk/commit/6e7e0de2b621073392816b284ab4931bee709ee8))
+* **shields:** Proper transparent binding in sofle raise layer ([#3238](https://github.com/zmkfirmware/zmk/issues/3238)) ([5cfc67a](https://github.com/zmkfirmware/zmk/commit/5cfc67a33402b24ab893b8d71cef1af2a869adbb))
+* **split:** correct async UART RX buffer definition ([#3193](https://github.com/zmkfirmware/zmk/issues/3193)) ([36dbf46](https://github.com/zmkfirmware/zmk/commit/36dbf467644d4b4b6b9176241d42261d27fb18f2))
+* **split:** int to pointer cast in bas proxy ([#3105](https://github.com/zmkfirmware/zmk/issues/3105)) ([ece2ce1](https://github.com/zmkfirmware/zmk/commit/ece2ce11b8c7245fbe2b4e41ec9fa7a870632e6c))
+* **split:** Properly return from command handler ([#3120](https://github.com/zmkfirmware/zmk/issues/3120)) ([d32ffb0](https://github.com/zmkfirmware/zmk/commit/d32ffb0a335ece70a9ce3dc3ce014676534ee99b))
+* **split:** Use correct Kconfig for bumping TX buffers for discovery ([#3216](https://github.com/zmkfirmware/zmk/issues/3216)) ([9490391](https://github.com/zmkfirmware/zmk/commit/9490391e1e4010c83291d437b7f9a71ace244581)), closes [#3156](https://github.com/zmkfirmware/zmk/issues/3156)
+* **studio:** avoid decoding buffer overflow ([#3185](https://github.com/zmkfirmware/zmk/issues/3185)) ([70ab6b2](https://github.com/zmkfirmware/zmk/commit/70ab6b243a90b556d113fcdd0c8de1ef3dccdc1e))
+* **studio:** Correct `memset` usage. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **studio:** Correct usage of thread analyzer API ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **studio:** Properly serialize GATT RPC indications. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **tests:** Fix BLE test to account for Zephyr changes ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **underglow:** Remove use of removed Kconfig WS2812 symbol ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **usb:** Adjust Kconfig settings for USB. ([c06fa48](https://github.com/zmkfirmware/zmk/commit/c06fa48ce59e016105d79c20942d085314502d8d))
+* **usb:** Prevent unexpected USB disconnection caused by USB SOF ([#3070](https://github.com/zmkfirmware/zmk/issues/3070)) ([118359c](https://github.com/zmkfirmware/zmk/commit/118359c83efa0758144489fd5e12cc6f5bdbad4c))
+
+
+### Documentation
+
+* Added documentation note on locking layers ([5138c6f](https://github.com/zmkfirmware/zmk/commit/5138c6fb14783b756c5a3e61581625c700f3555b))
+
+
+### Code Refactoring
+
+* **core:** Allow layer behaviors to "lock" layers on (https://github.com/zmkfirmware/zmk/pull/2717) ([5138c6f](https://github.com/zmkfirmware/zmk/commit/5138c6fb14783b756c5a3e61581625c700f3555b))
+
 ## [0.3.0](https://github.com/zmkfirmware/zmk/compare/v0.2.1...v0.3.0) (2025-08-01)
 
 

app/CMakeLists.txt

@@ -23,6 +23,7 @@ zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/ext_power.h)
 # Add your source file to the "app" target. This must come after
 # find_package(Zephyr) which defines the target.
 target_include_directories(app PRIVATE include)
+add_subdirectory(src/boot)
 target_sources(app PRIVATE src/stdlib.c)
 target_sources(app PRIVATE src/activity.c)
 target_sources(app PRIVATE src/behavior.c)

app/Kconfig

@@ -5,6 +5,17 @@ mainmenu "ZMK Firmware"
 
 menu "ZMK"
 
+config ZMK_BOARD_COMPAT
+    bool
+    help
+      Hidden symbol used to hint that a board has been specifically
+      set up with various ZMK requirements in mind, e.g. settings
+      storage, bootloader integration, etc.
+
+      Failure to set this will warn users they may want to verify they
+      used a ZMK variant of an upstream board, or are using a board
+      properly migrated to a newer ZMK version.
+
 menu "Basic Keyboard Setup"
 
 config ZMK_KEYBOARD_NAME
@@ -31,10 +42,10 @@ config BT_DIS_PNP_VID
 config BT_DIS_PNP_PID
     default 0x615E
 
-config BT_DIS_MODEL
+config BT_DIS_MODEL_NUMBER_STR
     default ZMK_KEYBOARD_NAME
 
-config BT_DIS_MANUF
+config BT_DIS_MANUF_NAME_STR
     default "ZMK Project"
 
 # Hardware specific overrides
@@ -129,7 +140,9 @@ config ZMK_USB_BOOT
     bool "USB Boot Protocol Support"
     depends on ZMK_USB
     select USB_HID_BOOT_PROTOCOL
-    select USB_DEVICE_SOF
+
+config USB_DEVICE_INITIALIZE_AT_BOOT
+    default n
 
 if ZMK_USB
 
@@ -185,10 +198,6 @@ config BT_SMP_ALLOW_UNAUTH_OVERWRITE
 config BT_CTLR_PHY_2M
     default n if ZMK_BLE_EXPERIMENTAL_CONN
 
-# BT_TINYCRYPT_ECC is required for BT_SMP_SC_PAIR_ONLY when using HCI
-config BT_TINYCRYPT_ECC
-    default y if BT_HCI && !BT_CTLR
-
 config ZMK_BLE_THREAD_STACK_SIZE
     int "BLE notify thread stack size"
     default 768
@@ -219,9 +228,6 @@ config BT_GATT_NOTIFY_MULTIPLE
 config BT_GATT_AUTO_SEC_REQ
     default (ZMK_SPLIT_BLE && !ZMK_SPLIT_ROLE_CENTRAL)
 
-config BT_DEVICE_APPEARANCE
-    default 961
-
 config BT_PERIPHERAL_PREF_MIN_INT
     default 6
 
@@ -478,13 +484,15 @@ endmenu
 
 menu "Advanced"
 
+rsource "src/boot/Kconfig"
+
 menu "Initialization Priorities"
 
 if USB_DEVICE_STACK
 
 config ZMK_USB_INIT_PRIORITY
     int "USB Init Priority"
-    default 94
+    default 96
 
 config ZMK_USB_HID_INIT_PRIORITY
     int "USB HID Init Priority"
@@ -653,6 +661,13 @@ endmenu # Advanced
 
 endmenu # ZMK
 
+if SOC_FAMILY_NORDIC_NRF
+
+config NRF_SOC_VALIDATE_HEADERS_DISABLED
+    default y
+
+endif
+
 config KERNEL_BIN_NAME
     default "zmk"
 
@@ -687,11 +702,6 @@ config ZMK_KEYMAP_SENSORS_DEFAULT_TRIGGERS_PER_ROTATION
 
 endif # ZMK_KEYMAP_SENSORS
 
-choice CBPRINTF_IMPLEMENTATION
-    default CBPRINTF_NANO
-
-endchoice
-
 module = ZMK
 module-str = zmk
 source "subsys/logging/Kconfig.template.log_config"
@@ -705,8 +715,6 @@ rsource "boards/shields/*/Kconfig.shield"
 # Duplicated from Kconfig.zephyr
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 
-source "$(BOARD_DIR)/Kconfig.defconfig"
-
 # This loads board and shield Kconfigs found under zmk-config/config/
 osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig"
 osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"

app/Kconfig.defaults

@@ -2,8 +2,12 @@
 # SPDX-License-Identifier: MIT
 
 config SYSTEM_WORKQUEUE_STACK_SIZE
-    default 2048 if SOC_RP2040
+    default 3072 if ZMK_DISPLAY
-    default 2048 if ZMK_BLE
+    default 2048
+
+# Basic
+config BT_DEVICE_APPEARANCE
+    default 961
 
 # HID
 if ZMK_HID_REPORT_TYPE_HKRO
@@ -110,4 +114,5 @@ config ZMK_BATTERY_REPORT_INTERVAL
     default 60
 
 # Imports
-rsource "src/split/Kconfig.defaults"
+rsource "src/boot/Kconfig.defaults"
+rsource "src/split/Kconfig.defaults"

app/VERSION

@@ -3,7 +3,7 @@ VERSION_MAJOR = 0
 # x-release-please-end
 
 # x-release-please-start-minor
-VERSION_MINOR = 3
+VERSION_MINOR = 4
 # x-release-please-end
 
 # x-release-please-start-patch

app/boards/01space_rp2040_042lcd.conf

@@ -1,6 +0,0 @@
-CONFIG_ZMK_DISPLAY=y
-CONFIG_LV_FONT_UNSCII_8=n
-CONFIG_ZMK_USB=y
-CONFIG_I2C=y
-CONFIG_I2C_DW=y
-CONFIG_LV_Z_VDB_SIZE=50

app/boards/01space_rp2040_042lcd.overlay

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-&xiao_serial { status = "disabled"; };

app/boards/adafruit/kb2040/Kconfig.adafruit_kb2040

@@ -0,0 +1,9 @@
+# Copyright (c) 2026 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_ADAFRUIT_KB2040
+    select ZMK_BOARD_COMPAT if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+    imply RETAINED_MEM if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+    imply RETENTION if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
+

app/boards/adafruit/kb2040/adafruit_kb2040.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: adafruit_kb2040
+id: adafruit_kb2040//zmk
 name: Adafruit KB2040
 type: board
 arch: arm

app/boards/adafruit/kb2040/adafruit_kb2040_zmk.dts

@@ -4,4 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <../boards/adafruit/kb2040/adafruit_kb2040.dts>
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &pro_micro_serial { status = "disabled"; };

app/boards/adafruit/kb2040/adafruit_kb2040_zmk_defconfig

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
+
+# Enable reset by default
+CONFIG_RESET=y
+
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
+# Code partition needed to target the correct flash range
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Output UF2 by default, native bootloader supports it.
+CONFIG_BUILD_OUTPUT_UF2=y
+
+# USB HID
+CONFIG_ZMK_USB=y
+
+# Bootloader Support
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/adafruit/kb2040/board.yml

@@ -0,0 +1,5 @@
+board:
+  extend: adafruit_kb2040
+  variants:
+    - name: zmk
+      qualifier: rp2040

app/boards/adafruit/qt_py_rp2040/Kconfig.adafruit_qt_py_rp2040

@@ -0,0 +1,9 @@
+# Copyright (c) 2026 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_ADAFRUIT_QT_PY_RP2040
+    select ZMK_BOARD_COMPAT if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+    imply RETAINED_MEM if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+    imply RETENTION if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
+

app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.zmk.yml

@@ -1,5 +1,5 @@
 file_format: "1"
-id: adafruit_qt_py_rp2040
+id: adafruit_qt_py_rp2040//zmk
 name: Adafruit QT Py RP2040
 type: board
 arch: arm

app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk.dts

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts>
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
+&xiao_serial { status = "disabled"; };

app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk_defconfig

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
+
+# Enable reset by default
+CONFIG_RESET=y
+
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
+# Code partition needed to target the correct flash range
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Output UF2 by default, native bootloader supports it.
+CONFIG_BUILD_OUTPUT_UF2=y
+
+# USB HID
+CONFIG_ZMK_USB=y
+
+# Bootloader Support
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/adafruit/qt_py_rp2040/board.yml

@@ -0,0 +1,5 @@
+board:
+  extend: adafruit_qt_py_rp2040
+  variants:
+    - name: zmk
+      qualifier: rp2040

app/boards/adafruit_kb2040.conf

@@ -1,4 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_ZMK_USB=y

app/boards/adafruit_kb2040.overlay

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-&pro_micro_serial { status = "disabled"; };

app/boards/adafruit_qt_py_rp2040.conf

@@ -1,4 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_ZMK_USB=y

app/boards/adafruit_qt_py_rp2040.overlay

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-&xiao_serial { status = "disabled"; };

app/boards/arm/adv360pro/Kconfig

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on BOARD_ADV360PRO_LEFT || BOARD_ADV360PRO_RIGHT

app/boards/arm/adv360pro/Kconfig.board

@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-config BOARD_ADV360PRO_LEFT
-    bool "adv360pro_left"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_ADV360PRO_RIGHT
-    bool "adv360pro_right"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/bdn9/Kconfig.board

@@ -1,8 +0,0 @@
-# keeb.io BDN9 board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_BDN9
-    bool "BDN9 rev2"
-    depends on SOC_STM32F072XB

app/boards/arm/bdn9/bdn9_rev2.yml

@@ -1,11 +0,0 @@
-file_format: "1"
-id: bdn9_rev2
-name: BDN9 Rev2
-type: board
-arch: arm
-features:
-  - keys
-  - encoder
-outputs:
-  - usb
-url: https://keeb.io/products/bdn9-rev-2-3x3-9-key-macropad-rotary-encoder-and-rgb

app/boards/arm/bluemicro840/Kconfig.board

@@ -1,8 +0,0 @@
-# BlueMicro840 board configuration
-
-# Copyright (c) 2020 Pete Johanson, Derek Schmell
-# SPDX-License-Identifier: MIT
-
-config BOARD_BLUEMICRO840_V1
-    bool "BlueMicro840_V1"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/boardsource_blok/boardsource_blok.zmk.yml

@@ -1,9 +0,0 @@
-file_format: "1"
-id: boardsource_blok
-name: BoardSource blok
-type: board
-arch: arm
-outputs:
-  - usb
-url: https://peg.software/docs/blok
-exposes: [pro_micro]

app/boards/arm/bt60/Kconfig

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on (BOARD_BT60_V1_HS || BOARD_BT60_V1)

app/boards/arm/bt60/Kconfig.board

@@ -1,12 +0,0 @@
-# BT60 board configuration
-
-# Copyright (c) 2021 Polarity Works
-# SPDX-License-Identifier: MIT
-
-config BOARD_BT60_V1
-    bool "bt60"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_BT60_V1_HS
-    bool "bt60 hotswap"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/bt60/bt60_v1.zmk.yml

@@ -1,13 +0,0 @@
-file_format: "1"
-id: bt60_v1
-name: BT60 V1 Soldered
-type: board
-arch: arm
-features:
-  - keys
-  - encoder
-  - studio
-outputs:
-  - usb
-  - ble
-url: https://polarityworks.com

app/boards/arm/ckp/Kconfig

@@ -1,8 +0,0 @@
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on BOARD_BT60_V2 || BOARD_BT65_V1 || BOARD_BT75_V1

app/boards/arm/ckp/Kconfig.board

@@ -1,16 +0,0 @@
-# CKP boards configuration
-
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_BT60_V2
-    bool "bt60_v2"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_BT65_V1
-    bool "bt65_v1"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_BT75_V1
-    bool "bt75_v1"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/ckp/Kconfig.defconfig

@@ -1,28 +0,0 @@
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD
-    default "bt60_v2" if BOARD_BT60_V2
-    default "bt65_v1" if BOARD_BT65_V1
-    default "bt75_v1" if BOARD_BT75_V1
-config ZMK_KEYBOARD_NAME
-    default "BT60 V2" if BOARD_BT60_V2
-    default "BT65" if BOARD_BT65_V1
-    default "BT75" if BOARD_BT75_V1
-
-if BOARD_BT60_V2 || BOARD_BT65_V1 || BOARD_BT75_V1
-
-if USB
-
-config USB_NRFX
-    default y
-
-config USB_DEVICE_STACK
-    default y
-
-endif # USB
-
-config BT_CTLR
-    default BT
-
-endif # BOARD_BT60_V2 || BOARD_BT65_V1 || BOARD_BT75_V1

app/boards/arm/corneish_zen/Kconfig

@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-config BOARD_CORNEISH_ZEN_LEFT
-    bool
-
-config BOARD_CORNEISH_ZEN_RIGHT
-    bool

app/boards/arm/corneish_zen/Kconfig.board

@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2022 Darryl deHaan
-# SPDX-License-Identifier: MIT
-#
-
-config BOARD_CORNEISH_ZEN_V1_LEFT
-    bool "corneish zen left v1"
-    depends on SOC_NRF52840_QIAA
-    select BOARD_CORNEISH_ZEN_LEFT
-
-config BOARD_CORNEISH_ZEN_V1_RIGHT
-    bool "corneish zen right v1"
-    depends on SOC_NRF52840_QIAA
-    select BOARD_CORNEISH_ZEN_RIGHT
-
-config BOARD_CORNEISH_ZEN_V2_LEFT
-    bool "corneish zen left v2"
-    depends on SOC_NRF52840_QIAA
-    select BOARD_CORNEISH_ZEN_LEFT
-
-config BOARD_CORNEISH_ZEN_V2_RIGHT
-    bool "corneish zen right v2"
-    depends on SOC_NRF52840_QIAA
-    select BOARD_CORNEISH_ZEN_RIGHT

app/boards/arm/corneish_zen/corneish_zen_v2.yaml

@@ -1,20 +0,0 @@
-identifier: corneish_zen_v2
-name: Corne-ish Zen v2
-type: keyboard
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-supported:
-  - gpio
-  - i2c
-  - counter
-  - spi
-  - usb_device
-  - lsm303dlhc
-  - nvs
-  - can
-  - kscan
-  - ble
-  - adc

app/boards/arm/corneish_zen/corneish_zen_v2.zmk.yml

@@ -1,16 +0,0 @@
-file_format: "1"
-id: corneish_zen_v2
-name: Corneish Zen v2
-url: https://lowprokb.ca/collections/keyboards/products/corne-ish-zen
-type: board
-arch: arm
-features:
-  - keys
-  - display
-  - studio
-outputs:
-  - usb
-  - ble
-siblings:
-  - corneish_zen_v2_left
-  - corneish_zen_v2_right

app/boards/arm/dz60rgb/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_DZ60RGB_REV1
-    bool "DZ60RGB Keyboard"
-    depends on SOC_STM32F303XC

app/boards/arm/dz60rgb/Kconfig.defconfig

@@ -1,11 +0,0 @@
-# DZ60RGB keyboard configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-if BOARD_DZ60RGB_REV1
-
-config ZMK_KEYBOARD_NAME
-    default "DZ60RGB Rev 1"
-
-endif # BOARD_DZ60RGB_REV1

app/boards/arm/dz60rgb/dz60rgb_rev1.dts

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2020 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-/dts-v1/;
-#include <st/f3/stm32f303Xc.dtsi>
-
-#include <dt-bindings/zmk/matrix_transform.h>
-
-/ {
-    model = "DZ60RGB, Rev 1";
-    compatible = "dz60rgb,rev1", "st,stm32f303";
-
-    chosen {
-        zephyr,sram = &sram0;
-        zephyr,flash = &flash0;
-        zmk,kscan = &kscan0;
-        zmk,matrix-transform = &default_transform;
-    };
-
-    default_transform: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <14>;
-        rows = <5>;
-        map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
-RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
-RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
-RC(3,0)       RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)    RC(3,10)     RC(3,11) RC(3,13)
-RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,13)
-        >;
-    };
-
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-
-        diode-direction = "col2row";
-        row-gpios
-            = <&gpioa 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpiob 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpiob 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpiob 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpiob 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-        col-gpios
-            = <&gpioa 6  GPIO_ACTIVE_HIGH>
-            , <&gpioa 7  GPIO_ACTIVE_HIGH>
-            , <&gpiob 0  GPIO_ACTIVE_HIGH>
-            , <&gpiob 13 GPIO_ACTIVE_HIGH>
-            , <&gpiob 15 GPIO_ACTIVE_HIGH>
-            , <&gpioa 8  GPIO_ACTIVE_HIGH>
-            , <&gpioa 15 GPIO_ACTIVE_HIGH>
-            , <&gpiob 3  GPIO_ACTIVE_HIGH>
-            , <&gpiob 4  GPIO_ACTIVE_HIGH>
-            , <&gpiob 5  GPIO_ACTIVE_HIGH>
-            , <&gpiob 8  GPIO_ACTIVE_HIGH>
-            , <&gpiob 9  GPIO_ACTIVE_HIGH>
-            , <&gpioc 13 GPIO_ACTIVE_HIGH>
-            , <&gpioc 14 GPIO_ACTIVE_HIGH>
-            ;
-    };
-
-};
-
-zephyr_udc0: &usb {
-    status = "okay";
-};
-
-&flash0 {
-    /*
-     * For more information, see:
-     * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
-     */
-    partitions {
-        compatible = "fixed-partitions";
-        #address-cells = <1>;
-        #size-cells = <1>;
-
-        /* Set 6Kb of storage at the end of the 256Kb of flash */
-        storage_partition: partition@3e800 {
-            reg = <0x0003e800 0x00001800>;
-        };
-    };
-};

app/boards/arm/dz60rgb/dz60rgb_rev1.keymap

@@ -1,25 +0,0 @@
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/keys.h>
-
-/ {
-    keymap {
-        compatible = "zmk,keymap";
-
-        default_layer {
-// ------------------------------------------------------------------------------------------
-// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
-// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
-// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
-// |  SHIFT  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  SHIFT(/)  |  ^  | DEL |
-// |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | MO(1) |  <- |  v  | ->  |
-// ------------------------------------------------------------------------------------------
-            bindings = <
-    &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
-    &kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
-    &kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
-    &kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &mt RSHFT FSLH   &kp  UP  &kp DEL
-    &kp LCTRL &kp LGUI &kp LALT            &kp SPACE                     &kp RALT &mo  1  &kp LEFT &kp DOWN &kp RIGHT
-            >;
-        };
-    };
-};

app/boards/arm/dz60rgb/dz60rgb_rev1.yaml

@@ -1,19 +0,0 @@
-identifier: DZ60RGB_rev1
-name: DZ60RGBREV1
-type: keyboard
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-ram: 40
-supported:
-  - gpio
-  - i2c
-  - counter
-  - spi
-  - usb_device
-  - lsm303dlhc
-  - nvs
-  - can
-  - kscan

app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig

@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-CONFIG_SOC_SERIES_STM32F3X=y
-CONFIG_SOC_STM32F303XC=y
-# 72MHz system clock
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# clock configuration
-CONFIG_CLOCK_CONTROL=y
-
-# Clock configuration for Cube Clock control driver
-CONFIG_CLOCK_STM32_HSE_CLOCK=8000000
-CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
-# use HSE as PLL input
-CONFIG_CLOCK_STM32_PLL_SRC_HSE=y
-# produce 72MHz clock at PLL output
-CONFIG_CLOCK_STM32_PLL_PREDIV=1
-CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9
-CONFIG_CLOCK_STM32_AHB_PRESCALER=1
-CONFIG_CLOCK_STM32_APB1_PRESCALER=2
-CONFIG_CLOCK_STM32_APB2_PRESCALER=1
-
-CONFIG_ZMK_USB=y

app/boards/arm/ferris/Kconfig.board

@@ -1,8 +0,0 @@
-# Ferris board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_FERRIS
-    bool "Ferris rev 0.2"
-    depends on SOC_STM32F072XB

app/boards/arm/glove80/Kconfig

@@ -1,8 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on (BOARD_GLOVE80_LH || BOARD_GLOVE80_RH)

app/boards/arm/glove80/Kconfig.board

@@ -1,10 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_GLOVE80_LH
-    bool "Glove80 LH"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_GLOVE80_RH
-    bool "Glove80 RH"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/kbdfans_tofu65/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_KBDFANS_TOFU65_V2
-    bool "KBDfans Tofu65 2.0"
-    depends on SOC_RP2040

app/boards/arm/mikoto/Kconfig.board

@@ -1,8 +0,0 @@
-# mikoto board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_MIKOTO
-    bool "mikoto"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/mikoto/revision.cmake

@@ -1,7 +0,0 @@
-board_check_revision(FORMAT MAJOR.MINOR.PATCH
-                     DEFAULT_REVISION 5.20.0
-                     VALID_REVISIONS
-                     5.20.0         # first public release
-                     6.1.0  6.3.0   # incompatible pinout change from v5+
-                     7.2.0          # addition of MAX17048; compatible pinout with v6+
-)

app/boards/arm/nice60/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2021 Nick Winans
-# SPDX-License-Identifier: MIT
-
-config BOARD_NICE60
-    bool "nice!60"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/nice_nano/Kconfig

@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on (BOARD_NICE_NANO || BOARD_NICE_NANO_V2)
-
-config BOARD_ENABLE_DCDC_HV
-    bool "High voltage DCDC converter"
-    select SOC_DCDC_NRF52X_HV
-    default n
-    depends on (BOARD_NICE_NANO_V2)

app/boards/arm/nice_nano/Kconfig.board

@@ -1,13 +0,0 @@
-# nice!nano board configuration
-
-# Copyright (c) 2020 Pete Johanson
-# SPDX-License-Identifier: MIT
-
-config BOARD_NICE_NANO
-    bool "nice!nano"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_NICE_NANO_V2
-    bool "nice!nano v2"
-    depends on SOC_NRF52840_QIAA
-

app/boards/arm/nice_nano/Kconfig.defconfig

@@ -1,19 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-if BOARD_NICE_NANO || BOARD_NICE_NANO_V2
-
-config BOARD
-    default "nice_nano"
-
-if USB_DEVICE_STACK
-
-config USB_NRFX
-    default y
-
-endif # USB_DEVICE_STACK
-
-config BT_CTLR
-    default BT
-
-endif # BOARD_NICE_NANO || BOARD_NICE_NANO_V2

app/boards/arm/nice_nano/nice_nano_v2.yaml

@@ -1,15 +0,0 @@
-identifier: nice_nano_v2
-name: nice!nano v2
-type: mcu
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-supported:
-  - adc
-  - usb_device
-  - ble
-  - ieee802154
-  - pwm
-  - watchdog

app/boards/arm/nice_nano/nice_nano_v2.zmk.yml

@@ -1,10 +0,0 @@
-file_format: "1"
-id: nice_nano_v2
-name: nice!nano v2
-type: board
-arch: arm
-outputs:
-  - usb
-  - ble
-url: https://nicekeyboards.com/nice-nano
-exposes: [pro_micro]

app/boards/arm/nrf52840_m2/Kconfig.board

@@ -1,9 +0,0 @@
-# Maker Diary nrf52840 M.2 board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_NRF52840_M2
-    bool "nrf52480_m2"
-    depends on SOC_NRF52840_QIAA
-

app/boards/arm/nrfmicro/Kconfig

@@ -1,10 +0,0 @@
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on (BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833)
-
-config BOARD_NRFMICRO_CHARGER
-    bool "Enable battery charger"
-    default y
-    depends on (BOARD_NRFMICRO_13 || BOARD_NRFMICRO_13_52833)

app/boards/arm/nrfmicro/Kconfig.board

@@ -1,20 +0,0 @@
-# nrfmicro board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_NRFMICRO_11
-    bool "nrfmicro_11"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_NRFMICRO_11_FLIPPED
-    bool "nrfmicro_11_flipped"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_NRFMICRO_13
-    bool "nrfmicro_13"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_NRFMICRO_13_52833
-    bool "nrfmicro_13_52833"
-    depends on SOC_NRF52833_QIAA

app/boards/arm/nrfmicro/nrfmicro_11_flipped_defconfig

@@ -1,28 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_NRFMICRO_11_FLIPPED=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-CONFIG_PINCTRL=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
-CONFIG_BUILD_OUTPUT_UF2=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
-CONFIG_CLOCK_CONTROL_NRF=y
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y

app/boards/arm/nrfmicro/nrfmicro_13.dts

@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2020 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-/dts-v1/;
-#include <nordic/nrf52840_qiaa.dtsi>
-#include "arduino_pro_micro_pins.dtsi"
-#include "nrfmicro-pinctrl.dtsi"
-
-/ {
-    model = "nrfmicro";
-    compatible = "joric,nrfmicro";
-
-    chosen {
-        zephyr,code-partition = &code_partition;
-        zephyr,sram = &sram0;
-        zephyr,flash = &flash0;
-        zmk,battery = &vbatt;
-    };
-
-    leds {
-        compatible = "gpio-leds";
-        blue_led: led_0 {
-            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-        };
-    };
-
-    // Node name must match original "EXT_POWER" label to preserve user settings.
-    EXT_POWER {
-        compatible = "zmk,ext-power-generic";
-        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
-        init-delay-ms = <50>;
-    };
-
-    vbatt: vbatt {
-        compatible = "zmk,battery-voltage-divider";
-        io-channels = <&adc 2>;
-        output-ohms = <2000000>;
-        full-ohms = <(2000000 + 820000)>;
-    };
-};
-
-&adc {
-    status = "okay";
-};
-
-&gpiote {
-    status = "okay";
-};
-
-&gpio0 {
-    status = "okay";
-};
-
-&gpio1 {
-    status = "okay";
-};
-
-&i2c0 {
-    compatible = "nordic,nrf-twi";
-    pinctrl-0 = <&i2c0_default>;
-    pinctrl-1 = <&i2c0_sleep>;
-    pinctrl-names = "default", "sleep";
-};
-
-&spi1 {
-    compatible = "nordic,nrf-spim";
-    pinctrl-0 = <&spi1_default>;
-    pinctrl-1 = <&spi1_sleep>;
-    pinctrl-names = "default", "sleep";
-};
-
-&uart0 {
-    compatible = "nordic,nrf-uarte";
-    current-speed = <115200>;
-    pinctrl-0 = <&uart0_default>;
-    pinctrl-1 = <&uart0_sleep>;
-    pinctrl-names = "default", "sleep";
-};
-
-zephyr_udc0: &usbd {
-    status = "okay";
-};
-
-
-&flash0 {
-    /*
-     * For more information, see:
-     * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
-     */
-    partitions {
-        compatible = "fixed-partitions";
-        #address-cells = <1>;
-        #size-cells = <1>;
-
-        sd_partition: partition@0 {
-            reg = <0x00000000 0x00026000>;
-        };
-        code_partition: partition@26000 {
-            reg = <0x00026000 0x000c6000>;
-        };
-
-        /*
-         * The flash starting at 0x000ec000 and ending at
-         * 0x000f3fff is reserved for use by the application.
-         */
-
-        /*
-         * Storage partition will be used by FCB/LittleFS/NVS
-         * if enabled.
-         */
-        storage_partition: partition@ec000 {
-            reg = <0x000ec000 0x00008000>;
-        };
-
-        boot_partition: partition@f4000 {
-            reg = <0x000f4000 0x0000c000>;
-        };
-    };
-};

app/boards/arm/nrfmicro/nrfmicro_13_52833.zmk.yml

@@ -1,10 +0,0 @@
-file_format: "1"
-id: nrfmicro_13_52833
-name: nRFMicro 1.3/1.4 (nRF52833)
-type: board
-arch: arm
-outputs:
-  - usb
-  - ble
-url: https://github.com/joric/nrfmicro/
-exposes: [pro_micro]

app/boards/arm/pillbug/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_PILLBUG
-    bool "PillBug"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/proton_c/Kconfig.board

@@ -1,8 +0,0 @@
-# QMK Proton-C board configuration
-
-# Copyright (c) 2020 Pete Johanson
-# SPDX-License-Identifier: MIT
-
-config BOARD_QMK_PROTON_C
-    bool "QMK Proton-C"
-    depends on SOC_STM32F303XC

app/boards/arm/proton_c/Kconfig.defconfig

@@ -1,11 +0,0 @@
-# QMK Proton-C board configuration
-
-# Copyright (c) 2020 Pete Johanson
-# SPDX-License-Identifier: MIT
-
-if BOARD_QMK_PROTON_C
-
-config BOARD
-    default "proton_c"
-
-endif # BOARD_QMK_PROTON_C

app/boards/arm/puchi_ble/Kconfig.board

@@ -1,8 +0,0 @@
-# Puchi-BLE board configuration
-
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_PUCHI_BLE_v1
-    bool "puchi_ble_v1"
-    depends on SOC_NRF52840_QIAA

app/boards/arm/puchi_ble/puchi_ble_v1.yaml

@@ -1,15 +0,0 @@
-identifier: puchi_ble_v1
-name: puchi_ble_v1
-type: mcu
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-supported:
-  - adc
-  - usb_device
-  - ble
-  - ieee802154
-  - pwm
-  - watchdog

app/boards/arm/s40nc/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_S40NC
-    bool "S40NC"
-    depends on SOC_NRF52840_QIAA

app/boards/blackpill_f401cc.conf

@@ -1,6 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_KSCAN_MATRIX_POLLING=y

app/boards/blackpill_f401ce.conf

@@ -1,6 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_KSCAN_MATRIX_POLLING=y

app/boards/blackpill_f411ce.conf

@@ -1,6 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_UART_INTERRUPT_DRIVEN=n
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_KSCAN_MATRIX_POLLING=y

app/boards/boardsource/blok/Kconfig.boardsource_blok

@@ -0,0 +1,9 @@
+# Copyright (c) 2026 Pete Johanson
+# SPDX-License-Identifier: MIT
+
+config BOARD_BOARDSOURCE_BLOK
+    select ZMK_BOARD_COMPAT if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+    imply RETAINED_MEM if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+    imply RETENTION if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_BOARDSOURCE_BLOK_RP2040_ZMK
+

app/boards/boardsource/blok/board.yml

@@ -0,0 +1,5 @@
+board:
+  extend: boardsource_blok
+  variants:
+    - name: zmk
+      qualifier: rp2040

app/boards/boardsource/blok/boardsource_blok.zmk.yml

@@ -0,0 +1,9 @@
+file_format: "1"
+id: boardsource_blok//zmk
+name: Boardsource Blok
+type: board
+arch: arm
+outputs:
+  - usb
+url: https://boardsource.xyz/products/blok-rp2040-keyboard-controller
+exposes: [pro_micro]

app/boards/boardsource/blok/boardsource_blok_zmk.dts

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/boardsource/blok/boardsource_blok.dts>
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
+&pro_micro_serial { status = "disabled"; };
+
+&code_partition {
+    reg = <0x100 (DT_SIZE_M(16) - 0x100 - DT_SIZE_K(512))>;
+};
+
+&flash0 {
+    partitions {
+        storage_partition: partition@f80000 {
+            reg = <0xf80000 DT_SIZE_K(512)>;
+            read-only;
+        };
+    };
+};

app/boards/boardsource/blok/boardsource_blok_zmk_defconfig

@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
+
+CONFIG_RESET=y
+
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
+# Code partition needed to target the correct flash range
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Output UF2 by default, native bootloader supports it.
+CONFIG_BUILD_OUTPUT_UF2=y
+
+# USB HID
+CONFIG_ZMK_USB=y
+
+# Settings Support
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+
+# Bootloader Support
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y

app/boards/boardsource_blok.conf

@@ -1,4 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_ZMK_USB=y

app/boards/joric/nrfmicro/Kconfig.nrfmicro

@@ -0,0 +1,13 @@
+# nrfmicro board configuration
+
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_NRFMICRO
+    select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_ZMK
+    select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK
+    select SOC_NRF52833_QIAA if BOARD_NRFMICRO_NRF52833_ZMK
+    select ZMK_BOARD_COMPAT if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK
+    imply RETAINED_MEM if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK
+    imply RETENTION if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK
+    imply RETENTION_BOOT_MODE if BOARD_NRFMICRO_NRF52840_ZMK || BOARD_NRFMICRO_NRF52840_FLIPPED_ZMK || BOARD_NRFMICRO_NRF52833_ZMK

app/boards/joric/nrfmicro/board.yml

@@ -0,0 +1,9 @@
+board:
+  extend: nrfmicro
+  variants:
+    - name: zmk
+      qualifier: nrf52840
+    - name: flipped_zmk
+      qualifier: nrf52840
+    - name: zmk
+      qualifier: nrf52833

app/boards/joric/nrfmicro/nrfmicro_nrf52833.zmk.yml

@@ -1,6 +1,6 @@
 file_format: "1"
-id: nrfmicro_11_flipped
+id: nrfmicro/nrf52833/zmk
-name: nRFMicro 1.1 (flipped)
+name: nRFMicro (nRF52833)
 type: board
 arch: arm
 outputs:
@@ -8,3 +8,6 @@ outputs:
   - ble
 url: https://github.com/joric/nrfmicro/
 exposes: [pro_micro]
+revisions:
+  - "1.3.0"
+default_revision: "1.3.0"

app/boards/joric/nrfmicro/nrfmicro_nrf52833_zmk.dts

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/joric/nrfmicro/nrfmicro_nrf52833.dts>
+#include <common/nordic/nrf52833_uf2_boot_mode.dtsi>
+
+/ {
+    chosen {
+        zmk,battery = &vbatt;
+    };
+
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+        init-delay-ms = <50>;
+    };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
+};
+

app/boards/joric/nrfmicro/nrfmicro_nrf52833_zmk_1_3_0_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_NRFMICRO_11=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -25,4 +21,4 @@ CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
 
 CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
+CONFIG_ZMK_BLE=y

app/boards/joric/nrfmicro/nrfmicro_nrf52840.zmk.yml

@@ -1,6 +1,6 @@
 file_format: "1"
-id: nrfmicro_11
+id: nrfmicro/nrf52840/zmk
-name: nRFMicro 1.1/1.2
+name: nRFMicro (nRF52840) 1.1/1.2/1.3
 type: board
 arch: arm
 outputs:
@@ -8,3 +8,7 @@ outputs:
   - ble
 url: https://github.com/joric/nrfmicro/
 exposes: [pro_micro]
+revisions:
+  - "1.1.0"
+  - "1.3.0"
+default_revision: "1.3.0"

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped.zmk.yml

@@ -1,6 +1,6 @@
 file_format: "1"
-id: nrfmicro_13
+id: nrfmicro/nrf52840/flipped_zmk
-name: nRFMicro 1.3/1.4
+name: nRFMicro nRF52840 (flipped)
 type: board
 arch: arm
 outputs:
@@ -8,3 +8,6 @@ outputs:
   - ble
 url: https://github.com/joric/nrfmicro/
 exposes: [pro_micro]
+revisions:
+  - "1.1.0"
+default_revision: "1.1.0"

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped_zmk.dts

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/joric/nrfmicro/nrfmicro_nrf52840_flipped.dts>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
+
+/ {
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+        init-delay-ms = <50>;
+    };
+};

app/boards/joric/nrfmicro/nrfmicro_nrf52840_flipped_zmk_1_1_0_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_NRFMICRO_13=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -25,4 +21,4 @@ CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
 
 CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
+CONFIG_ZMK_BLE=y

app/boards/joric/nrfmicro/nrfmicro_nrf52840_zmk.dts

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <../boards/joric/nrfmicro/nrfmicro_nrf52840.dts>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
+
+/ {
+
+    chosen {
+        zmk,battery = &vbatt;
+    };
+
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+        init-delay-ms = <50>;
+    };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
+};

app/boards/joric/nrfmicro/nrfmicro_nrf52840_zmk_1_1_0_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_BLUEMICRO840_V1=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -21,6 +17,8 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
+CONFIG_CLOCK_CONTROL_NRF=y
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
 
 CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y

app/boards/joric/nrfmicro/nrfmicro_nrf52840_zmk_1_3_0.overlay

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/ {
+    chosen {
+        zmk,battery = &vbatt;
+    };
+
+    // Node name must match original "EXT_POWER" label to preserve user settings.
+    EXT_POWER {
+        compatible = "zmk,ext-power-generic";
+        control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+        init-delay-ms = <50>;
+    };
+
+    vbatt: vbatt {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 2>;
+        output-ohms = <2000000>;
+        full-ohms = <(2000000 + 820000)>;
+    };
+};
+
+&adc {
+    status = "okay";
+};
+