zmkfirmware · petejohanson · Apr 9, 2026 · Apr 9, 2026 · Apr 14, 2026 · Jun 10, 2026
@@ -35,25 +35,26 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:4.1
+      image: docker.io/zmkfirmware/zmk-build-arm:4.4-branch
     steps:
       - name: Checkout
         uses: actions/checkout@v6
       - name: Cache west modules
         uses: actions/cache@v5
         env:
           cache-name: cache-zephyr-modules
+          cache-version: v2
         with:
           path: |
             modules/
             tools/
             zephyr/
             bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
+          key: ${{ runner.os }}-${{ env.cache-version }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ runner.os }}-${{ env.cache-version }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-version }}-build-
+            ${{ runner.os }}-${{ env.cache-version }}-
         timeout-minutes: 2
         continue-on-error: true
       - name: Initialize workspace (west init)

@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     if: needs.matrix.outputs.has_valid_build_matrix == 'true'
     container:
-      image: zmkfirmware/zmk-build-arm:stable
+      image: zmkfirmware/zmk-build-arm:4.4-branch
     needs: matrix
     name: Build
     strategy:

@@ -23,7 +23,7 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:4.1
+      image: docker.io/zmkfirmware/zmk-build-arm:4.4-branch
     needs: compile-matrix
     strategy:
       matrix:
@@ -37,17 +37,18 @@ jobs:
         uses: actions/cache@v5
         env:
           cache-name: cache-zephyr-modules
+          cache-version: v2
         with:
           path: |
             modules/
             tools/
             zephyr/
             bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
+          key: ${{ runner.os }}-${{ env.cache-version }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ runner.os }}-${{ env.cache-version }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-version }}-build-
+            ${{ runner.os }}-${{ env.cache-version }}-
         timeout-minutes: 2
         continue-on-error: true
       - name: Initialize workspace (west init)

@@ -37,25 +37,26 @@ jobs:
         test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/zmkfirmware/zmk-build-arm:4.1
+      image: docker.io/zmkfirmware/zmk-build-arm:4.4-branch
     steps:
       - name: Checkout
         uses: actions/checkout@v6
       - name: Cache west modules
         uses: actions/cache@v5
         env:
           cache-name: cache-zephyr-modules
+          cache-version: v2
         with:
           path: |
             modules/
             tools/
             zephyr/
             bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
+          key: ${{ runner.os }}-${{ env.cache-version }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ runner.os }}-${{ env.cache-version }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-version }}-build-
+            ${{ runner.os }}-${{ env.cache-version }}-
         timeout-minutes: 2
         continue-on-error: true
       - name: Initialize workspace (west init)

@@ -4,6 +4,7 @@ set(CONFIG_APPLICATION_DEFINED_SYSCALL true)
 
 set(ZEPHYR_BOARD_ALIASES "boards/aliases.cmake")
 set(ZEPHYR_EXTRA_MODULES "${ZMK_EXTRA_MODULES};${CMAKE_CURRENT_SOURCE_DIR}/module;${CMAKE_CURRENT_SOURCE_DIR}/keymap-module")
+set(SNIPPET_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
 
 # Find Zephyr. This also loads Zephyr's build system.
 find_package(Zephyr REQUIRED HINTS ../zephyr)
@@ -27,7 +28,7 @@ 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)
-target_sources_ifdef(CONFIG_ZMK_KSCAN_SIDEBAND_BEHAVIORS app PRIVATE src/kscan_sideband_behaviors.c)
+target_sources_ifdef(CONFIG_ZMK_INPUT_SIDEBAND_BEHAVIORS app PRIVATE src/input_sideband_behaviors.c)
 target_sources(app PRIVATE src/matrix_transform.c)
 target_sources(app PRIVATE src/physical_layouts.c)
 target_sources(app PRIVATE src/sensors.c)

@@ -516,33 +516,43 @@ config ZMK_PHYSICAL_LAYOUT_KEY_ROTATION
     bool "Support rotation of keys in physical layouts"
     default y
 
-menuconfig ZMK_KSCAN
-    bool "ZMK KScan Integration"
+config ZMK_MATRIX_INPUT
+    bool "ZMK Matrix Input Integration"
     default y
-    select KSCAN
+    select INPUT
+    # PM_DEVICE is used to resume/suspend the selected input device.
+    select PM_DEVICE
 
-if ZMK_KSCAN
+if ZMK_MATRIX_INPUT
 
-config ZMK_KSCAN_EVENT_QUEUE_SIZE
-    int "Size of the event queue for KSCAN events to buffer events"
+config ZMK_MATRIX_INPUT_EVENT_QUEUE_SIZE
+    int "Size of the event queue for matrix input events to buffer events"
     default 4
 
-endif # ZMK_KSCAN
+endif # ZMK_MATRIX_INPUT
+
+if INPUT
+
+choice INPUT_MODE
+    default INPUT_MODE_SYNCHRONOUS
+endchoice
+
+endif
 
-config ZMK_KSCAN_SIDEBAND_BEHAVIORS
+config ZMK_INPUT_SIDEBAND_BEHAVIORS
     bool
     default y
