aboutsummaryrefslogtreecommitdiff
path: root/keyboards/doio/kb30
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/doio/kb30')
-rw-r--r--keyboards/doio/kb30/config.h2
-rw-r--r--keyboards/doio/kb30/kb30.c28
-rw-r--r--keyboards/doio/kb30/keyboard.json45
-rw-r--r--keyboards/doio/kb30/keymaps/via/keymap.c66
-rw-r--r--keyboards/doio/kb30/keymaps/via/rules.mk4
5 files changed, 44 insertions, 101 deletions
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 04730a1f18..3dc7a76367 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -27,8 +27,6 @@
# define I2C_DRIVER I2CD2
#endif
-#define RGB_MATRIX_LED_COUNT 36
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/doio/kb30/kb30.c b/keyboards/doio/kb30/kb30.c
index 53a4546e06..671f49e8ab 100644
--- a/keyboards/doio/kb30/kb30.c
+++ b/keyboards/doio/kb30/kb30.c
@@ -17,34 +17,6 @@
#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
- led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { 0, 1, 2, 3, 4, 5, 6},
- { 7, 8, 9, 10, 11, 12, 13},
- { 14, 15, 16, 17, 18, 19, NO_LED },
- { 20, 21, 22, 23, NO_LED, 24, NO_LED},
- { 25, 26, 27, 28, 29, NO_LED, NO_LED},
- { 30, 31, 32, 33, 34, 35}
-}, {
-{0,0}, {37,0}, {75,0}, {112,0}, {149,0}, {187,0}, {224,0},
-{0,16}, {37,16}, {75,16}, {112,16}, {149,16}, {187,16}, {224,16},
-{0,32}, {37,32}, {75,32}, {112,32}, {149,32}, {187,32},
-{0,48}, {37,48}, {75,48}, {112,48}, {187,48},
-{0,64}, {37,64}, {65,64}, {112,64}, {149,64},
-{187,64}, {173,64}, {186,64}, {198,64}, {211,64},{224,64},
-}, {
- 4,4,4,4,4,4,4,
- 4,4,4,4,4,4,4,
- 4,4,4,4,4,4,
- 4,4,4,4,4,
- 4,4,4,4,4,
- 4,4,4,4,4,4
-} };
-#endif
-
/* OLED */
#ifdef OLED_ENABLE
uint16_t startup_timer = 0;
diff --git a/keyboards/doio/kb30/keyboard.json b/keyboards/doio/kb30/keyboard.json
index b14eab1c33..388df2d9e3 100644
--- a/keyboards/doio/kb30/keyboard.json
+++ b/keyboards/doio/kb30/keyboard.json
@@ -46,7 +46,50 @@
},
"driver": "ws2812",
"max_brightness": 200,
- "sleep": true
+ "sleep": true,
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 37, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 149, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 187, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 224, "y": 0, "flags": 4},
+
+ {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 37, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 75, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 112, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 149, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 187, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 224, "y": 16, "flags": 4},
+
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 37, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 75, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 112, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 149, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 187, "y": 32, "flags": 4},
+
+ {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 37, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 75, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 112, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 187, "y": 48, "flags": 4},
+
+ {"matrix": [4, 0], "x": 18, "y": 64, "flags": 4},
+ {"matrix": [4, 1], "x": 75, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 149, "y": 64, "flags": 4},
+ {"matrix": [4, 3], "x": 187, "y": 64, "flags": 4},
+ {"matrix": [4, 4], "x": 224, "y": 64, "flags": 4},
+
+ {"x": 224, "y": 56, "flags": 2},
+ {"x": 112, "y": 56, "flags": 2},
+ {"x": 0, "y": 56, "flags": 2},
+ {"x": 0, "y": 8, "flags": 2},
+ {"x": 112, "y": 8, "flags": 2},
+ {"x": 224, "y": 8, "flags": 2}
+ ]
},
"features": {
"bootmagic": true,
diff --git a/keyboards/doio/kb30/keymaps/via/keymap.c b/keyboards/doio/kb30/keymaps/via/keymap.c
deleted file mode 100644
index 2e385d24e3..0000000000
--- a/keyboards/doio/kb30/keymaps/via/keymap.c
+++ /dev/null
@@ -1,66 +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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
- _LAY0,
- _LAY1,
- _LAY2,
- _LAY3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_LAY0] = LAYOUT(
- KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUS,
- KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
- KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN,
- KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP,
- KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT,
- KC_MPLY, TO(1), KC_TRNS),
- [_LAY1] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, TO(2), KC_TRNS),
- [_LAY2] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, TO(3), KC_TRNS),
- [_LAY3] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
- KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI,
- KC_TRNS, TO(0), KC_TRNS)
-
-};
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_LAY0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
- [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
- [_LAY2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
- [_LAY3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/doio/kb30/keymaps/via/rules.mk b/keyboards/doio/kb30/keymaps/via/rules.mk
deleted file mode 100644
index d76c12896f..0000000000
--- a/keyboards/doio/kb30/keymaps/via/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes