diff options
| author | Nick Winans <nick.win999@gmail.com> | 2020-10-23 00:55:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 00:55:50 -0500 |
| commit | 70ffcca3b42f5dacf5be155a56b11387a7e68b63 (patch) | |
| tree | 80954a5afb17978ad897e3dde0385cfee0a902c9 /app/boards/arm/planck | |
| parent | 162c6b77db27c158b05ed65effa8d8ded68ba9b7 (diff) | |
| parent | 04b7a759f4c676c96da261a724cef1517614dea1 (diff) | |
Merge branch 'main' into bluetooth/battery-reporting
Diffstat (limited to 'app/boards/arm/planck')
| -rw-r--r-- | app/boards/arm/planck/Kconfig.defconfig | 3 | ||||
| -rw-r--r-- | app/boards/arm/planck/board.cmake | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/boards/arm/planck/Kconfig.defconfig b/app/boards/arm/planck/Kconfig.defconfig index 6f5bf52..913c1c1 100644 --- a/app/boards/arm/planck/Kconfig.defconfig +++ b/app/boards/arm/planck/Kconfig.defconfig @@ -11,4 +11,7 @@ config ZMK_KEYBOARD_NAME config ZMK_USB default y +config ZMK_KSCAN_MATRIX_POLLING + default y + endif # BOARD_PLANCK_REV6 diff --git a/app/boards/arm/planck/board.cmake b/app/boards/arm/planck/board.cmake index 4843c41..772796d 100644 --- a/app/boards/arm/planck/board.cmake +++ b/app/boards/arm/planck/board.cmake @@ -1,6 +1,7 @@ # SPDX-License-Identifier: MIT +board_runner_args(dfu-util "--pid=0483:df11" "--alt=0" "--dfuse") board_runner_args(jlink "--device=STM32F303VC" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/dfu-util.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) |