summaryrefslogtreecommitdiffstats
path: root/keyboards/doio/kb16/rev2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/doio/kb16/rev2')
-rw-r--r--keyboards/doio/kb16/rev2/config.h9
-rw-r--r--keyboards/doio/kb16/rev2/info.json51
-rw-r--r--keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c2
-rw-r--r--keyboards/doio/kb16/rev2/keymaps/default/keymap.c2
-rw-r--r--keyboards/doio/kb16/rev2/keymaps/via/keymap.c2
-rw-r--r--keyboards/doio/kb16/rev2/rules.mk15
6 files changed, 37 insertions, 44 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..6d11cadaac 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -8,6 +8,14 @@
"pid": "0x1601",
"device_version": "0.0.2"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "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 +23,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/keymaps/bongocat/keymap.c b/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
index bda4731a99..ae24fc2755 100644
--- a/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
+++ b/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#endif
#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/doio/kb16/rev2/keymaps/default/keymap.c b/keyboards/doio/kb16/rev2/keymaps/default/keymap.c
index 6ab8294efe..1217a3c788 100644
--- a/keyboards/doio/kb16/rev2/keymaps/default/keymap.c
+++ b/keyboards/doio/kb16/rev2/keymaps/default/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#endif
#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/doio/kb16/rev2/keymaps/via/keymap.c b/keyboards/doio/kb16/rev2/keymaps/via/keymap.c
index 61c582fa1c..fc1f1dcfaa 100644
--- a/keyboards/doio/kb16/rev2/keymaps/via/keymap.c
+++ b/keyboards/doio/kb16/rev2/keymaps/via/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#endif
#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk
index 7fa9b91da0..f931af11e4 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
@@ -33,7 +23,6 @@ OLED_DRIVER = SSD1306
# RGB Matrix enabled
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
# Encoder enabled
ENCODER_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 10:20:01 +0000