summaryrefslogtreecommitdiff
path: root/keyboards/doio/kb16
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/doio/kb16')
-rw-r--r--keyboards/doio/kb16/rev1/config.h8
-rw-r--r--keyboards/doio/kb16/rev1/info.json5
-rw-r--r--keyboards/doio/kb16/rev2/config.h8
-rw-r--r--keyboards/doio/kb16/rev2/info.json7
-rw-r--r--keyboards/doio/kb16/rev2/rules.mk14
5 files changed, 14 insertions, 28 deletions
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index aa066fe393..c01191e869 100644
--- a/keyboards/doio/kb16/rev1/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -17,14 +17,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, D4, D3, D2 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Forcing to use NKRO instead 6KRO */
#define FORCE_NKRO
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index d0acdedfb9..03deae0cbc 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x1601",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F4", "F1", "F0", "B7"],
+ "rows": ["D5", "D4", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F7", "pin_b": "E6"},
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index e7e2791ac8..a11f7c8d3a 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
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 8b5eeb45c2..6e90528e0f 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,6 +20,8 @@
{"pin_a": "A3", "pin_b": "A4"}
]
},
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
"layouts": {
"LAYOUT": {
"layout": [
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