summaryrefslogtreecommitdiff
path: root/keyboards/rgbkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rgbkb')
-rw-r--r--keyboards/rgbkb/mun/config.h8
-rw-r--r--keyboards/rgbkb/mun/rev1/info.json201
-rw-r--r--keyboards/rgbkb/mun/rev1/rev1.c8
-rw-r--r--keyboards/rgbkb/mun/rev1/rev1.h30
-rw-r--r--keyboards/rgbkb/mun/rules.mk2
-rw-r--r--keyboards/rgbkb/pan/config.h3
-rw-r--r--keyboards/rgbkb/pan/info.json3
-rw-r--r--keyboards/rgbkb/pan/pan.c1
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/config.h22
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/info.json8
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/config.h22
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/info.json8
-rw-r--r--keyboards/rgbkb/pan/rev1/rules.mk3
-rw-r--r--keyboards/rgbkb/pan/rules.mk4
-rw-r--r--keyboards/rgbkb/sol/config.h7
-rw-r--r--keyboards/rgbkb/sol/rev1/config.h3
-rw-r--r--keyboards/rgbkb/sol/rev1/info.json170
-rw-r--r--keyboards/rgbkb/sol/rev1/rev1.h1
-rw-r--r--keyboards/rgbkb/sol/rev1/rules.mk1
-rw-r--r--keyboards/rgbkb/sol/rev2/config.h3
-rw-r--r--keyboards/rgbkb/sol/rev2/info.json170
-rw-r--r--keyboards/rgbkb/sol/rev2/rev2.h1
-rw-r--r--keyboards/rgbkb/sol/rev2/rules.mk1
-rw-r--r--keyboards/rgbkb/sol/sol.c1
-rw-r--r--keyboards/rgbkb/sol/sol.h29
-rw-r--r--keyboards/rgbkb/sol3/config.h11
-rw-r--r--keyboards/rgbkb/sol3/rev1/info.json206
-rw-r--r--keyboards/rgbkb/sol3/rev1/rev1.c13
-rw-r--r--keyboards/rgbkb/sol3/rev1/rev1.h51
-rw-r--r--keyboards/rgbkb/sol3/rules.mk2
-rw-r--r--keyboards/rgbkb/zen/rev1/config.h11
-rw-r--r--keyboards/rgbkb/zen/rev1/info.json82
-rw-r--r--keyboards/rgbkb/zen/rev1/rev1.c1
-rw-r--r--keyboards/rgbkb/zen/rev1/rev1.h23
-rw-r--r--keyboards/rgbkb/zen/rev2/config.h10
-rw-r--r--keyboards/rgbkb/zen/rev2/info.json435
-rw-r--r--keyboards/rgbkb/zen/rev2/rev2.c2
-rw-r--r--keyboards/rgbkb/zen/rev2/rev2.h24
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/config.h9
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/info.json199
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/rev1.c2
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/rev1.h87
-rw-r--r--keyboards/rgbkb/zygomorph/rules.mk1
-rw-r--r--keyboards/rgbkb/zygomorph/zygomorph.c1
-rw-r--r--keyboards/rgbkb/zygomorph/zygomorph.h4
45 files changed, 808 insertions, 1076 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 8f961078bd..5b411a8c52 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -9,10 +9,6 @@
#pragma once
-
-// Last pins reserved for encoder / touch encoder support
-#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, NO_PIN, NO_PIN }
-#define MATRIX_COL_PINS { A0, B11, B0, B10, B12, B2, A8 }
#define MATRIX_IO_DELAY 5
#define BUSY_WAIT
@@ -25,9 +21,6 @@
#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
#define TOUCH_SEGMENTS 3
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* CRC Configuration */
#define CRC8_OPTIMIZE_SPEED
#define CRC8_USE_TABLE
@@ -56,7 +49,6 @@
#define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
/* RGB LED Configuration */
-#define RGB_DI_PIN B5
#define RGBLED_NUM 98
#define RGBLED_SPLIT { 49, 49 }
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index b68a1586c5..a2f6872090 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -8,6 +8,18 @@
"pid": "0x3505",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B5",
+ "driver": "pwm"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"],
+ "rows": ["A1", "A3", "B3", "A13", "B15", null, null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B8", "pin_b": "A14"},
@@ -22,94 +34,107 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
- {"label":"R00", "x":7.5, "y":0},
- {"label":"R01", "x":8.5, "y":0},
- {"label":"R02", "x":9.5, "y":0},
- {"label":"R03", "x":10.5, "y":0},
- {"label":"R04", "x":11.5, "y":0},
- {"label":"R05", "x":12.5, "y":0},
- {"label":"R06", "x":13.5, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"L16", "x":6, "y":1},
- {"label":"R10", "x":7.5, "y":1},
- {"label":"R11", "x":8.5, "y":1},
- {"label":"R12", "x":9.5, "y":1},
- {"label":"R13", "x":10.5, "y":1},
- {"label":"R14", "x":11.5, "y":1},
- {"label":"R15", "x":12.5, "y":1},
- {"label":"R16", "x":13.5, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"L26", "x":6, "y":2},
- {"label":"R20", "x":7.5, "y":2},
- {"label":"R21", "x":8.5, "y":2},
- {"label":"R22", "x":9.5, "y":2},
- {"label":"R23", "x":10.5, "y":2},
- {"label":"R24", "x":11.5, "y":2},
- {"label":"R25", "x":12.5, "y":2},
- {"label":"R26", "x":13.5, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"L36", "x":6, "y":3},
- {"label":"R30", "x":7.5, "y":3},
- {"label":"R21", "x":8.5, "y":3},
- {"label":"R32", "x":9.5, "y":3},
- {"label":"R33", "x":10.5, "y":3},
- {"label":"R34", "x":11.5, "y":3},
- {"label":"R35", "x":12.5, "y":3},
- {"label":"R36", "x":13.5, "y":3},
- {"label":"L40", "x":0, "y":4},
- {"label":"L41", "x":1, "y":4},
- {"label":"L42", "x":2, "y":4},
- {"label":"L43", "x":3, "y":4},
- {"label":"L44", "x":4, "y":4},
- {"label":"L45", "x":5, "y":4},
- {"label":"L46", "x":6, "y":4},
- {"label":"R40", "x":7.5, "y":4},
- {"label":"R41", "x":8.5, "y":4},
- {"label":"R42", "x":9.5, "y":4},
- {"label":"R43", "x":10.5, "y":4},
- {"label":"R44", "x":11.5, "y":4},
- {"label":"R45", "x":12.5, "y":4},
- {"label":"R46", "x":13.5, "y":4},
- {"label":"E00", "x":0, "y":5.5},
- {"label":"E01", "x":1, "y":5.5},
- {"label":"E10", "x":2, "y":5.5},
- {"label":"E11", "x":3, "y":5.5},
- {"label":"E20", "x":10.5, "y":5.5},
- {"label":"E21", "x":11.5, "y":5.5},
- {"label":"E30", "x":12.5, "y":5.5},
- {"label":"E31", "x":13.5, "y":5.5},
- {"label":"T00", "x":0, "y":6.5},
- {"label":"T01", "x":1, "y":6.5},
- {"label":"T02", "x":2, "y":6.5},
- {"label":"T03", "x":3, "y":6.5},
- {"label":"T04", "x":4, "y":6.5},
- {"label":"T10", "x":9.5, "y":6.5},
- {"label":"T11", "x":10.5, "y":6.5},
- {"label":"T12", "x":11.5, "y":6.5},
- {"label":"T13", "x":12.5, "y":6.5},
- {"label":"T14", "x":13.5, "y":6.5}
+ {"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, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [7, 6], "x": 7.5, "y": 0},
+ {"matrix": [7, 5], "x": 8.5, "y": 0},
+ {"matrix": [7, 4], "x": 9.5, "y": 0},
+ {"matrix": [7, 3], "x": 10.5, "y": 0},
+ {"matrix": [7, 2], "x": 11.5, "y": 0},
+ {"matrix": [7, 1], "x": 12.5, "y": 0},
+ {"matrix": [7, 0], "x": 13.5, "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},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [8, 6], "x": 7.5, "y": 1},
+ {"matrix": [8, 5], "x": 8.5, "y": 1},
+ {"matrix": [8, 4], "x": 9.5, "y": 1},
+ {"matrix": [8, 3], "x": 10.5, "y": 1},
+ {"matrix": [8, 2], "x": 11.5, "y": 1},
+ {"matrix": [8, 1], "x": 12.5, "y": 1},
+ {"matrix": [8, 0], "x": 13.5, "y": 1},
+
+ {"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},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [9, 6], "x": 7.5, "y": 2},
+ {"matrix": [9, 5], "x": 8.5, "y": 2},
+ {"matrix": [9, 4], "x": 9.5, "y": 2},
+ {"matrix": [9, 3], "x": 10.5, "y": 2},
+ {"matrix": [9, 2], "x": 11.5, "y": 2},
+ {"matrix": [9, 1], "x": 12.5, "y": 2},
+ {"matrix": [9, 0], "x": 13.5, "y": 2},
+
+ {"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},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+
+ {"matrix": [10, 6], "x": 7.5, "y": 3},
+ {"matrix": [10, 5], "x": 8.5, "y": 3},
+ {"matrix": [10, 4], "x": 9.5, "y": 3},
+ {"matrix": [10, 3], "x": 10.5, "y": 3},
+ {"matrix": [10, 2], "x": 11.5, "y": 3},
+ {"matrix": [10, 1], "x": 12.5, "y": 3},
+ {"matrix": [10, 0], "x": 13.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+
+ {"matrix": [11, 6], "x": 7.5, "y": 4},
+ {"matrix": [11, 5], "x": 8.5, "y": 4},
+ {"matrix": [11, 4], "x": 9.5, "y": 4},
+ {"matrix": [11, 3], "x": 10.5, "y": 4},
+ {"matrix": [11, 2], "x": 11.5, "y": 4},
+ {"matrix": [11, 1], "x": 12.5, "y": 4},
+ {"matrix": [11, 0], "x": 13.5, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+ {"matrix": [5, 1], "x": 1, "y": 5.5},
+ {"matrix": [5, 2], "x": 2, "y": 5.5},
+ {"matrix": [5, 3], "x": 3, "y": 5.5},
+
+ {"matrix": [12, 0], "x": 10.5, "y": 5.5},
+ {"matrix": [12, 1], "x": 11.5, "y": 5.5},
+ {"matrix": [12, 2], "x": 12.5, "y": 5.5},
+ {"matrix": [12, 3], "x": 13.5, "y": 5.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 6.5},
+ {"matrix": [6, 1], "x": 1, "y": 6.5},
+ {"matrix": [6, 2], "x": 2, "y": 6.5},
+ {"matrix": [6, 3], "x": 3, "y": 6.5},
+ {"matrix": [6, 4], "x": 4, "y": 6.5},
+
+ {"matrix": [13, 0], "x": 9.5, "y": 6.5},
+ {"matrix": [13, 1], "x": 10.5, "y": 6.5},
+ {"matrix": [13, 2], "x": 11.5, "y": 6.5},
+ {"matrix": [13, 3], "x": 12.5, "y": 6.5},
+ {"matrix": [13, 4], "x": 13.5, "y": 6.5}
]
}
}
diff --git a/keyboards/rgbkb/mun/rev1/rev1.c b/keyboards/rgbkb/mun/rev1/rev1.c
index c7604510da..564ce4dfb9 100644
--- a/keyboards/rgbkb/mun/rev1/rev1.c
+++ b/keyboards/rgbkb/mun/rev1/rev1.c
@@ -37,15 +37,11 @@ const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPT
};
static void process_encoder_matrix(encodermap_t pos) {
- action_exec((keyevent_t){
- .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */
- });
+ action_exec(MAKE_KEYEVENT(pos.r, pos.c, true));
#if TAP_CODE_DELAY > 0
wait_ms(TAP_CODE_DELAY);
#endif
- action_exec((keyevent_t){
- .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */
- });
+ action_exec(MAKE_KEYEVENT(pos.r, pos.c, false));
}
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/rgbkb/mun/rev1/rev1.h b/keyboards/rgbkb/mun/rev1/rev1.h
index 8e7b65f45c..291428c0fb 100644
--- a/keyboards/rgbkb/mun/rev1/rev1.h
+++ b/keyboards/rgbkb/mun/rev1/rev1.h
@@ -11,33 +11,3 @@
#include "mun.h"
#include "touch_encoder.h"
-
-// clang-format off
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, \
- E00, E01, E10, E11, E20, E21, E30, E31, \
- T00, T01, T02, T03, T04, T10, T11, T12, T13, T14 \
-) \
-{ \
- /* Left Half */ \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { E00, E01, E10, E11, KC_NO, KC_NO, KC_NO }, \
- { T00, T01, T02, T03, T04, KC_NO, KC_NO }, \
- /* Right Half */ \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R46, R45, R44, R43, R42, R41, R40 }, \
- { E20, E21, E30, E31, KC_NO, KC_NO, KC_NO }, \
- { T10, T11, T12, T13, T14, KC_NO, KC_NO } \
-}
-// clang-format on
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 0958dd2130..0862bde4e5 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -15,10 +15,8 @@ COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
AUDIO_ENABLE = no # Audio output
-WS2812_DRIVER = pwm
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable the OLED Driver
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 05d446d05d..f1b323bc17 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -29,9 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_TWINKLE
#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_LIMIT_VAL 120
#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json
index e12e7717eb..d151fd68d6 100644
--- a/keyboards/rgbkb/pan/info.json
+++ b/keyboards/rgbkb/pan/info.json
@@ -8,6 +8,9 @@
"pid": "0x8C9C",
"device_version": "0.0.2"
},
+ "rgb_matrix": {
+ "driver": "custom"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index fab3cac785..023c766de6 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -27,7 +27,6 @@ LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
static void init(void) {}
static void flush(void) {
- // Assumes use of RGB_DI_PIN
ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
}
diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h
deleted file mode 100644
index 5e7c4babbd..0000000000
--- a/keyboards/rgbkb/pan/rev1/32a/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Copyright 2020 RGBKB
-
-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
-
-#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 }
-#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-#define RGB_DI_PIN B3
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json
index 1f7ece37eb..e4ac3eeecb 100644
--- a/keyboards/rgbkb/pan/rev1/32a/info.json
+++ b/keyboards/rgbkb/pan/rev1/32a/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["D7", "D1", "D5", "D6", "C2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32a",
"bootloader": "usbasploader",
"encoder": {
@@ -6,5 +11,8 @@
{"pin_a": "B0", "pin_b": "B1"},
{"pin_a": "D0", "pin_b": "B2"}
]
+ },
+ "ws2812": {
+ "pin": "B3"
}
}
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h
deleted file mode 100644
index f25713b2be..0000000000
--- a/keyboards/rgbkb/pan/rev1/proton_c/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Copyright 2020 RGBKB
-
-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
-
-#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 }
-#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 }
-
-#define RGB_DI_PIN A3
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json
index 5fd7124b9c..ff81cd1092 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/info.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["A8", "A6", "B0", "B1", "B2", "B4", "B5", "A1", "A2", "B3", "B9", "A10", "A9"],
+ "rows": ["A15", "B10", "A14", "A13", "A7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
@@ -7,5 +12,8 @@
{"pin_a": "B14", "pin_b": "B15"},
{"pin_a": "B11", "pin_b": "B12"}
]
+ },
+ "ws2812": {
+ "pin": "A3"
}
}
diff --git a/keyboards/rgbkb/pan/rev1/rules.mk b/keyboards/rgbkb/pan/rev1/rules.mk
index 667c290059..4d3c0f6679 100644
--- a/keyboards/rgbkb/pan/rev1/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/rules.mk
@@ -1,5 +1,2 @@
# The default configuration is a atmega32a
DEFAULT_FOLDER = rgbkb/pan/rev1/32a
-
-RGB_MATRIX_DRIVER = custom
-WS2812_DRIVER_REQUIRED := yes
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
index 464dfecf6f..775fa48e12 100644
--- a/keyboards/rgbkb/pan/rules.mk
+++ b/keyboards/rgbkb/pan/rules.mk
@@ -9,8 +9,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = bitbang
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
@@ -21,3 +19,5 @@ STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this.
# Default to revision 1
DEFAULT_FOLDER = rgbkb/pan/rev1
+
+WS2812_DRIVER_REQUIRED := yes
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index b2e5f2b0d3..5c327fd760 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EE_HANDS
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, E6}
-
-// wiring of each half
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }
-
-#define DIODE_DIRECTION COL2ROW
-
#ifdef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 40
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40
diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h
index fcef317e1f..a41959a88b 100644
--- a/keyboards/rgbkb/sol/rev1/config.h
+++ b/keyboards/rgbkb/sol/rev1/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B3
-
#ifdef LED_MIRRORED
#define RGBLED_NUM 35
#else
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index eb742972b1..b0b8fc12d0 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -8,6 +8,14 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+ "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D6"}
@@ -16,85 +24,99 @@
"split": {
"soft_serial_pin": "D3"
},
+ "ws2812": {
+ "pin": "B3"
+ },
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0, "w":1.5},
- {"label":"L01", "x":1.5, "y":0},
- {"label":"L02", "x":2.5, "y":0},
- {"label":"L03", "x":3.5, "y":0},
- {"label":"L04", "x":4.5, "y":0},
- {"label":"L05", "x":5.5, "y":0},
- {"label":"L06", "x":6.75, "y":0},
- {"label":"R06", "x":9.25, "y":0},
- {"label":"R00", "x":10.5, "y":0},
- {"label":"R01", "x":11.5, "y":0},
- {"label":"R02", "x":12.5, "y":0},
- {"label":"R03", "x":13.5, "y":0},
- {"label":"R04", "x":14.5, "y":0},
- {"label":"R05", "x":15.5, "y":0, "w":1.5},
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
- {"label":"L16", "x":6.75, "y":1},
- {"label":"R16", "x":9.25, "y":1},
- {"label":"R10", "x":10.5, "y":1},
- {"label":"R11", "x":11.5, "y":1},
- {"label":"R12", "x":12.5, "y":1},
- {"label":"R13", "x":13.5, "y":1},
- {"label":"R14", "x":14.5, "y":1},
- {"label":"R15", "x":15.5, "y":1, "w":1.5},
- {"label":"L20", "x":0, "y":2, "w":1.5},
- {"label":"L21", "x":1.5, "y":2},
- {"label":"L22", "x":2.5, "y":2},
- {"label":"L23", "x":3.5, "y":2},
- {"label":"L24", "x":4.5, "y":2},
- {"label":"L25", "x":5.5, "y":2},
- {"label":"L26", "x":6.75, "y":2},
- {"label":"R26", "x":9.25, "y":2},
- {"label":"R20", "x":10.5, "y":2},
- {"label":"R21", "x":11.5, "y":2},
- {"label":"R22", "x":12.5, "y":2},
- {"label":"R23", "x":13.5, "y":2},
- {"label":"R24", "x":14.5, "y":2},
- {"label":"R25", "x":15.5, "y":2, "w":1.5},
- {"label":"L30", "x":0, "y":3, "w":1.5},
- {"label":"L31", "x":1.5, "y":3},
- {"label":"L32", "x":2.5, "y":3},
- {"label":"L33", "x":3.5, "y":3},
- {"label":"L34", "x":4.5, "y":3},
- {"label":"L35", "x":5.5, "y":3},
- {"label":"L36", "x":6.75, "y":3},
- {"label":"R36", "x":9.25, "y":3},
- {"label":"R30", "x":10.5, "y":3},
- {"label":"R31", "x":11.5, "y":3},
- {"label":"R32", "x":12.5, "y":3},
- {"label":"R33", "x":13.5, "y":3},
- {"label":"R34", "x":14.5, "y":3},
- {"label":"R35", "x":15.5, "y":3, "w":1.5},
- {"label":"L40", "x":0, "y":4, "w":1.5},
- {"label":"L41", "x":1.5, "y":4},
- {"label":"L42", "x":2.5, "y":4},
- {"label":"L43", "x":3.5, "y":4},
- {"label":"L44", "x":4.5, "y":4},
- {"label":"L45", "x":6, "y":4.5},
- {"label":"L46", "x":7, "y":4.5},
- {"label":"R46", "x":9, "y":4.5},
- {"label":"R40", "x":10, "y":4.5},
- {"label":"R41", "x":11.5, "y":4},
- {"label":"R42", "x":12.5, "y":4},
- {"label":"R43", "x":13.5, "y":4},
- {"label":"R44", "x":14.5, "y":4},
- {"label":"R45", "x":15.5, "y":4, "w":1.5},
- {"label":"L55", "x":6, "y":5.5},
- {"label":"L56", "x":7, "y":5.5},
- {"label":"R56", "x":9, "y":5.5},
- {"label":"R50", "x":10, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.75, "y": 0},
+
+ {"matrix": [6, 6], "x": 9.25, "y": 0},
+ {"matrix": [6, 5], "x": 10.5, "y": 0},
+ {"matrix": [6, 4], "x": 11.5, "y": 0},
+ {"matrix": [6, 3], "x": 12.5, "y": 0},
+ {"matrix": [6, 2], "x": 13.5, "y": 0},
+ {"matrix": [6, 1], "x": 14.5, "y": 0},
+ {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [7, 6], "x": 9.25, "y": 1},
+ {"matrix": [7, 5], "x": 10.5, "y": 1},
+ {"matrix": [7, 4], "x": 11.5, "y": 1},
+ {"matrix": [7, 3], "x": 12.5, "y": 1},
+ {"matrix": [7, 2], "x": 13.5, "y": 1},
+ {"matrix": [7, 1], "x": 14.5, "y": 1},
+ {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+
+ {"matrix": [8, 6], "x": 9.25, "y": 2},
+ {"matrix": [8, 5], "x": 10.5, "y": 2},
+ {"matrix": [8, 4], "x": 11.5, "y": 2},
+ {"matrix": [8, 3], "x": 12.5, "y": 2},
+ {"matrix": [8, 2], "x": 13.5, "y": 2},
+ {"matrix": [8, 1], "x": 14.5, "y": 2},
+ {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+
+ {"matrix": [9, 6], "x": 9.25, "y": 3},
+ {"matrix": [9, 5], "x": 10.5, "y": 3},
+ {"matrix": [9, 4], "x": 11.5, "y": 3},
+ {"matrix": [9, 3], "x": 12.5, "y": 3},
+ {"matrix": [9, 2], "x": 13.5, "y": 3},
+ {"matrix": [9, 1], "x": 14.5, "y": 3},
+ {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4.5},
+ {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+ {"matrix": [10, 6], "x": 9, "y": 4.5},
+ {"matrix": [10, 5], "x": 10, "y": 4.5},
+ {"matrix": [10, 4], "x": 11.5, "y": 4},
+ {"matrix": [10, 3], "x": 12.5, "y": 4},
+ {"matrix": [10, 2], "x": 13.5, "y": 4},
+ {"matrix": [10, 1], "x": 14.5, "y": 4},
+ {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+ {"matrix": [5, 5], "x": 6, "y": 5.5},
+ {"matrix": [5, 6], "x": 7, "y": 5.5},
+
+ {"matrix": [11, 6], "x": 9, "y": 5.5},
+ {"matrix": [11, 5], "x": 10, "y": 5.5}
]
}
}
diff --git a/keyboards/rgbkb/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev1/rev1.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk
index cef623df1a..af9b588b7a 100644
--- a/keyboards/rgbkb/sol/rev1/rules.mk
+++ b/keyboards/rgbkb/sol/rev1/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not ena
LED_MIRRORED = yes # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER = WS2812
RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects.
RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h
index 874ec536b1..19680c84b3 100644
--- a/keyboards/rgbkb/sol/rev2/config.h
+++ b/keyboards/rgbkb/sol/rev2/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B7
-
// Underglow / DIY Tent Glow are parallel to the top row leds, no separate define
// Full Hand case adds 24 LEDs, Star Fighter case adds 38 LEDs
// For mirrored LED control (each MCU controls half the LEDs), total LED counts are divided in half
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 264f21d02b..1eec8a3930 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -8,88 +8,110 @@
"pid": "0x3060",
"device_version": "0.0.2"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+ "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D3"
},
+ "ws2812": {
+ "pin": "B7"
+ },
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0, "w":1.5},
- {"label":"L01", "x":1.5, "y":0},
- {"label":"L02", "x":2.5, "y":0},
- {"label":"L03", "x":3.5, "y":0},
- {"label":"L04", "x":4.5, "y":0},
- {"label":"L05", "x":5.5, "y":0},
- {"label":"L06", "x":6.75, "y":0},
- {"label":"R06", "x":9.25, "y":0},
- {"label":"R00", "x":10.5, "y":0},
- {"label":"R01", "x":11.5, "y":0},
- {"label":"R02", "x":12.5, "y":0},
- {"label":"R03", "x":13.5, "y":0},
- {"label":"R04", "x":14.5, "y":0},
- {"label":"R05", "x":15.5, "y":0, "w":1.5},
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
- {"label":"L16", "x":6.75, "y":1},
- {"label":"R16", "x":9.25, "y":1},
- {"label":"R10", "x":10.5, "y":1},
- {"label":"R11", "x":11.5, "y":1},
- {"label":"R12", "x":12.5, "y":1},
- {"label":"R13", "x":13.5, "y":1},
- {"label":"R14", "x":14.5, "y":1},
- {"label":"R15", "x":15.5, "y":1, "w":1.5},
- {"label":"L20", "x":0, "y":2, "w":1.5},
- {"label":"L21", "x":1.5, "y":2},
- {"label":"L22", "x":2.5, "y":2},
- {"label":"L23", "x":3.5, "y":2},
- {"label":"L24", "x":4.5, "y":2},
- {"label":"L25", "x":5.5, "y":2},
- {"label":"L26", "x":6.75, "y":2},
- {"label":"R26", "x":9.25, "y":2},
- {"label":"R20", "x":10.5, "y":2},
- {"label":"R21", "x":11.5, "y":2},
- {"label":"R22", "x":12.5, "y":2},
- {"label":"R23", "x":13.5, "y":2},
- {"label":"R24", "x":14.5, "y":2},
- {"label":"R25", "x":15.5, "y":2, "w":1.5},
- {"label":"L30", "x":0, "y":3, "w":1.5},
- {"label":"L31", "x":1.5, "y":3},
- {"label":"L32", "x":2.5, "y":3},
- {"label":"L33", "x":3.5, "y":3},
- {"label":"L34", "x":4.5, "y":3},
- {"label":"L35", "x":5.5, "y":3},
- {"label":"L36", "x":6.75, "y":3},
- {"label":"R36", "x":9.25, "y":3},
- {"label":"R30", "x":10.5, "y":3},
- {"label":"R31", "x":11.5, "y":3},
- {"label":"R32", "x":12.5, "y":3},
- {"label":"R33", "x":13.5, "y":3},
- {"label":"R34", "x":14.5, "y":3},
- {"label":"R35", "x":15.5, "y":3, "w":1.5},
- {"label":"L40", "x":0, "y":4, "w":1.5},
- {"label":"L41", "x":1.5, "y":4},
- {"label":"L42", "x":2.5, "y":4},
- {"label":"L43", "x":3.5, "y":4},
- {"label":"L44", "x":4.5, "y":4},
- {"label":"L45", "x":6, "y":4.5},
- {"label":"L46", "x":7, "y":4.5},
- {"label":"R46", "x":9, "y":4.5},
- {"label":"R40", "x":10, "y":4.5},
- {"label":"R41", "x":11.5, "y":4},
- {"label":"R42", "x":12.5, "y":4},
- {"label":"R43", "x":13.5, "y":4},
- {"label":"R44", "x":14.5, "y":4},
- {"label":"R45", "x":15.5, "y":4, "w":1.5},
- {"label":"L55", "x":6, "y":5.5},
- {"label":"L56", "x":7, "y":5.5},
- {"label":"R56", "x":9, "y":5.5},
- {"label":"R50", "x":10, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.75, "y": 0},
+
+ {"matrix": [6, 6], "x": 9.25, "y": 0},
+ {"matrix": [6, 5], "x": 10.5, "y": 0},
+ {"matrix": [6, 4], "x": 11.5, "y": 0},
+ {"matrix": [6, 3], "x": 12.5, "y": 0},
+ {"matrix": [6, 2], "x": 13.5, "y": 0},
+ {"matrix": [6, 1], "x": 14.5, "y": 0},
+ {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [7, 6], "x": 9.25, "y": 1},
+ {"matrix": [7, 5], "x": 10.5, "y": 1},
+ {"matrix": [7, 4], "x": 11.5, "y": 1},
+ {"matrix": [7, 3], "x": 12.5, "y": 1},
+ {"matrix": [7, 2], "x": 13.5, "y": 1},
+ {"matrix": [7, 1], "x": 14.5, "y": 1},
+ {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+
+ {"matrix": [8, 6], "x": 9.25, "y": 2},
+ {"matrix": [8, 5], "x": 10.5, "y": 2},
+ {"matrix": [8, 4], "x": 11.5, "y": 2},
+ {"matrix": [8, 3], "x": 12.5, "y": 2},
+ {"matrix": [8, 2], "x": 13.5, "y": 2},
+ {"matrix": [8, 1], "x": 14.5, "y": 2},
+ {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+
+ {"matrix": [9, 6], "x": 9.25, "y": 3},
+ {"matrix": [9, 5], "x": 10.5, "y": 3},
+ {"matrix": [9, 4], "x": 11.5, "y": 3},
+ {"matrix": [9, 3], "x": 12.5, "y": 3},
+ {"matrix": [9, 2], "x": 13.5, "y": 3},
+ {"matrix": [9, 1], "x": 14.5, "y": 3},
+ {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4.5},
+ {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+ {"matrix": [10, 6], "x": 9, "y": 4.5},
+ {"matrix": [10, 5], "x": 10, "y": 4.5},
+ {"matrix": [10, 4], "x": 11.5, "y": 4},
+ {"matrix": [10, 3], "x": 12.5, "y": 4},
+ {"matrix": [10, 2], "x": 13.5, "y": 4},
+ {"matrix": [10, 1], "x": 14.5, "y": 4},
+ {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+ {"matrix": [5, 5], "x": 6, "y": 5.5},
+ {"matrix": [5, 6], "x": 7, "y": 5.5},
+
+ {"matrix": [11, 6], "x": 9, "y": 5.5},
+ {"matrix": [11, 5], "x": 10, "y": 5.5}
]
}
}
diff --git a/keyboards/rgbkb/sol/rev2/rev2.h b/keyboards/rgbkb/sol/rev2/rev2.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev2/rev2.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk
index 681a3e0993..53aeba76ae 100644
--- a/keyboards/rgbkb/sol/rev2/rules.mk
+++ b/keyboards/rgbkb/sol/rev2/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = no # Enable global lighting effects. Do not ena
LED_MIRRORED = no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
RGB_MATRIX_ENABLE = yes # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER = WS2812
RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects.
RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
diff --git a/keyboards/rgbkb/sol/sol.c b/keyboards/rgbkb/sol/sol.c
deleted file mode 100644
index 5945cc60a4..0000000000
--- a/keyboards/rgbkb/sol/sol.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sol.h"
diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h
index e885dc78c4..2cab481044 100644
--- a/keyboards/rgbkb/sol/sol.h
+++ b/keyboards/rgbkb/sol/sol.h
@@ -1,35 +1,6 @@
#pragma once
#include "quantum.h"
-#ifdef KEYBOARD_rgbkb_sol_rev1
-#include "rev1.h"
-#else
-#include "rev2.h"
-#endif
-
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, R16, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45, \
- L55, L56, R56, R50 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55, L56 }, \
- { R05, R04, R03, R02, R01, R00, R06 }, \
- { R15, R14, R13, R12, R11, R10, R16 }, \
- { R25, R24, R23, R22, R21, R20, R26 }, \
- { R35, R34, R33, R32, R31, R30, R36 }, \
- { R45, R44, R43, R42, R41, R40, R46 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R50, R56 } \
- }
#define ENCODER_LAYOUT( \
E10, E11, \
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 727947ef0b..9cc0134249 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -9,13 +9,6 @@
#pragma once
-
-// Last pins reserved for encoder / touch encoder support
-#define MATRIX_ROW_PINS { B15, A8, A15, B12, A3, NO_PIN }
-#define MATRIX_ROW_PINS_RIGHT { B15, B14, A8, A13, A7, NO_PIN }
-// Empty matrix entries used for encoder / touch encoder support
-#define MATRIX_COL_PINS { A6, A7, B0, B2, B1, B9, B3, B4 }
-#define MATRIX_COL_PINS_RIGHT { B9, B8, B4, A6, A3, B10, B12, B11 }
#define MATRIX_IO_DELAY 5
#define BUSY_WAIT
@@ -28,9 +21,6 @@
#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
#define TOUCH_SEGMENTS 3
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* CRC Configuration */
#define CRC8_OPTIMIZE_SPEED
#define CRC8_USE_TABLE
@@ -63,7 +53,6 @@
#define DIP_SWITCH_PINS_RIGHT { A14, B0 }
/* RGB LED Configuration */
-#define RGB_DI_PIN B5
#define RGBLED_NUM 156
#define RGBLED_SPLIT { 78, 78 }
#define RGBLIGHT_LIMIT_VAL 255
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 046a56f390..74af9d21fa 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -8,6 +8,18 @@
"pid": "0x3510",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B5",
+ "driver": "pwm"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"],
+ "rows": ["B15", "A8", "A15", "B12", "A3", null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A1", "pin_b": "A2"},
@@ -25,6 +37,12 @@
{"pin_a": "B3", "pin_b": "B13"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"],
+ "rows": ["B15", "B14", "A8", "A13", "A7", null]
+ }
}
},
"processor": "STM32F303",
@@ -32,113 +50,113 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0, "w":1.5},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.5, "y":0},
- {"x":6.75, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.75, "y": 0},
- {"x":9.25, "y":0},
- {"x":10.5, "y":0},
- {"x":11.5, "y":0},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0, "w":1.5},
+ {"matrix": [6, 6], "x": 9.25, "y": 0},
+ {"matrix": [6, 5], "x": 10.5, "y": 0},
+ {"matrix": [6, 4], "x": 11.5, "y": 0},
+ {"matrix": [6, 3], "x": 12.5, "y": 0},
+ {"matrix": [6, 2], "x": 13.5, "y": 0},
+ {"matrix": [6, 1], "x": 14.5, "y": 0},
+ {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5},
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.75, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"x":9.25, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1},
- {"x":14.5, "y":1},
- {"x":15.5, "y":1, "w":1.5},
+ {"matrix": [7, 6], "x": 9.25, "y": 1},
+ {"matrix": [7, 5], "x": 10.5, "y": 1},
+ {"matrix": [7, 4], "x": 11.5, "y": 1},
+ {"matrix": [7, 3], "x": 12.5, "y": 1},
+ {"matrix": [7, 2], "x": 13.5, "y": 1},
+ {"matrix": [7, 1], "x": 14.5, "y": 1},
+ {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
- {"x":0, "y":2, "w":1.5},
- {"x":1.5, "y":2},
- {"x":2.5, "y":2},
- {"x":3.5, "y":2},
- {"x":4.5, "y":2},
- {"x":5.5, "y":2},
- {"x":6.75, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"x":9.25, "y":2},
- {"x":10.5, "y":2},
- {"x":11.5, "y":2},
- {"x":12.5, "y":2},
- {"x":13.5, "y":2},
- {"x":14.5, "y":2},
- {"x":15.5, "y":2, "w":1.5},
+ {"matrix": [8, 6], "x": 9.25, "y": 2},
+ {"matrix": [8, 5], "x": 10.5, "y": 2},
+ {"matrix": [8, 4], "x": 11.5, "y": 2},
+ {"matrix": [8, 3], "x": 12.5, "y": 2},
+ {"matrix": [8, 2], "x": 13.5, "y": 2},
+ {"matrix": [8, 1], "x": 14.5, "y": 2},
+ {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":3},
- {"x":2.5, "y":3},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.75, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"x":9.25, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3},
- {"x":14.5, "y":3},
- {"x":15.5, "y":3, "w":1.5},
+ {"matrix": [9, 6], "x": 9.25, "y": 3},
+ {"matrix": [9, 5], "x": 10.5, "y": 3},
+ {"matrix": [9, 4], "x": 11.5, "y": 3},
+ {"matrix": [9, 3], "x": 12.5, "y": 3},
+ {"matrix": [9, 2], "x": 13.5, "y": 3},
+ {"matrix": [9, 1], "x": 14.5, "y": 3},
+ {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
- {"x":0, "y":4, "w":1.5},
- {"x":1.5, "y":4},
- {"x":2.5, "y":4},
- {"x":3.5, "y":4},
- {"x":4.5, "y":4},
- {"x":6, "y":4.5, "h":2},
- {"x":7, "y":4.5},
- {"x":7, "y":5.5},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4.5, "h": 2},
+ {"matrix": [4, 6], "x": 7, "y": 4.5},
+ {"matrix": [4, 7], "x": 7, "y": 5.5},
- {"x":9, "y":5.5},
- {"x":9, "y":4.5},
- {"x":10, "y":4.5, "h":2},
- {"x":11.5, "y":4},
- {"x":12.5, "y":4},
- {"x":13.5, "y":4},
- {"x":14.5, "y":4},
- {"x":15.5, "y":4, "w":1.5},
+ {"matrix": [10, 7], "x": 9, "y": 5.5},
+ {"matrix": [10, 6], "x": 9, "y": 4.5},
+ {"matrix": [10, 5], "x": 10, "y": 4.5, "h": 2},
+ {"matrix": [10, 4], "x": 11.5, "y": 4},
+ {"matrix": [10, 3], "x": 12.5, "y": 4},
+ {"matrix": [10, 2], "x": 13.5, "y": 4},
+ {"matrix": [10, 1], "x": 14.5, "y": 4},
+ {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
- {"x":0, "y":7, "w":0.8, "h":0.8},
- {"x":0.8, "y":7, "w":0.8, "h":0.8},
- {"x":1.6, "y":7, "w":0.8, "h":0.8},
- {"x":2.4, "y":7, "w":0.8, "h":0.8},
- {"x":3.2, "y":7, "w":0.8, "h":0.8},
- {"x":4, "y":7, "w":0.8, "h":0.8},
+ {"matrix": [5, 0], "x": 0, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [5, 1], "x": 0.8, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [5, 2], "x": 1.6, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [5, 3], "x": 2.4, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [5, 4], "x": 3.2, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [5, 5], "x": 4, "y": 7, "w": 0.8, "h": 0.8},
- {"x":12.2, "y":7, "w":0.8, "h":0.8},
- {"x":13, "y":7, "w":0.8, "h":0.8},
- {"x":13.8, "y":7, "w":0.8, "h":0.8},
- {"x":14.6, "y":7, "w":0.8, "h":0.8},
- {"x":15.4, "y":7, "w":0.8, "h":0.8},
- {"x":16.2, "y":7, "w":0.8, "h":0.8},
+ {"matrix": [11, 0], "x": 12.2, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [11, 1], "x": 13, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [11, 2], "x": 13.8, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [11, 3], "x": 14.6, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [11, 4], "x": 15.4, "y": 7, "w": 0.8, "h": 0.8},
+ {"matrix": [11, 5], "x": 16.2, "y": 7, "w": 0.8, "h": 0.8},
- {"x":0, "y":7.8, "w":0.8, "h":0.8},
- {"x":0.8, "y":7.8, "w":0.8, "h":0.8},
- {"x":1.6, "y":7.8, "w":0.8, "h":0.8},
- {"x":2.4, "y":7.8, "w":0.8, "h":0.8},
- {"x":3.2, "y":7.8, "w":0.8, "h":0.8},
+ {"matrix": [0, 7], "x": 0, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [1, 7], "x": 0.8, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [2, 7], "x": 1.6, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [5, 6], "x": 2.4, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [5, 7], "x": 3.2, "y": 7.8, "w": 0.8, "h": 0.8},
- {"x":13, "y":7.8, "w":0.8, "h":0.8},
- {"x":13.8, "y":7.8, "w":0.8, "h":0.8},
- {"x":14.6, "y":7.8, "w":0.8, "h":0.8},
- {"x":15.4, "y":7.8, "w":0.8, "h":0.8},
- {"x":16.2, "y":7.8, "w":0.8, "h":0.8}
+ {"matrix": [6, 7], "x": 13, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [7, 7], "x": 13.8, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [8, 7], "x": 14.6, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [11, 6], "x": 15.4, "y": 7.8, "w": 0.8, "h": 0.8},
+ {"matrix": [11, 7], "x": 16.2, "y": 7.8, "w": 0.8, "h": 0.8}
]
}
}
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c
index de5836e061..ff330a83d6 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.c
+++ b/keyboards/rgbkb/sol3/rev1/rev1.c
@@ -57,10 +57,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
}
case 1: {
// Handle RGB Encoder switch press
- action_exec((keyevent_t){
- .key = (keypos_t){.row = isLeftHand ? 4 : 10, .col = 6},
- .pressed = active, .time = (timer_read() | 1) /* time should not be 0 */
- });
+ action_exec(MAKE_KEYEVENT(isLeftHand ? 4 : 10, 6, active));
break;
}
}
@@ -68,15 +65,11 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
}
static void process_encoder_matrix(encodermap_t pos) {
- action_exec((keyevent_t){
- .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */
- });
+ action_exec(MAKE_KEYEVENT(pos.r, pos.c, true));
#if TAP_CODE_DELAY > 0
wait_ms(TAP_CODE_DELAY);
#endif
- action_exec((keyevent_t){
- .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */
- });
+ action_exec(MAKE_KEYEVENT(pos.r, pos.c, false));
}
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.h b/keyboards/rgbkb/sol3/rev1/rev1.h
index e80f8c298d..2ed720fcc3 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.h
+++ b/keyboards/rgbkb/sol3/rev1/rev1.h
@@ -11,57 +11,6 @@
#include "sol3.h"
-// clang-format off
-/* Blank ascii map to reuse, with labeled possible encoder positions, *rgb encoder only
-┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-│ │ │ │ │ │ │ E2 │ │ E5 │ │ │ │ │ │ │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│ │ │ │ │ │ │ E2 │ │ E5 │ │ │ │ │ │ │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│ │ │ │ E1 │ E1 │ │ E0* │ │ E3* │ │ E4 │ E4 │ │ │ │
-└──────┴──────┴──────┴──────┴──────┤ ├──────┤ ├──────┤ ├──────┴──────┴──────┴──────┴──────┘
- │ │ E0 │ │ E3 │ │
- └──────┴──────┘ └──────┴──────┘
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│ E0↑ │ E0↓ │ E1↑ │ E1↓ │ E2↑ │ E2↓ │ │ E3↑ │ E3↓ │ E4↑ │ E4↓ │ E5↑ │ E5↓ │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-┌──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┐
-│ │ │ │ │ │ │ │ │ │ │ │
-└──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┘
-*/
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47, \
- \
- E0L, E0R, E1L, E1R, E2L, E2R, E3L, E3R, E4L, E4R, E5L, E5R, \
- LT0, LT1, LT2, LSL, LSR, RT0, RT1, RT2, RSL, RSR \
-) \
-{ \
- /* Left Half */ \
- { L00, L01, L02, L03, L04, L05, L06, LT0 }, \
- { L10, L11, L12, L13, L14, L15, L16, LT1 }, \
- { L20, L21, L22, L23, L24, L25, L26, LT2 }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { E0L, E0R, E1L, E1R, E2L, E2R, LSL, LSR }, \
- /* Right Half */ \
- { R06, R05, R04, R03, R02, R01, R00, RT0 }, \
- { R16, R15, R14, R13, R12, R11, R10, RT1 }, \
- { R26, R25, R24, R23, R22, R21, R20, RT2 }, \
- { R36, R35, R34, R33, R32, R31, R30, KC_NO }, \
- { R47, R46, R45, R44, R43, R42, R41, R40 }, \
- { E3L, E3R, E4L, E4R, E5L, E5R, RSL, RSR } \
-}
-// clang-format on
-
// weak functions overridable by the user
void render_layer_status(void);
void render_leds_status(void);
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index f761d71be2..382b858f46 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -19,10 +19,8 @@ AUDIO_DRIVER = dac_additive
DYNAMIC_MACRO_ENABLE = yes
DIP_SWITCH_ENABLE = yes
-WS2812_DRIVER = pwm
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable the OLED Driver
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 327fe840c3..88951a1b44 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/config.h
@@ -17,22 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, D4, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D1
-
#define RGBLED_NUM 16 // Number of LEDs
/*
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 33b8334958..940df081c9 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -8,14 +8,94 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "F7", "F6", "D4", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
+ "ws2812": {
+ "pin": "D1"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"k00", "x":0.5, "y":0}, {"label":"k01", "x":1.5, "y":0}, {"label":"k02", "x":2.5, "y":0}, {"label":"k03", "x":3.5, "y":0}, {"label":"k04", "x":4.5, "y":0}, {"label":"k05", "x":5.5, "y":0}, {"label":"k55", "x":10.5, "y":0}, {"label":"k54", "x":11.5, "y":0}, {"label":"k53", "x":12.5, "y":0}, {"label":"k52", "x":13.5, "y":0}, {"label":"k51", "x":14.5, "y":0}, {"label":"k50", "x":15.5, "y":0}, {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k65", "x":10.5, "y":1}, {"label":"k64", "x":11.5, "y":1}, {"label":"k63", "x":12.5, "y":1}, {"label":"k62", "x":13.5, "y":1}, {"label":"k61", "x":14.5, "y":1}, {"label":"k60", "x":15.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.5}, {"label":"k21", "x":1.5, "y":2}, {"label":"k22", "x":2.5, "y":2}, {"label":"k23", "x":3.5, "y":2}, {"label":"k24", "x":4.5, "y":2}, {"label":"k25", "x":5.5, "y":2}, {"label":"k75", "x":10.5, "y":2}, {"label":"k74", "x":11.5, "y":2}, {"label":"k73", "x":12.5, "y":2}, {"label":"k72", "x":13.5, "y":2}, {"label":"k71", "x":14.5, "y":2}, {"label":"k70", "x":15.5, "y":2, "w":1.5}, {"label":"k30", "x":0, "y":3, "w":1.5}, {"label":"k31", "x":1.5, "y":3}, {"label":"k32", "x":2.5, "y":3}, {"label":"k33", "x":3.5, "y":3}, {"label":"k34", "x":4.5, "y":3}, {"label":"k35", "x":5.5, "y":3}, {"label":"k85", "x":10.5, "y":3}, {"label":"k84", "x":11.5, "y":3}, {"label":"k83", "x":12.5, "y":3}, {"label":"k82", "x":13.5, "y":3}, {"label":"k81", "x":14.5, "y":3}, {"label":"k80", "x":15.5, "y":3, "w":1.5}, {"label":"k40", "x":0, "y":4, "w":1.5}, {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4}, {"label":"k43", "x":3.5, "y":4}, {"label":"k44", "x":4.5, "y":4}, {"label":"k45", "x":6, "y":4.5, "h":2}, {"label":"k46", "x":7, "y":4.5, "h":2}, {"label":"k96", "x":9, "y":4.5, "h":2}, {"label":"k95", "x":10, "y":4.5, "h":2}, {"label":"k94", "x":11.5, "y":4}, {"label":"k93", "x":12.5, "y":4}, {"label":"k92", "x":13.5, "y":4}, {"label":"k91", "x":14.5, "y":4}, {"label":"k90", "x":15.5, "y":4, "w":1.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [5, 5], "x": 10.5, "y": 0},
+ {"matrix": [5, 4], "x": 11.5, "y": 0},
+ {"matrix": [5, 3], "x": 12.5, "y": 0},
+ {"matrix": [5, 2], "x": 13.5, "y": 0},
+ {"matrix": [5, 1], "x": 14.5, "y": 0},
+ {"matrix": [5, 0], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 5], "x": 10.5, "y": 1},
+ {"matrix": [6, 4], "x": 11.5, "y": 1},
+ {"matrix": [6, 3], "x": 12.5, "y": 1},
+ {"matrix": [6, 2], "x": 13.5, "y": 1},
+ {"matrix": [6, 1], "x": 14.5, "y": 1},
+ {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+ {"matrix": [7, 5], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 3], "x": 12.5, "y": 2},
+ {"matrix": [7, 2], "x": 13.5, "y": 2},
+ {"matrix": [7, 1], "x": 14.5, "y": 2},
+ {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+
+ {"matrix": [8, 5], "x": 10.5, "y": 3},
+ {"matrix": [8, 4], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 2], "x": 13.5, "y": 3},
+ {"matrix": [8, 1], "x": 14.5, "y": 3},
+ {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4.5, "h": 2},
+ {"matrix": [4, 6], "x": 7, "y": 4.5, "h": 2},
+
+ {"matrix": [9, 6], "x": 9, "y": 4.5, "h": 2},
+ {"matrix": [9, 5], "x": 10, "y": 4.5, "h": 2},
+ {"matrix": [9, 4], "x": 11.5, "y": 4},
+ {"matrix": [9, 3], "x": 12.5, "y": 4},
+ {"matrix": [9, 2], "x": 13.5, "y": 4},
+ {"matrix": [9, 1], "x": 14.5, "y": 4},
+ {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5}
+ ]
}
}
}
diff --git a/keyboards/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/rgbkb/zen/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/rgbkb/zen/rev1/rev1.h b/keyboards/rgbkb/zen/rev1/rev1.h
deleted file mode 100644
index 3b437c459c..0000000000
--- a/keyboards/rgbkb/zen/rev1/rev1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
- k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
- k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
- k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \
- k40, k41, k42, k43, k44, k45, k46, k96, k95, k94, k93, k92, k91, k90 \
- ) \
- { \
- { k00, k01, k02, k03, k04, k05, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, KC_NO }, \
- { k30, k31, k32, k33, k34, k35, KC_NO }, \
- { k40, k41, k42, k43, k44, k45, k46 }, \
- { k50, k51, k52, k53, k54, k55, KC_NO }, \
- { k60, k61, k62, k63, k64, k65, KC_NO }, \
- { k70, k71, k72, k73, k74, k75, KC_NO }, \
- { k80, k81, k82, k83, k84, k85, KC_NO }, \
- { k90, k91, k92, k93, k94, k95, k96 } \
- }
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 85b6a68b79..394fd1630b 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// Proton-C does pin conversion
-#define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B3, B1, B2 }
-
-#define RGB_DI_PIN B6
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index cc25a74b73..eed39e5628 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x3061",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"],
+ "rows": ["C6", "E6", "B5", "D7", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D4", "pin_b": "D2"}
@@ -16,359 +21,93 @@
"split": {
"soft_serial_pin": "D3"
},
+ "ws2812": {
+ "pin": "B6"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "k00",
- "x": 0.5,
- "y": 0
- },
- {
- "label": "k01",
- "x": 1.5,
- "y": 0
- },
- {
- "label": "k02",
- "x": 2.5,
- "y": 0
- },
- {
- "label": "k03",
- "x": 3.5,
- "y": 0
- },
- {
- "label": "k04",
- "x": 4.5,
- "y": 0
- },
- {
- "label": "k05",
- "x": 5.5,
- "y": 0
- },
- {
- "label": "k55",
- "x": 10.5,
- "y": 0
- },
- {
- "label": "k54",
- "x": 11.5,
- "y": 0
- },
- {
- "label": "k53",
- "x": 12.5,
- "y": 0
- },
- {
- "label": "k52",
- "x": 13.5,
- "y": 0
- },
- {
- "label": "k51",
- "x": 14.5,
- "y": 0
- },
- {
- "label": "k50",
- "x": 15.5,
- "y": 0
- },
- {
- "label": "k10",
- "x": 0,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "k11",
- "x": 1.5,
- "y": 1
- },
- {
- "label": "k12",
- "x": 2.5,
- "y": 1
- },
- {
- "label": "k13",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "k14",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "k15",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "k65",
- "x": 10.5,
- "y": 1
- },
- {
- "label": "k64",
- "x": 11.5,
- "y": 1
- },
- {
- "label": "k63",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "k62",
- "x": 13.5,
- "y": 1
- },
- {
- "label": "k61",
- "x": 14.5,
- "y": 1
- },
- {
- "label": "k60",
- "x": 15.5,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "k20",
- "x": 0,
- "y": 2,
- "w": 1.5
- },
- {
- "label": "k21",
- "x": 1.5,
- "y": 2
- },
- {
- "label": "k22",
- "x": 2.5,
- "y": 2
- },
- {
- "label": "k23",
- "x": 3.5,
- "y": 2
- },
- {
- "label": "k24",
- "x": 4.5,
- "y": 2
- },
- {
- "label": "k25",
- "x": 5.5,
- "y": 2
- },
- {
- "label": "k75",
- "x": 10.5,
- "y": 2
- },
- {
- "label": "k74",
- "x": 11.5,
- "y": 2
- },
- {
- "label": "k73",
- "x": 12.5,
- "y": 2
- },
- {
- "label": "k72",
- "x": 13.5,
- "y": 2
- },
- {
- "label": "k71",
- "x": 14.5,
- "y": 2
- },
- {
- "label": "k70",
- "x": 15.5,
- "y": 2,
- "w": 1.5
- },
- {
- "label": "k30",
- "x": 0,
- "y": 3,
- "w": 1.5
- },
- {
- "label": "k31",
- "x": 1.5,
- "y": 3
- },
- {
- "label": "k32",
- "x": 2.5,
- "y": 3
- },
- {
- "label": "k33",
- "x": 3.5,
- "y": 3
- },
- {
- "label": "k34",
- "x": 4.5,
- "y": 3
- },
- {
- "label": "k35",
- "x": 5.5,
- "y": 3
- },
- {
- "label": "k16",
- "x": 6.5,
- "y": 3
- },
- {
- "label": "k66",
- "x": 9.5,
- "y": 3
- },
- {
- "label": "k85",
- "x": 10.5,
- "y": 3
- },
- {
- "label": "k84",
- "x": 11.5,
- "y": 3
- },
- {
- "label": "k83",
- "x": 12.5,
- "y": 3
- },
- {
- "label": "k82",
- "x": 13.5,
- "y": 3
- },
- {
- "label": "k81",
- "x": 14.5,
- "y": 3
- },
- {
- "label": "k80",
- "x": 15.5,
- "y": 3,
- "w": 1.5
- },
- {
- "label": "k40",
- "x": 0,
- "y": 4,
- "w": 1.5
- },
- {
- "label": "k41",
- "x": 1.5,
- "y": 4
- },
- {
- "label": "k42",
- "x": 2.5,
- "y": 4
- },
- {
- "label": "k43",
- "x": 3.5,
- "y": 4
- },
- {
- "label": "k44",
- "x": 4.5,
- "y": 4
- },
- {
- "label": "k36",
- "x": 6,
- "y": 4.5
- },
- {
- "label": "k26",
- "x": 7,
- "y": 4.5
- },
- {
- "label": "k76",
- "x": 9,
- "y": 4.5
- },
- {
- "label": "k86",
- "x": 10,
- "y": 4.5
- },
- {
- "label": "k94",
- "x": 11.5,
- "y": 4
- },
- {
- "label": "k93",
- "x": 12.5,
- "y": 4
- },
- {
- "label": "k92",
- "x": 13.5,
- "y": 4
- },
- {
- "label": "k91",
- "x": 14.5,
- "y": 4
- },
- {
- "label": "k90",
- "x": 15.5,
- "y": 4,
- "w": 1.5
- },
- {
- "label": "k45",
- "x": 6,
- "y": 5.5
- },
- {
- "label": "k46",
- "x": 7,
- "y": 5.5
- },
- {
- "label": "k96",
- "x": 9,
- "y": 5.5
- },
- {
- "label": "k95",
- "x": 10,
- "y": 5.5
- }
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [5, 5], "x": 10.5, "y": 0},
+ {"matrix": [5, 4], "x": 11.5, "y": 0},
+ {"matrix": [5, 3], "x": 12.5, "y": 0},
+ {"matrix": [5, 2], "x": 13.5, "y": 0},
+ {"matrix": [5, 1], "x": 14.5, "y": 0},
+ {"matrix": [5, 0], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 5], "x": 10.5, "y": 1},
+ {"matrix": [6, 4], "x": 11.5, "y": 1},
+ {"matrix": [6, 3], "x": 12.5, "y": 1},
+ {"matrix": [6, 2], "x": 13.5, "y": 1},
+ {"matrix": [6, 1], "x": 14.5, "y": 1},
+ {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+ {"matrix": [7, 5], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 3], "x": 12.5, "y": 2},
+ {"matrix": [7, 2], "x": 13.5, "y": 2},
+ {"matrix": [7, 1], "x": 14.5, "y": 2},
+ {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [1, 6], "x": 6.5, "y": 3},
+
+ {"matrix": [6, 6], "x": 9.5, "y": 3},
+ {"matrix": [8, 5], "x": 10.5, "y": 3},
+ {"matrix": [8, 4], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 2], "x": 13.5, "y": 3},
+ {"matrix": [8, 1], "x": 14.5, "y": 3},
+ {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+
+ {"matrix": [3, 6], "x": 6, "y": 4.5},
+ {"matrix": [2, 6], "x": 7, "y": 4.5},
+ {"matrix": [7, 6], "x": 9, "y": 4.5},
+ {"matrix": [8, 6], "x": 10, "y": 4.5},
+
+ {"matrix": [9, 4], "x": 11.5, "y": 4},
+ {"matrix": [9, 3], "x": 12.5, "y": 4},
+ {"matrix": [9, 2], "x": 13.5, "y": 4},
+ {"matrix": [9, 1], "x": 14.5, "y": 4},
+ {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 5], "x": 6, "y": 5.5},
+ {"matrix": [4, 6], "x": 7, "y": 5.5},
+ {"matrix": [9, 6], "x": 9, "y": 5.5},
+ {"matrix": [9, 5], "x": 10, "y": 5.5}
]
}
}
diff --git a/keyboards/rgbkb/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c
index 70e5531673..4c308264d6 100644
--- a/keyboards/rgbkb/zen/rev2/rev2.c
+++ b/keyboards/rgbkb/zen/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
#include "split_util.h"
diff --git a/keyboards/rgbkb/zen/rev2/rev2.h b/keyboards/rgbkb/zen/rev2/rev2.h
deleted file mode 100644
index c7a06d1767..0000000000
--- a/keyboards/rgbkb/zen/rev2/rev2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \
- k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \
- k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \
- k30, k31, k32, k33, k34, k35, k16, k66, k85, k84, k83, k82, k81, k80, \
- k40, k41, k42, k43, k44, k36, k26, k76, k86, k94, k93, k92, k91, k90, \
- k45, k46, k96, k95 \
- ) \
- { \
- { k00, k01, k02, k03, k04, k05, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16 }, \
- { k20, k21, k22, k23, k24, k25, k26 }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, k44, k45, k46 }, \
- { k50, k51, k52, k53, k54, k55, KC_NO }, \
- { k60, k61, k62, k63, k64, k65, k66 }, \
- { k70, k71, k72, k73, k74, k75, k76 }, \
- { k80, k81, k82, k83, k84, k85, k86 }, \
- { k90, k91, k92, k93, k94, k95, k96 } \
- }
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index df9875ed47..022e361de1 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -21,15 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Select hand configuration */
#define EE_HANDS
-#define MATRIX_ROW_PINS { F1, F5, F7, B5, B4 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F6, C7, C6, B6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B7
#ifndef RGBLIGHT_SPLIT_ENABLE
#define RGBLED_NUM 30
#else
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index 7bf6fe4b0d..4be3dd61d3 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -8,6 +8,14 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F6", "C7", "C6", "B6", "D4"],
+ "rows": ["F1", "F5", "F7", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D7"}
@@ -16,21 +24,204 @@
"split": {
"soft_serial_pin": "D3"
},
+ "ws2812": {
+ "pin": "B7"
+ },
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"community_layouts": ["ortho_4x12", "ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
- "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":7, "y":0}, {"label":"7", "x":8, "y":0}, {"label":"8", "x":9, "y":0}, {"label":"9", "x":10, "y":0}, {"label":"0", "x":11, "y":0}, {"label":"BKSP", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":7, "y":1}, {"label":"U", "x":8, "y":1}, {"label":"I", "x":9, "y":1}, {"label":"O", "x":10, "y":1}, {"label":"P", "x":11, "y":1}, {"label":"\\|", "x":12, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":";:", "x":11, "y":2}, {"label":"'\"", "x":12, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":",<", "x":9, "y":3}, {"label":".>", "x":10, "y":3}, {"label":"/?", "x":11, "y":3}, {"label":"Enter", "x":12, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Super", "x":2, "y":4}, {"label":"RGB", "x":3, "y":4}, {"label":"&dArr;", "x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"label":"FN", "x":8, "y":4}, {"label":"Left", "x":9, "y":4}, {"label":"Down", "x":10, "y":4}, {"label":"Up", "x":11, "y":4}, {"label":"Right", "x":12, "y":4}]
+ "layout": [
+ {"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, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "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},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "y": 1},
+
+ {"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},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "y": 2},
+
+ {"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},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [9, 0], "x": 7, "y": 4},
+ {"matrix": [9, 1], "x": 8, "y": 4},
+ {"matrix": [9, 2], "x": 9, "y": 4},
+ {"matrix": [9, 3], "x": 10, "y": 4},
+ {"matrix": [9, 4], "x": 11, "y": 4},
+ {"matrix": [9, 5], "x": 12, "y": 4}
+ ]
},
"LAYOUT_ortho_4x12": {
- "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"\\|", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";:", "x":11, "y":1}, {"label":"'\"", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",<", "x":9, "y":2}, {"label":".>", "x":10, "y":2}, {"label":"/?", "x":11, "y":2}, {"label":"Enter", "x":12, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"Super", "x":2, "y":3}, {"label":"RGB", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"label":"FN", "x":8, "y":3}, {"label":"Left", "x":9, "y":3}, {"label":"Down", "x":10, "y":3}, {"label":"Up", "x":11, "y":3}, {"label":"Right", "x":12, "y":3}]
+ "layout": [
+ {"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, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "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},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "y": 1},
+
+ {"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},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "y": 2},
+
+ {"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},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3}
+ ]
},
"LAYOUT_ortho_5x6": {
- "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"label":"Super", "x":3, "y":4}, {"label":"&dArr;", "x":4, "y":4}, {"x":5, "y":4}]
+ "layout": [
+ {"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, "y": 0},
+ {"matrix": [0, 5], "x": 5, "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},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"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},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"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},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4}
+ ]
},
"LAYOUT_ortho_4x6": {
- "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}]
+ "layout": [
+ {"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, "y": 0},
+ {"matrix": [0, 5], "x": 5, "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},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"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},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"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},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c
index 1fb1716a09..7588ffc75f 100644
--- a/keyboards/rgbkb/zygomorph/rev1/rev1.c
+++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "zygomorph.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.h b/keyboards/rgbkb/zygomorph/rev1/rev1.h
deleted file mode 100644
index c667088d05..0000000000
--- a/keyboards/rgbkb/zygomorph/rev1/rev1.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include "zygomorph.h"
-#include "quantum.h"
-
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-#define LAYOUT_ortho_5x6( \
- L00, L01, L02, L03, L04, L05, \
- L10, L11, L12, L13, L14, L15, \
- L20, L21, L22, L23, L24, L25, \
- L30, L31, L32, L33, L34, L35, \
- L40, L41, L42, L43, L44, L45 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_ortho_5x12( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 } \
- }
-
-#define LAYOUT_ortho_4x6( \
- L00, L01, L02, L03, L04, L05, \
- L10, L11, L12, L13, L14, L15, \
- L20, L21, L22, L23, L24, L25, \
- L30, L31, L32, L33, L34, L35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_ortho_4x12( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
index e926ec7641..bc168c3983 100644
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ b/keyboards/rgbkb/zygomorph/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
diff --git a/keyboards/rgbkb/zygomorph/zygomorph.c b/keyboards/rgbkb/zygomorph/zygomorph.c
deleted file mode 100644
index 9f029813bc..0000000000
--- a/keyboards/rgbkb/zygomorph/zygomorph.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zygomorph.h"
diff --git a/keyboards/rgbkb/zygomorph/zygomorph.h b/keyboards/rgbkb/zygomorph/zygomorph.h
deleted file mode 100644
index 24198ed4c9..0000000000
--- a/keyboards/rgbkb/zygomorph/zygomorph.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "rev1.h"
-#include "quantum.h"