-    depends on DT_HAS_ZMK_KSCAN_SIDEBAND_BEHAVIORS_ENABLED
-    select KSCAN
+    depends on DT_HAS_ZMK_INPUT_SIDEBAND_BEHAVIORS_ENABLED
+    select INPUT
 
-if ZMK_KSCAN_SIDEBAND_BEHAVIORS
+if ZMK_INPUT_SIDEBAND_BEHAVIORS
 
-config ZMK_KSCAN_SIDEBAND_BEHAVIORS_INIT_PRIORITY
-    int "Keyboard scan sideband behaviors driver init priority"
+config ZMK_INPUT_SIDEBAND_BEHAVIORS_INIT_PRIORITY
+    int "Input sideband behaviors driver init priority"
     # The default kscan init priority is 90, so be sure we are initialized later.
     default 95
 
-endif # ZMK_KSCAN_SIDEBAND_BEHAVIORS
+endif # ZMK_INPUT_SIDEBAND_BEHAVIORS
 
 menu "Logging"
 
@@ -676,8 +686,8 @@ config KERNEL_BIN_NAME
 config REBOOT
     default y
 
-config USB_DEVICE_STACK
-    default y if HAS_HW_NRF_USBD
+#config USB_DEVICE_STACK
+#    default y if HAS_HW_NRF_USBD
 
 config FPU
     default CPU_HAS_FPU

diff --git a/app/boards/adafruit/kb2040/adafruit_kb2040_zmk.dts b/app/boards/adafruit/kb2040/adafruit_kb2040_zmk.dts
@@ -5,6 +5,6 @@
  */
 
 #include <../boards/adafruit/kb2040/adafruit_kb2040.dts>
-#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+#include <vendor/raspberrypi/rp2040-boot-mode-retention.dtsi>
 
 &pro_micro_serial { status = "disabled"; };
diff --git a/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk.dts b/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk.dts
@@ -5,6 +5,6 @@
  */
 
 #include <../boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts>
-#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+#include <vendor/raspberrypi/rp2040-boot-mode-retention.dtsi>
 
 &xiao_serial { status = "disabled"; };
diff --git a/app/boards/boardsource/blok/boardsource_blok_zmk.dts b/app/boards/boardsource/blok/boardsource_blok_zmk.dts
@@ -5,7 +5,7 @@
  */
 
 #include <../boards/boardsource/blok/boardsource_blok.dts>
-#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+#include <vendor/raspberrypi/rp2040-boot-mode-retention.dtsi>
 
 &pro_micro_serial { status = "disabled"; };
 

diff --git a/app/boards/kbdfans/tofu65/board.yml b/app/boards/kbdfans/tofu65/board.yml
@@ -1,5 +1,6 @@
 board:
   name: tofu65
+  full_name: Tofu 65
   vendor: kbdfans
   socs:
     - name: rp2040

diff --git a/app/boards/kbdfans/tofu65/tofu65_rp2040_zmk.dts b/app/boards/kbdfans/tofu65/tofu65_rp2040_zmk.dts
@@ -6,7 +6,7 @@
 /dts-v1/;
 
 #include <raspberrypi/rpi_pico/rp2040.dtsi>
-#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+#include <vendor/raspberrypi/rp2040-boot-mode-retention.dtsi>
 
 #include <dt-bindings/zmk/matrix_transform.h>
 
@@ -19,7 +19,7 @@
         zephyr,flash = &flash0;
         zephyr,flash-controller = &ssi;
         zephyr,code-partition = &code_partition;
-        zmk,kscan = &kscan0;
+        zmk,matrix-input = &matrix;
         zmk,physical-layout = &layout_65_ansi;
     };
 
@@ -48,8 +48,8 @@ RC(4,0) RC(4,1) RC(4,2)                         RC(4,6)         RC(4,8) RC(4,9)
         >;
     };
 
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
+    matrix: matrix {
+        compatible = "zmk,input-gpio-matrix";
 
         diode-direction = "col2row";
         row-gpios

diff --git a/app/boards/keebio/bdn9/Kconfig.defconfig b/app/boards/keebio/bdn9/Kconfig.defconfig
@@ -11,4 +11,11 @@ config BOARD
 config ZMK_KEYBOARD_NAME
     default "BDN9 Rev2"
 
+if USB_CDC_ACM
+
+config USB_CDC_ACM_RINGBUF_SIZE
+    default 256
+
+endif # USB_CDC_ACM
+
 endif # BOARD_BDN9
diff --git a/app/boards/keebio/bdn9/bdn9_stm32f072xb_zmk.dts b/app/boards/keebio/bdn9/bdn9_stm32f072xb_zmk.dts
@@ -26,7 +26,7 @@
         zephyr,flash = &flash0;
         zmk,underglow = &led_strip;
         zmk,physical-layout = &physical_layout0;
-        zmk,kscan = &kscan0;
+        zmk,matrix-input = &matrix;
     };
 
     matrix_transform0: matrix_transform_0 {
@@ -40,8 +40,8 @@
         >;
     };
 
