diff options
Diffstat (limited to 'keyboards/doio/kb16/rev2')
| -rw-r--r-- | keyboards/doio/kb16/rev2/config.h | 9 | ||||
| -rw-r--r-- | keyboards/doio/kb16/rev2/info.json | 48 | ||||
| -rw-r--r-- | keyboards/doio/kb16/rev2/rules.mk | 14 |
3 files changed, 31 insertions, 40 deletions
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h index e7e2791ac8..9580435e5c 100644 --- a/keyboards/doio/kb16/rev2/config.h +++ b/keyboards/doio/kb16/rev2/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B4, B9, B8 } -#define MATRIX_COL_PINS { B14, B13, B12, B0, A7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO @@ -40,7 +32,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix config */ - #define RGB_DI_PIN A10 #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index 8b5eeb45c2..9dff8e0f6e 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x1601", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B14", "B13", "B12", "B0", "A7"], + "rows": ["B3", "B4", "B9", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"}, @@ -15,34 +20,39 @@ {"pin_a": "A3", "pin_b": "A4"} ] }, + "ws2812": { + "pin": "A10" + }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ - {"label":"1!", "x":0, "y":0}, - {"label":"2@", "x":1, "y":0}, - {"label":"3#", "x":2, "y":0}, - {"label":"4$", "x":3, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"label":"Encoder 1", "x":4.75, "y":0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, - {"label":"5%", "x":0, "y":1}, - {"label":"6^", "x":1, "y":1}, - {"label":"7&", "x":2, "y":1}, - {"label":"8*", "x":3, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, - {"label":"Encoder 2", "x":6, "y":0}, + {"matrix": [1, 4], "x": 6, "y": 0}, - {"label":"9(", "x":0, "y":2}, - {"label":"0)", "x":1, "y":2}, - {"label":"\u2191", "x":2, "y":2}, - {"label":"Enter", "x":3, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, - {"label":"Encoder 3", "x":5.375, "y":2.5}, + {"matrix": [2, 4], "x": 5.375, "y": 2.5}, - {"label":"Fn", "x":0, "y":3}, - {"label":"\u2190", "x":1, "y":3}, - {"label":"\u2193", "x":2, "y":3}, - {"label":"\u2192", "x":3, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} ] } } diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk index 7fa9b91da0..f1f486f639 100644 --- a/keyboards/doio/kb16/rev2/rules.mk +++ b/keyboards/doio/kb16/rev2/rules.mk @@ -1,18 +1,8 @@ SRC += ./lib/layer_status/layer_status.c SRC += ./lib/logo.c -# MCU name -MCU = STM32F103 - -# Bootloader selection -# Cannot use `BOOTLOADER = stm32duino` due to the need to override -# `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually. -OPT_DEFS += -DBOOTLOADER_STM32DUINO -MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader -BOARD = STM32_F103_STM32DUINO -BOOTLOADER_TYPE = stm32duino -DFU_ARGS = -d 1EAF:0003 -a 2 -R -DFU_SUFFIX_ARGS = -v 1EAF -p 0003 +# Configure for 128K flash +MCU_LDSCRIPT = STM32F103xB # Build Options # change yes to no to disable |