summaryrefslogtreecommitdiff
path: root/keyboards/doio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/doio')
-rw-r--r--keyboards/doio/kb16/kb16.c2
-rw-r--r--keyboards/doio/kb16/kb16.h45
-rw-r--r--keyboards/doio/kb16/lib/bongocat/bongocat.h2
-rw-r--r--keyboards/doio/kb16/lib/layer_status/layer_status.h2
-rw-r--r--keyboards/doio/kb16/lib/logo.h2
-rw-r--r--keyboards/doio/kb16/rev1/config.h9
-rw-r--r--keyboards/doio/kb16/rev1/info.json49
-rw-r--r--keyboards/doio/kb16/rev1/rules.mk1
-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/rules.mk15
-rw-r--r--keyboards/doio/kb30/config.h6
-rw-r--r--keyboards/doio/kb30/info.json84
-rw-r--r--keyboards/doio/kb30/kb30.c2
-rw-r--r--keyboards/doio/kb30/kb30.h45
-rw-r--r--keyboards/doio/kb30/rules.mk1
-rw-r--r--keyboards/doio/kb38/config.h1
-rw-r--r--keyboards/doio/kb38/info.json3
18 files changed, 125 insertions, 204 deletions
diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index c0f7f96b9e..34b315a87b 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kb16.h"
+#include "quantum.h"
// OLED animation
#include "./lib/logo.h"
diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h
deleted file mode 100644
index 6e6ab2f7f4..0000000000
--- a/keyboards/doio/kb16/kb16.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───┐ ┌───┐ ┌───┐
- * │00 │01 │02 │03 │ │04 │ │14 │
- * ├───┼───┼───┼───┤ └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │ ┌───┐
- * ├───┼───┼───┼───┤ │24 │
- * │30 │31 │32 │33 │ └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, \
- K20, K21, K22, K23, K24, \
- K30, K31, K32, K33 \
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { K20, K21, K22, K23, K24 }, \
- { K30, K31, K32, K33, XXX } \
-}
diff --git a/keyboards/doio/kb16/lib/bongocat/bongocat.h b/keyboards/doio/kb16/lib/bongocat/bongocat.h
index 65ceabc682..2ffeca1993 100644
--- a/keyboards/doio/kb16/lib/bongocat/bongocat.h
+++ b/keyboards/doio/kb16/lib/bongocat/bongocat.h
@@ -14,4 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+
void render_bongocat(void);
diff --git a/keyboards/doio/kb16/lib/layer_status/layer_status.h b/keyboards/doio/kb16/lib/layer_status/layer_status.h
index a367a829d7..2c4b08f25a 100644
--- a/keyboards/doio/kb16/lib/layer_status/layer_status.h
+++ b/keyboards/doio/kb16/lib/layer_status/layer_status.h
@@ -15,4 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+
void render_layer_status(void);
diff --git a/keyboards/doio/kb16/lib/logo.h b/keyboards/doio/kb16/lib/logo.h
index 91d1ddce34..bb3ddc446e 100644
--- a/keyboards/doio/kb16/lib/logo.h
+++ b/keyboards/doio/kb16/lib/logo.h
@@ -15,4 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+
void render_logo(void);
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index aa066fe393..8739474326 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
@@ -33,7 +25,6 @@
#ifdef RGB_MATRIX_ENABLE
/* RGB Matrix config */
- #define RGB_DI_PIN F6
#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/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index d0acdedfb9..f37a58e157 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -8,6 +8,14 @@
"pid": "0x1601",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F4", "F1", "F0", "B7"],
+ "rows": ["D5", "D4", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F7", "pin_b": "E6"},
@@ -15,36 +23,39 @@
{"pin_a": "D7", "pin_b": "D6"}
]
},
+ "ws2812": {
+ "pin": "F6"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"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/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk
index 475b3b9a52..5c5ad3de8c 100644
--- a/keyboards/doio/kb16/rev1/rules.mk
+++ b/keyboards/doio/kb16/rev1/rules.mk
@@ -24,7 +24,6 @@ OLED_DRIVER = SSD1306
# RGB Matrix enabled
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
# Encoder enabled
ENCODER_ENABLE = yes
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/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
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 866bd3e1d9..a87532c459 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -17,11 +17,6 @@
#pragma once
-
-#define MATRIX_ROW_PINS { B3, B4, B9, B8, A5, A6 }
-#define MATRIX_COL_PINS { B14, B13, B12, B0, A7, A9, A8 }
-#define DIODE_DIRECTION COL2ROW // COL2ROW or ROW2COL
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -41,7 +36,6 @@
#ifdef RGB_MATRIX_ENABLE
/* RGB Matrix config */
- #define RGB_DI_PIN A10
#define RGB_MATRIX_LED_COUNT 36
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index 9fe8e83185..3f3fa1c332 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -8,6 +8,14 @@
"pid": "0x3001",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
+ "rows": ["B3", "B4", "B9", "B8", "A5", "A6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6"},
@@ -15,51 +23,59 @@
{"pin_a": "A3", "pin_b": "A4", "resolution": 2}
]
},
+ "ws2812": {
+ "pin": "A10"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4.25, "y":0},
- {"label":"K05", "x":5.25, "y":0},
- {"label":"K06", "x":6.25, "y":0},
-
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1, "h":2},
- {"label":"K14", "x":4.25, "y":1},
- {"label":"K15", "x":5.25, "y":1},
- {"label":"K16", "x":6.25, "y":1},
+ {"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},
+
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"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, "h": 2},
+
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 8.25, "y": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [3, 0], "x": 6.25, "y": 2},
- {"label":"Encoder 1", "x":8.25, "y":2},
+ {"matrix": [3, 1], "x": 11, "y": 2},
- {"label":"K20", "x":0, "y":2},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":4.25, "y":2},
- {"label":"K24", "x":5.25, "y":2},
- {"label":"K25", "x":6.25, "y":2},
+ {"matrix": [3, 2], "x": 0, "y": 3},
+ {"matrix": [3, 3], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
- {"label":"Encoder 2", "x":11, "y":2},
+ {"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2},
+ {"matrix": [4, 1], "x": 5.25, "y": 3},
- {"label":"K30", "x":0, "y":3},
- {"label":"K31", "x":1, "y":3},
- {"label":"K32", "x":2, "y":3},
- {"label":"K33", "x":4.25, "y":3, "h":2},
- {"label":"K35", "x":5.25, "y":3},
+ {"matrix": [4, 2], "x": 9, "y": 4},
- {"label":"Encoder 3", "x":9, "y":4},
+ {"matrix": [4, 3], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 4], "x": 2, "y": 4},
- {"label":"K40", "x":0, "y":4, "w":2},
- {"label":"K41", "x":2, "y":4},
- {"label":"K42", "x":4.25, "y":4},
- {"label":"K43", "x":5.25, "y":4},
- {"label":"K44", "x":6.25, "y":4}
+ {"matrix": [5, 4], "x": 4.25, "y": 4},
+ {"matrix": [5, 5], "x": 5.25, "y": 4},
+ {"matrix": [5, 6], "x": 6.25, "y": 4}
]
}
}
diff --git a/keyboards/doio/kb30/kb30.c b/keyboards/doio/kb30/kb30.c
index 3272863ad1..53a4546e06 100644
--- a/keyboards/doio/kb30/kb30.c
+++ b/keyboards/doio/kb30/kb30.c
@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kb30.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/doio/kb30/kb30.h b/keyboards/doio/kb30/kb30.h
deleted file mode 100644
index 1a294c9735..0000000000
--- a/keyboards/doio/kb30/kb30.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, \
- K10, K11, K12, K13, K14, K15, K16, \
- K20, K21, K22, K23, K24, K25, \
- K30, K31, K32, K33, K35, \
- K40, K41, K42, K43, K44, \
- K54, K55, K56 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06 }, \
- { K10, K11, K12, K13, K14, K15, K16 }, \
- { K20, K21, K22, K23, K24, K25, KC_NO}, \
- { K30, K31, K32, K33, KC_NO, K35, KC_NO}, \
- { K40, K41, K42, K43, K44, KC_NO, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, K56 } \
-}
diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk
index a50872f0d5..b12899890e 100644
--- a/keyboards/doio/kb30/rules.mk
+++ b/keyboards/doio/kb30/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb38/config.h b/keyboards/doio/kb38/config.h
index 740f1baea7..ff90cbc8a7 100644
--- a/keyboards/doio/kb38/config.h
+++ b/keyboards/doio/kb38/config.h
@@ -3,7 +3,6 @@
#pragma once
-#define RGB_DI_PIN F6
#define RGB_MATRIX_LED_COUNT 44
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
index 227511295c..352702f814 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/info.json
@@ -32,6 +32,9 @@
{"pin_a": "D6", "pin_b": "D7", "resolution": 2}
]
},
+ "ws2812": {
+ "pin": "F6"
+ },
"rgb_matrix": {
"driver": "WS2812",
"layout": [
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 11:56:10 +0000