-    kscan0: kscan_0 {
-        compatible = "zmk,kscan-gpio-direct";
+    matrix: matrix {
+        compatible = "zmk,input-gpio-direct";
 
         input-gpios
             = <&gpiob 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>

diff --git a/app/boards/keebio/bdn9/bdn9_stm32f072xb_zmk_defconfig b/app/boards/keebio/bdn9/bdn9_stm32f072xb_zmk_defconfig
@@ -10,7 +10,7 @@ CONFIG_GPIO=y
 CONFIG_PINCTRL=y
 
 # Poll to avoid interrupt overlap issues
-CONFIG_ZMK_KSCAN_DIRECT_POLLING=y
+CONFIG_ZMK_INPUT_DIRECT_POLLING=y
 
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536
 CONFIG_ISR_STACK_SIZE=1024

diff --git a/app/boards/keebio/bdn9/board.yml b/app/boards/keebio/bdn9/board.yml
@@ -1,5 +1,6 @@
 board:
   name: bdn9
+  full_name: BDN9
   vendor: keebio
   socs:
     - name: stm32f072xb

diff --git a/app/boards/kinesis/adv360pro/Kconfig.defconfig b/app/boards/kinesis/adv360pro/Kconfig.defconfig
@@ -33,9 +33,6 @@ config SPI
     bool
     default y
 
-config BT_CTLR
-    default BT
-
 if USB
 
 config USB_NRFX

diff --git a/app/boards/kinesis/adv360pro/adv360pro.dtsi b/app/boards/kinesis/adv360pro/adv360pro.dtsi
@@ -30,7 +30,7 @@
         zmk,backlight = &backlight;
         zmk,battery = &vbatt;
         zmk,physical-layout = &physical_layout0;
-        zmk,kscan = &kscan0;
+        zmk,matrix-input = &matrix;
         zmk,underglow = &led_strip;
     };
 

diff --git a/app/boards/kinesis/adv360pro/adv360pro.yaml b/app/boards/kinesis/adv360pro/adv360pro.yaml
@@ -14,6 +14,6 @@ supported:
   - usb_device
   - nvs
   - can
-  - kscan
+  - input
   - ble
   - pwm
diff --git a/app/boards/kinesis/adv360pro/adv360pro_left_nrf52840_zmk.dts b/app/boards/kinesis/adv360pro/adv360pro_left_nrf52840_zmk.dts
@@ -8,8 +8,8 @@
 #include "adv360pro.dtsi"
 
 /{
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
+    matrix: matrix {
+        compatible = "zmk,input-gpio-matrix";
         wakeup-source;
 
         diode-direction = "col2row";

diff --git a/app/boards/kinesis/adv360pro/adv360pro_right_nrf52840_zmk.dts b/app/boards/kinesis/adv360pro/adv360pro_right_nrf52840_zmk.dts
@@ -8,8 +8,8 @@
 #include "adv360pro.dtsi"
 
 /{
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
+    matrix: matrix {
+        compatible = "zmk,input-gpio-matrix";
         wakeup-source;
 
         diode-direction = "col2row";

diff --git a/app/boards/kinesis/adv360pro/board.yml b/app/boards/kinesis/adv360pro/board.yml
@@ -1,11 +1,13 @@
 boards:
   - name: adv360pro_left
+    full_name: Advantage 360 Pro (Left)
     vendor: kinesis
     socs:
       - name: nrf52840
         variants:
           - name: zmk
   - name: adv360pro_right
+    full_name: Advantage 360 Pro (Right)
     vendor: kinesis
     socs:
       - name: nrf52840

diff --git a/app/boards/lowprokb/corneish_zen/Kconfig.defconfig b/app/boards/lowprokb/corneish_zen/Kconfig.defconfig
@@ -22,9 +22,6 @@ config BOARD
 config ZMK_SPLIT
     default y
 
-config BT_CTLR
-    default BT
-
 if USB
 
 config USB_NRFX

diff --git a/app/boards/lowprokb/corneish_zen/board.yml b/app/boards/lowprokb/corneish_zen/board.yml
@@ -1,5 +1,6 @@
 boards:
   - name: corneish_zen_left
+    full_name: Corneish Zen (Left)
     vendor: lowprokb
     socs:
       - name: nrf52840
@@ -13,6 +14,7 @@ boards:
         - name: 2.0.0
         - name: 1.0.0
   - name: corneish_zen_right
+    full_name: Corneish Zen (Right)
     vendor: lowprokb
     socs:
       - name: nrf52840

diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen.dtsi b/app/boards/lowprokb/corneish_zen/corneish_zen.dtsi
@@ -30,7 +30,7 @@
         zephyr,code-partition = &code_partition;
         zephyr,sram = &sram0;
         zephyr,flash = &flash0;
-        zmk,kscan = &kscan0;
+        zmk,matrix-input = &matrix;
         zmk,display = &epd;
         zmk,physical-layout = &foostan_corne_6col_layout;
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,6 @@ supported: @@
       - usb_device
       - nvs
       - can
-      - kscan
+      - input
       - ble
       - pwm