From d35a95c7afc9e5ef6f087034dbf4cbb03048f9cd Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Wed, 24 Jun 2020 10:06:35 -0400 Subject: Initial working Clueboard California Macropad w/ proton-c fixes * Basic Clueboard Californai Macropad shield definition. * New "direct" KSCAN driver that supports non-matrix direct wiring for switches, needed for macropad that doesn't have a matrix at all. * Some renames for existing KSCAN GPIO driver to make the implied "matrix" part explicit. --- app/boards/arm/planck/planck_rev6.dts | 2 +- app/boards/arm/proton_c/board.cmake | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'app/boards/arm') diff --git a/app/boards/arm/planck/planck_rev6.dts b/app/boards/arm/planck/planck_rev6.dts index ef23bfd..ae002cd 100644 --- a/app/boards/arm/planck/planck_rev6.dts +++ b/app/boards/arm/planck/planck_rev6.dts @@ -55,7 +55,7 @@ }; kscan { - compatible = "gpio-kscan"; + compatible = "zmk,kscan-gpio-matrix"; label = "Keyscan Matrix"; row-gpios = <&gpioa 10 GPIO_ACTIVE_HIGH>, <&gpioa 9 GPIO_ACTIVE_HIGH>, diff --git a/app/boards/arm/proton_c/board.cmake b/app/boards/arm/proton_c/board.cmake index 4843c41..9da8ea9 100644 --- a/app/boards/arm/proton_c/board.cmake +++ b/app/boards/arm/proton_c/board.cmake @@ -1,6 +1,7 @@ # SPDX-License-Identifier: MIT -board_runner_args(jlink "--device=STM32F303VC" "--speed=4000") +board_runner_args(dfu-util "--pid=0483:df11" "--alt=0" "--dfuse") +board_runner_args(jlink "--device=STM32F303CC" "--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) -- cgit v1.2.3