diff --git a/keyboards/deng/djam/djam.c b/keyboards/deng/djam/djam.c
deleted file mode 100644
index 3514ff050c..0000000000
--- a/keyboards/deng/djam/djam.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2022 Leo Deng (@myst729)
- *
- * 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 .
- */
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = {
- {
- /* Key Matrix to LED Index */
- { 17, 16, 15, NO_LED, NO_LED, 7, 6, 5 },
- { 21, 17, 16, 15, 7, 6, 5, 1 },
- { 19, 18, 13, 11, 9, 4, 3, NO_LED }
- },
- {
- /* LED Index to Physical Position */
- // Switch LEDs
- {224,14}, {224,24}, {224,33}, {212,57}, {192,57}, {192,38}, {172,38}, {152,38},
- {152,57}, {142,57}, {132,57}, {112,57}, {92,57}, {82,57}, {72,57},
- {72,38}, {52,38}, {32,38}, {32,57}, {12,57}, {0,33}, {0,24}, {0,14},
- // Underglow LEDs
- {0,0}, {92,0}, {132,0}, {224,0}, {222,64}, {172,64}, {72,64}, {2,64},
- },
- {
- /* LED Index to Flag */
- 2, 4, 2, 4, 4, 4, 4, 4,
- 2, 4, 2, 4, 2, 4, 2,
- 4, 4, 4, 4, 4, 2, 4, 2,
- 2, 2, 2, 2, 2, 2, 2, 2
- }
-};
-#endif
diff --git a/keyboards/deng/djam/keyboard.json b/keyboards/deng/djam/keyboard.json
index a39c234bfa..51b2f45ce7 100644
--- a/keyboards/deng/djam/keyboard.json
+++ b/keyboards/deng/djam/keyboard.json
@@ -15,7 +15,40 @@
"solid_reactive_multinexus": true,
"solid_multisplash": true
},
- "driver": "ws2812"
+ "driver": "ws2812",
+ "layout": [
+ {"x": 224, "y": 14, "flags": 2},
+ {"matrix": [1, 7], "x": 224, "y": 24, "flags": 4},
+ {"x": 224, "y": 33, "flags": 2},
+ {"matrix": [2, 6], "x": 212, "y": 57, "flags": 4},
+ {"matrix": [2, 5], "x": 192, "y": 57, "flags": 4},
+ {"matrix": [1, 6], "x": 192, "y": 38, "flags": 4},
+ {"matrix": [1, 5], "x": 172, "y": 38, "flags": 4},
+ {"matrix": [1, 4], "x": 152, "y": 38, "flags": 4},
+ {"x": 152, "y": 57, "flags": 2},
+ {"matrix": [2, 4], "x": 142, "y": 57, "flags": 4},
+ {"x": 132, "y": 57, "flags": 2},
+ {"matrix": [2, 3], "x": 112, "y": 57, "flags": 4},
+ {"x": 92, "y": 57, "flags": 2},
+ {"matrix": [2, 2], "x": 82, "y": 57, "flags": 4},
+ {"x": 72, "y": 57, "flags": 2},
+ {"matrix": [1, 3], "x": 72, "y": 38, "flags": 4},
+ {"matrix": [1, 2], "x": 52, "y": 38, "flags": 4},
+ {"matrix": [1, 1], "x": 32, "y": 38, "flags": 4},
+ {"matrix": [2, 1], "x": 32, "y": 57, "flags": 4},
+ {"matrix": [2, 0], "x": 12, "y": 57, "flags": 4},
+ {"x": 0, "y": 33, "flags": 2},
+ {"matrix": [1, 0], "x": 0, "y": 24, "flags": 4},
+ {"x": 0, "y": 14, "flags": 2},
+ {"x": 0, "y": 0, "flags": 2},
+ {"x": 92, "y": 0, "flags": 2},
+ {"x": 132, "y": 0, "flags": 2},
+ {"x": 224, "y": 0, "flags": 2},
+ {"x": 222, "y": 64, "flags": 2},
+ {"x": 172, "y": 64, "flags": 2},
+ {"x": 72, "y": 64, "flags": 2},
+ {"x": 2, "y": 64, "flags": 2}
+ ]
},
"features": {
"backlight": true,
diff --git a/keyboards/deng/thirty/keyboard.json b/keyboards/deng/thirty/keyboard.json
index da36ae19f5..394d7b427b 100644
--- a/keyboards/deng/thirty/keyboard.json
+++ b/keyboards/deng/thirty/keyboard.json
@@ -57,6 +57,38 @@
"animation": "cycle_all"
},
"driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 4, "y": 4, "flags": 4},
+ {"matrix": [0, 1], "x": 28, "y": 4, "flags": 4},
+ {"matrix": [0, 2], "x": 52, "y": 4, "flags": 4},
+ {"matrix": [0, 3], "x": 76, "y": 4, "flags": 4},
+ {"matrix": [0, 4], "x": 100, "y": 4, "flags": 4},
+ {"matrix": [1, 4], "x": 100, "y": 32, "flags": 4},
+ {"matrix": [1, 3], "x": 76, "y": 32, "flags": 4},
+ {"matrix": [1, 2], "x": 52, "y": 32, "flags": 4},
+ {"matrix": [1, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [1, 0], "x": 4, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 4, "y": 60, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 60, "flags": 4},
+ {"matrix": [2, 2], "x": 52, "y": 60, "flags": 4},
+ {"matrix": [2, 3], "x": 76, "y": 60, "flags": 4},
+ {"matrix": [2, 4], "x": 100, "y": 60, "flags": 4},
+ {"matrix": [5, 4], "x": 124, "y": 60, "flags": 4},
+ {"matrix": [5, 3], "x": 148, "y": 60, "flags": 4},
+ {"matrix": [5, 2], "x": 172, "y": 60, "flags": 4},
+ {"matrix": [5, 1], "x": 196, "y": 60, "flags": 4},
+ {"matrix": [5, 0], "x": 220, "y": 60, "flags": 4},
+ {"matrix": [4, 0], "x": 220, "y": 32, "flags": 4},
+ {"matrix": [4, 1], "x": 196, "y": 32, "flags": 4},
+ {"matrix": [4, 2], "x": 172, "y": 32, "flags": 4},
+ {"matrix": [4, 3], "x": 148, "y": 32, "flags": 4},
+ {"matrix": [4, 4], "x": 124, "y": 32, "flags": 4},
+ {"matrix": [3, 4], "x": 124, "y": 4, "flags": 4},
+ {"matrix": [3, 3], "x": 148, "y": 4, "flags": 4},
+ {"matrix": [3, 2], "x": 172, "y": 4, "flags": 4},
+ {"matrix": [3, 1], "x": 196, "y": 4, "flags": 4},
+ {"matrix": [3, 0], "x": 220, "y": 4, "flags": 4}
+ ],
"max_brightness": 200
},
"matrix_pins": {
diff --git a/keyboards/deng/thirty/thirty.c b/keyboards/deng/thirty/thirty.c
index 7d49bc1b03..ce7a76c703 100644
--- a/keyboards/deng/thirty/thirty.c
+++ b/keyboards/deng/thirty/thirty.c
@@ -15,38 +15,6 @@
*/
#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = {
- {
- /* Key Matrix to LED Index */
- { 0, 1, 2, 3, 4 },
- { 9, 8, 7, 6, 5 },
- { 10, 11, 12, 13, 14 },
- { 29, 28, 27, 26, 25 },
- { 20, 21, 22, 23, 24 },
- { 19, 18, 17, 16, 15 },
- },
- {
- /* LED Index to Physical Position */
- // Switch LEDs
- {4,4}, {28,4}, {52,4}, {76,4}, {100,4},
- {100,32}, {76,32}, {52,32}, {28,32}, {4,32},
- {4,60}, {28,60}, {52,60}, {76,60}, {100,60},
- {124,60}, {148,60}, {172,60}, {196,60}, {220,60},
- {220,32}, {196,32}, {172,32}, {148,32}, {124,32},
- {124,4}, {148,4}, {172,4}, {196,4}, {220,4},
- // Underglow LEDs
- },
- {
- /* LED Index to Flag */
- 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
-
void board_init(void) {
// Remap B11 AF to TIM2_CH4
AFIO->MAPR |= AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2;
diff --git a/keyboards/doro67/rgb/keyboard.json b/keyboards/doro67/rgb/keyboard.json
index de95db63d6..46f1d775ab 100644
--- a/keyboards/doro67/rgb/keyboard.json
+++ b/keyboards/doro67/rgb/keyboard.json
@@ -51,7 +51,76 @@
"solid_splash": true,
"solid_multisplash": true
},
- "driver": "ws2812"
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 202, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 7, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 127, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 206, "y": 16, "flags": 1},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [2, 0], "x": 11, "y": 32, "flags": 1},
+ {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 198, "y": 32, "flags": 1},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 18, "y": 48, "flags": 1},
+ {"matrix": [3, 2], "x": 30, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 45, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 60, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 75, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 90, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 105, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 120, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 135, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 150, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 165, "y": 48, "flags": 4},
+ {"matrix": [3, 12], "x": 191, "y": 48, "flags": 1},
+ {"matrix": [3, 13], "x": 210, "y": 48, "flags": 1},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 3, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 33, "y": 64, "flags": 1},
+ {"matrix": [4, 3], "x": 101, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 135, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 153, "y": 64, "flags": 1},
+ {"matrix": [4, 12], "x": 195, "y": 64, "flags": 1},
+ {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+ ]
},
"features": {
"bootmagic": true,
diff --git a/keyboards/doro67/rgb/rgb.c b/keyboards/doro67/rgb/rgb.c
deleted file mode 100644
index 280c1b6774..0000000000
--- a/keyboards/doro67/rgb/rgb.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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 .
- */
-#include "quantum.h"
-
-led_config_t g_led_config = { {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
- { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
- { 44, NO_LED, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 },
- { 58, 59, 60, 61, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 62, 63, NO_LED, 64, 65, 66 }
-}, {
- // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Ins
- { 0, 0 }, { 15, 0 }, { 30, 0 }, { 45, 0 }, { 60, 0 }, { 75, 0 }, { 90, 0 }, { 105, 0 }, { 120, 0 }, { 135, 0 }, { 150, 0 }, { 165, 0 }, { 180, 0 }, { 202, 0 }, { 225, 0 },
- // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], , Del
- { 7, 16 }, { 22, 16 }, { 37, 16 }, { 52, 16 }, { 67, 16 }, { 82, 16 }, { 97, 16 }, { 112, 16 }, { 127, 16 }, { 142, 16 }, { 157, 16 }, { 172, 16 }, { 187, 16 }, { 206, 16 }, { 225, 16 },
- // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter, Pgup
- { 11, 32 }, { 26, 32 }, { 41, 32 }, { 56, 32 }, { 71, 32 }, { 86, 32 }, { 101, 32 }, { 116, 32 }, { 131, 32 }, { 146, 32 }, { 161, 32 }, { 176, 32 }, { 198, 32 }, { 225, 32 },
- // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, Pgdn
- { 18, 48 }, { 30, 48 }, { 45, 48 }, { 60, 48 }, { 75, 48 }, { 90, 48 }, { 105, 48 }, { 120, 48 }, { 135, 48 }, { 150, 48 }, { 165, 48 }, { 191, 48 }, { 210, 48 }, { 225, 48 },
- // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
- { 3, 64 }, { 22, 64 }, { 33, 64 }, { 101, 64 }, { 135, 64 }, { 153, 64 }, { 195, 64 }, { 210, 64 }, { 225, 64 }
-}, {
- // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Ins
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], , Del
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter, Pgup
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, Pgdn
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
- // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
- 1, 1, 1, 4, 1, 1, 1, 1, 1
-} };
diff --git a/keyboards/dotmod/dymium65/dymium65.c b/keyboards/dotmod/dymium65/dymium65.c
index 45eaa0251c..fd3bab633e 100644
--- a/keyboards/dotmod/dymium65/dymium65.c
+++ b/keyboards/dotmod/dymium65/dymium65.c
@@ -18,30 +18,6 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = {
- {
- {0, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
- {NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, NO_LED, NO_LED},
- {28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, NO_LED, NO_LED},
- {29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED, 41, 14, 42},
- {55, NO_LED, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, NO_LED, 44, 43, NO_LED},
- {56, 57, 58, NO_LED, NO_LED, NO_LED, 59, NO_LED, NO_LED, 60, 61, NO_LED, 62, 63, 64, 65}
- }, {
- {14, 0}, {28, 0}, {42, 0}, {56, 0}, {70, 0}, {84, 0}, {98, 0}, {112, 0}, {126, 0}, {140, 0}, {154, 0}, {168, 0}, {182, 0},{196, 0},
- {224, 16},{196, 16},{182, 16},{168, 16},{154, 16},{140, 16},{126, 16},{112, 16}, {98, 16}, {84, 16}, {70, 16}, {56, 16}, {42, 16} ,{28, 16}, {14, 16},
- {14, 32}, {28, 32}, {42, 32}, {56, 32}, {70, 32}, {84, 32}, {98, 32}, {112, 32}, {126, 32}, {140, 32}, {154, 32}, {168, 32}, {196, 32}, {224, 32},
- {224, 48}, {196, 48},{168, 48},{154, 48},{140, 48},{126, 48},{112, 48}, {98, 48}, {84, 48}, {70, 48}, {56, 48}, {42, 48}, {14, 48},
- {14, 64}, {28, 64}, {42, 64}, {98, 64}, {140, 64}, {154, 64}, {168, 64}, {182, 64},{196, 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, 12, 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
- }
-};
-
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;
diff --git a/keyboards/dotmod/dymium65/keyboard.json b/keyboards/dotmod/dymium65/keyboard.json
index a76bc91cd6..8ef9587489 100644
--- a/keyboards/dotmod/dymium65/keyboard.json
+++ b/keyboards/dotmod/dymium65/keyboard.json
@@ -68,6 +68,74 @@
"solid_reactive_nexus": true,
"splash": true
},
+ "layout": [
+ {"matrix": [0, 0], "x": 14, "y": 0, "flags": 4},
+ {"matrix": [1, 1], "x": 28, "y": 0, "flags": 4},
+ {"matrix": [1, 2], "x": 42, "y": 0, "flags": 4},
+ {"matrix": [1, 3], "x": 56, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 70, "y": 0, "flags": 4},
+ {"matrix": [1, 5], "x": 84, "y": 0, "flags": 4},
+ {"matrix": [1, 6], "x": 98, "y": 0, "flags": 4},
+ {"matrix": [1, 7], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [1, 8], "x": 126, "y": 0, "flags": 4},
+ {"matrix": [1, 9], "x": 140, "y": 0, "flags": 4},
+ {"matrix": [1, 10], "x": 154, "y": 0, "flags": 4},
+ {"matrix": [1, 11], "x": 168, "y": 0, "flags": 4},
+ {"matrix": [1, 12], "x": 182, "y": 0, "flags": 4},
+ {"matrix": [1, 13], "x": 196, "y": 0, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [2, 13], "x": 196, "y": 16, "flags": 4},
+ {"matrix": [2, 12], "x": 182, "y": 16, "flags": 4},
+ {"matrix": [2, 11], "x": 168, "y": 16, "flags": 4},
+ {"matrix": [2, 10], "x": 154, "y": 16, "flags": 4},
+ {"matrix": [2, 9], "x": 140, "y": 16, "flags": 4},
+ {"matrix": [2, 8], "x": 126, "y": 16, "flags": 4},
+ {"matrix": [2, 7], "x": 112, "y": 16, "flags": 4},
+ {"matrix": [2, 6], "x": 98, "y": 16, "flags": 4},
+ {"matrix": [2, 5], "x": 84, "y": 16, "flags": 4},
+ {"matrix": [2, 4], "x": 70, "y": 16, "flags": 4},
+ {"matrix": [2, 3], "x": 56, "y": 16, "flags": 4},
+ {"matrix": [2, 2], "x": 42, "y": 16, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 16, "flags": 4},
+ {"matrix": [2, 0], "x": 14, "y": 16, "flags": 4},
+ {"matrix": [3, 0], "x": 14, "y": 32, "flags": 12},
+ {"matrix": [3, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [3, 2], "x": 42, "y": 32, "flags": 4},
+ {"matrix": [3, 3], "x": 56, "y": 32, "flags": 4},
+ {"matrix": [3, 4], "x": 70, "y": 32, "flags": 4},
+ {"matrix": [3, 5], "x": 84, "y": 32, "flags": 4},
+ {"matrix": [3, 6], "x": 98, "y": 32, "flags": 4},
+ {"matrix": [3, 7], "x": 112, "y": 32, "flags": 4},
+ {"matrix": [3, 8], "x": 126, "y": 32, "flags": 4},
+ {"matrix": [3, 9], "x": 140, "y": 32, "flags": 4},
+ {"matrix": [3, 10], "x": 154, "y": 32, "flags": 4},
+ {"matrix": [3, 11], "x": 168, "y": 32, "flags": 4},
+ {"matrix": [3, 13], "x": 196, "y": 32, "flags": 4},
+ {"matrix": [3, 15], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [4, 14], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [4, 13], "x": 196, "y": 48, "flags": 4},
+ {"matrix": [4, 11], "x": 168, "y": 48, "flags": 4},
+ {"matrix": [4, 10], "x": 154, "y": 48, "flags": 4},
+ {"matrix": [4, 9], "x": 140, "y": 48, "flags": 4},
+ {"matrix": [4, 8], "x": 126, "y": 48, "flags": 4},
+ {"matrix": [4, 7], "x": 112, "y": 48, "flags": 4},
+ {"matrix": [4, 6], "x": 98, "y": 48, "flags": 4},
+ {"matrix": [4, 5], "x": 84, "y": 48, "flags": 4},
+ {"matrix": [4, 4], "x": 70, "y": 48, "flags": 4},
+ {"matrix": [4, 3], "x": 56, "y": 48, "flags": 4},
+ {"matrix": [4, 2], "x": 42, "y": 48, "flags": 4},
+ {"matrix": [4, 0], "x": 14, "y": 48, "flags": 4},
+ {"matrix": [5, 0], "x": 14, "y": 64, "flags": 4},
+ {"matrix": [5, 1], "x": 28, "y": 64, "flags": 4},
+ {"matrix": [5, 2], "x": 42, "y": 64, "flags": 4},
+ {"matrix": [5, 6], "x": 98, "y": 64, "flags": 4},
+ {"matrix": [5, 9], "x": 140, "y": 64, "flags": 4},
+ {"matrix": [5, 10], "x": 154, "y": 64, "flags": 4},
+ {"matrix": [5, 12], "x": 168, "y": 64, "flags": 4},
+ {"matrix": [5, 13], "x": 182, "y": 64, "flags": 4},
+ {"matrix": [5, 14], "x": 196, "y": 64, "flags": 4},
+ {"matrix": [5, 15], "x": 224, "y": 64, "flags": 4}
+ ],
"max_brightness": 200,
"react_on_keyup": true
},
diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
deleted file mode 100644
index 35ae8eb018..0000000000
--- a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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 .
- */
-
-#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},
- {22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12 },
- {23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33},
- {41, 40, 39, NO_LED, 38, NO_LED, 37, 36, 35, 34, 11}
-}, {
- //LED Index to Physical Positon
- { 0, 0}, { 20, 0}, { 40, 0 }, { 61, 0 }, { 81, 0}, { 101, 0}, { 122, 0}, { 142, 0}, { 162, 0}, { 183, 0}, { 203, 0}, { 224, 0},
- {203, 21}, {183, 21}, {162,21 }, {142, 21}, {122,21}, { 101,21}, { 81 ,21}, { 61 ,21}, { 40 ,21}, { 20 ,21}, { 0 ,21},
- { 0, 42}, { 20, 42}, { 40,42 }, { 61, 42}, { 81,42}, { 101,42}, { 122,42}, { 142,42}, { 162,42}, { 183,42}, { 203,42},
- {203, 64}, {183, 64}, {162,64 }, {122, 64}, { 81,64}, { 40, 64}, { 20, 64}, { 0, 64},
-}, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 1, 1, 1, 1, 1,
-} };
-
-#endif
\ No newline at end of file
diff --git a/keyboards/dtisaac/dosa40rgb/keyboard.json b/keyboards/dtisaac/dosa40rgb/keyboard.json
index 4f5522947a..29a63e80f3 100644
--- a/keyboards/dtisaac/dosa40rgb/keyboard.json
+++ b/keyboards/dtisaac/dosa40rgb/keyboard.json
@@ -62,6 +62,50 @@
"animation": "cycle_pinwheel"
},
"driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 40, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 101, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 122, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 142, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 162, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 203, "y": 0, "flags": 4},
+ {"matrix": [3, 10], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 10], "x": 203, "y": 21, "flags": 1},
+ {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4},
+ {"matrix": [1, 8], "x": 162, "y": 21, "flags": 4},
+ {"matrix": [1, 7], "x": 142, "y": 21, "flags": 4},
+ {"matrix": [1, 6], "x": 122, "y": 21, "flags": 4},
+ {"matrix": [1, 5], "x": 101, "y": 21, "flags": 4},
+ {"matrix": [1, 4], "x": 81, "y": 21, "flags": 4},
+ {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 21, "flags": 4},
+ {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
+ {"matrix": [2, 0], "x": 0, "y": 42, "flags": 1},
+ {"matrix": [2, 1], "x": 20, "y": 42, "flags": 4},
+ {"matrix": [2, 2], "x": 40, "y": 42, "flags": 4},
+ {"matrix": [2, 3], "x": 61, "y": 42, "flags": 4},
+ {"matrix": [2, 4], "x": 81, "y": 42, "flags": 4},
+ {"matrix": [2, 5], "x": 101, "y": 42, "flags": 4},
+ {"matrix": [2, 6], "x": 122, "y": 42, "flags": 4},
+ {"matrix": [2, 7], "x": 142, "y": 42, "flags": 4},
+ {"matrix": [2, 8], "x": 162, "y": 42, "flags": 4},
+ {"matrix": [2, 9], "x": 183, "y": 42, "flags": 4},
+ {"matrix": [2, 10], "x": 203, "y": 42, "flags": 1},
+ {"matrix": [3, 9], "x": 203, "y": 64, "flags": 1},
+ {"matrix": [3, 8], "x": 183, "y": 64, "flags": 1},
+ {"matrix": [3, 7], "x": 162, "y": 64, "flags": 1},
+ {"matrix": [3, 6], "x": 122, "y": 64, "flags": 1},
+ {"matrix": [3, 4], "x": 81, "y": 64, "flags": 1},
+ {"matrix": [3, 2], "x": 40, "y": 64, "flags": 1},
+ {"matrix": [3, 1], "x": 20, "y": 64, "flags": 1},
+ {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1}
+ ],
"max_brightness": 150,
"react_on_keyup": true
},
diff --git a/keyboards/dumbpad/v3x/keyboard.json b/keyboards/dumbpad/v3x/keyboard.json
index 58b8da5b3a..0e1c5bc791 100644
--- a/keyboards/dumbpad/v3x/keyboard.json
+++ b/keyboards/dumbpad/v3x/keyboard.json
@@ -36,6 +36,24 @@
"solid_multisplash": true
},
"driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 149, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 224, "y": 21, "flags": 4},
+ {"matrix": [1, 3], "x": 149, "y": 21, "flags": 4},
+ {"matrix": [1, 2], "x": 75, "y": 21, "flags": 4},
+ {"matrix": [1, 1], "x": 0, "y": 21, "flags": 4},
+ {"matrix": [2, 1], "x": 0, "y": 43, "flags": 4},
+ {"matrix": [2, 2], "x": 75, "y": 43, "flags": 4},
+ {"matrix": [2, 3], "x": 149, "y": 43, "flags": 4},
+ {"matrix": [2, 4], "x": 224, "y": 43, "flags": 4},
+ {"matrix": [3, 4], "x": 224, "y": 64, "flags": 4},
+ {"matrix": [3, 3], "x": 149, "y": 64, "flags": 4},
+ {"matrix": [3, 2], "x": 75, "y": 64, "flags": 4},
+ {"matrix": [3, 1], "x": 0, "y": 64, "flags": 4}
+ ],
"timeout": 300000,
"sleep": true
},
diff --git a/keyboards/dumbpad/v3x/v3x.c b/keyboards/dumbpad/v3x/v3x.c
index 181e9d4a0d..ebc829d91a 100644
--- a/keyboards/dumbpad/v3x/v3x.c
+++ b/keyboards/dumbpad/v3x/v3x.c
@@ -16,36 +16,6 @@
#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = {{// Key Matrix to LED Index
- {NO_LED, 0, 1, 2, 3},
- {NO_LED, 7, 6, 5, 4},
- {NO_LED, 8, 9, 10, 11},
- {NO_LED, 15, 14, 13, 12}},
- {// LED Index to Physical Position
- {0, 0},
- {75, 0},
- {149, 0},
- {224, 0},
-
- {224, 21},
- {149, 21},
- {75, 21},
- {0, 21},
-
- {0, 43},
- {75, 43},
- {149, 43},
- {224, 43},
-
- {224, 64},
- {149, 64},
- {75, 64},
- {0, 64}},
- {// LED Index to Flag
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}};
-#endif
-
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
gpio_set_pin_output(LED_00);
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
index 5d08163109..a0f5126bf6 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 Don Kjer
+/* Copyright 2021 Don Kjer
*
* 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
@@ -116,27 +116,4 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{1, SW6_CS14, SW5_CS14, SW4_CS14}, // Down
{1, SW6_CS15, SW5_CS15, SW4_CS15} // Right
};
-
-led_config_t g_led_config = {{
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
- { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, NO_LED },
- { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, NO_LED },
- { 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, NO_LED, 58, 59, NO_LED },
- { 60, NO_LED, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, NO_LED },
- { 74, 75, 76, NO_LED, NO_LED, NO_LED, 77, NO_LED, NO_LED, 78, 79, 80, 81, 82, 83, NO_LED }
-}, {
- { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 208, 0 }, { 224, 0 }, { 240, 0 },
- { 0, 13 }, { 16, 13 }, { 32, 13 }, { 48, 13 }, { 64, 13 }, { 80, 13 }, { 96, 13 }, { 112, 13 }, { 128, 13 }, { 144, 13 }, { 160, 13 }, { 176, 13 }, { 192, 13 }, { 216, 13 }, { 240, 13 },
- { 4, 26 }, { 24, 26 }, { 40, 26 }, { 56, 26 }, { 72, 26 }, { 88, 26 }, { 104, 26 }, { 120, 26 }, { 136, 26 }, { 152, 26 }, { 168, 26 }, { 184, 26 }, { 200, 26 }, { 220, 26 }, { 240, 26 },
- { 6, 38 }, { 28, 38 }, { 44, 38 }, { 60, 38 }, { 76, 38 }, { 92, 38 }, { 108, 38 }, { 124, 38 }, { 140, 38 }, { 156, 38 }, { 172, 38 }, { 188, 38 }, { 214, 38 }, { 240, 38 },
- { 10, 51 }, { 36, 51 }, { 52, 51 }, { 68, 51 }, { 84, 51 }, { 100, 51 }, { 116, 51 }, { 132, 51 }, { 148, 51 }, { 164, 51 }, { 180, 51 }, { 202, 51 }, { 224, 51 }, { 240, 51 },
- { 2, 64 }, { 22, 64 }, { 42, 64 }, { 101, 64 }, { 160, 64 }, { 176, 64 }, { 192, 64 }, { 208, 64 }, { 224, 64 }, { 240, 64 }
-}, {
- 1, 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, 1, 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, 1, 4,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4,
- 1, 1, 1, 4, 1, 1, 1, 4, 4, 4
-}};
#endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/durgod/dgk6x/galaxy/keyboard.json b/keyboards/durgod/dgk6x/galaxy/keyboard.json
index 4f80ef9d51..7421f70481 100644
--- a/keyboards/durgod/dgk6x/galaxy/keyboard.json
+++ b/keyboards/durgod/dgk6x/galaxy/keyboard.json
@@ -13,6 +13,94 @@
"rows": ["A0", "A1", "A2", "A3", "A4", "A5"]
},
"diode_direction": "ROW2COL",
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 195, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 210, "y": 0, "flags": 4},
+ {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+ {"matrix": [1, 1], "x": 15, "y": 13, "flags": 4},
+ {"matrix": [1, 2], "x": 30, "y": 13, "flags": 4},
+ {"matrix": [1, 3], "x": 45, "y": 13, "flags": 4},
+ {"matrix": [1, 4], "x": 60, "y": 13, "flags": 4},
+ {"matrix": [1, 5], "x": 75, "y": 13, "flags": 4},
+ {"matrix": [1, 6], "x": 90, "y": 13, "flags": 4},
+ {"matrix": [1, 7], "x": 105, "y": 13, "flags": 4},
+ {"matrix": [1, 8], "x": 120, "y": 13, "flags": 4},
+ {"matrix": [1, 9], "x": 135, "y": 13, "flags": 4},
+ {"matrix": [1, 10], "x": 150, "y": 13, "flags": 4},
+ {"matrix": [1, 11], "x": 165, "y": 13, "flags": 4},
+ {"matrix": [1, 12], "x": 180, "y": 13, "flags": 4},
+ {"matrix": [1, 13], "x": 202, "y": 13, "flags": 1},
+ {"matrix": [1, 14], "x": 224, "y": 13, "flags": 4},
+ {"matrix": [2, 0], "x": 4, "y": 26, "flags": 4},
+ {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+ {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+ {"matrix": [2, 3], "x": 52, "y": 26, "flags": 4},
+ {"matrix": [2, 4], "x": 67, "y": 26, "flags": 4},
+ {"matrix": [2, 5], "x": 82, "y": 26, "flags": 4},
+ {"matrix": [2, 6], "x": 97, "y": 26, "flags": 4},
+ {"matrix": [2, 7], "x": 112, "y": 26, "flags": 4},
+ {"matrix": [2, 8], "x": 127, "y": 26, "flags": 4},
+ {"matrix": [2, 9], "x": 142, "y": 26, "flags": 4},
+ {"matrix": [2, 10], "x": 157, "y": 26, "flags": 4},
+ {"matrix": [2, 11], "x": 172, "y": 26, "flags": 4},
+ {"matrix": [2, 12], "x": 187, "y": 26, "flags": 4},
+ {"matrix": [2, 13], "x": 205, "y": 26, "flags": 4},
+ {"matrix": [2, 14], "x": 224, "y": 26, "flags": 4},
+ {"matrix": [3, 0], "x": 6, "y": 38, "flags": 4},
+ {"matrix": [3, 1], "x": 28, "y": 38, "flags": 4},
+ {"matrix": [3, 2], "x": 43, "y": 38, "flags": 4},
+ {"matrix": [3, 3], "x": 58, "y": 38, "flags": 4},
+ {"matrix": [3, 4], "x": 73, "y": 38, "flags": 4},
+ {"matrix": [3, 5], "x": 88, "y": 38, "flags": 4},
+ {"matrix": [3, 6], "x": 103, "y": 38, "flags": 4},
+ {"matrix": [3, 7], "x": 118, "y": 38, "flags": 4},
+ {"matrix": [3, 8], "x": 133, "y": 38, "flags": 4},
+ {"matrix": [3, 9], "x": 148, "y": 38, "flags": 4},
+ {"matrix": [3, 10], "x": 163, "y": 38, "flags": 4},
+ {"matrix": [3, 11], "x": 178, "y": 38, "flags": 4},
+ {"matrix": [3, 13], "x": 200, "y": 38, "flags": 1},
+ {"matrix": [3, 14], "x": 224, "y": 38, "flags": 4},
+ {"matrix": [4, 0], "x": 10, "y": 51, "flags": 1},
+ {"matrix": [4, 2], "x": 36, "y": 51, "flags": 4},
+ {"matrix": [4, 3], "x": 51, "y": 51, "flags": 4},
+ {"matrix": [4, 4], "x": 66, "y": 51, "flags": 4},
+ {"matrix": [4, 5], "x": 81, "y": 51, "flags": 4},
+ {"matrix": [4, 6], "x": 96, "y": 51, "flags": 4},
+ {"matrix": [4, 7], "x": 111, "y": 51, "flags": 4},
+ {"matrix": [4, 8], "x": 126, "y": 51, "flags": 4},
+ {"matrix": [4, 9], "x": 141, "y": 51, "flags": 4},
+ {"matrix": [4, 10], "x": 156, "y": 51, "flags": 4},
+ {"matrix": [4, 11], "x": 171, "y": 51, "flags": 4},
+ {"matrix": [4, 12], "x": 192, "y": 51, "flags": 1},
+ {"matrix": [4, 13], "x": 209, "y": 51, "flags": 4},
+ {"matrix": [4, 14], "x": 224, "y": 51, "flags": 4},
+ {"matrix": [5, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [5, 1], "x": 22, "y": 64, "flags": 1},
+ {"matrix": [5, 2], "x": 38, "y": 64, "flags": 1},
+ {"matrix": [5, 6], "x": 98, "y": 64, "flags": 4},
+ {"matrix": [5, 9], "x": 149, "y": 64, "flags": 1},
+ {"matrix": [5, 10], "x": 164, "y": 64, "flags": 1},
+ {"matrix": [5, 11], "x": 179, "y": 64, "flags": 1},
+ {"matrix": [5, 12], "x": 194, "y": 64, "flags": 4},
+ {"matrix": [5, 13], "x": 209, "y": 64, "flags": 4},
+ {"matrix": [5, 14], "x": 224, "y": 64, "flags": 4}
+ ]
+ },
"community_layouts": ["75_ansi"],
"layouts": {
"LAYOUT_75_ansi": {
diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
index d092310814..d62acf1bc3 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
+++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 Jessica Sullivan and Don Kjer
+/* Copyright 2021 Jessica Sullivan and Don Kjer
*
* 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
@@ -100,24 +100,4 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{1, SW3_CS14, SW2_CS14, SW1_CS14}, // DOWN
{1, SW3_CS15, SW2_CS15, SW1_CS15} // RIGHT
};
-
-led_config_t g_led_config = {{
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
- { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57 },
- { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 }
-}, {
- { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 216, 0 }, { 240, 0 },
- { 4, 16 }, { 24, 16 }, { 40, 16 }, { 56, 16 }, { 72, 16 }, { 88, 16 }, { 104, 16 }, { 120, 16 }, { 136, 16 }, { 152, 16 }, { 168, 16 }, { 184, 16 }, { 200, 16 }, { 220, 16 }, { 240, 16 },
- { 6, 32 }, { 28, 32 }, { 44, 32 }, { 60, 32 }, { 76, 32 }, { 92, 32 }, { 108, 32 }, { 124, 32 }, { 140, 32 }, { 156, 32 }, { 172, 32 }, { 188, 32 }, { 214, 32 }, { 240, 32 },
- { 10, 48 }, { 36, 48 }, { 52, 48 }, { 68, 48 }, { 84, 48 }, { 100, 48 }, { 116, 48 }, { 132, 48 }, { 148, 48 }, { 164, 48 }, { 180, 48 }, { 202, 48 }, { 224, 48 }, { 240, 48 },
- { 2, 64 }, { 22, 64 }, { 42, 64 }, { 101, 64 }, { 160, 64 }, { 176, 64 }, { 192, 64 }, { 208, 64 }, { 224, 64 }, { 240, 64 }
-}, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 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, 1, 4,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4,
- 1, 1, 1, 4, 1, 1, 1, 4, 4, 4
-}};
#endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/durgod/dgk6x/hades_ansi/keyboard.json b/keyboards/durgod/dgk6x/hades_ansi/keyboard.json
index 00cfcdc5f0..7a41352d20 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/keyboard.json
+++ b/keyboards/durgod/dgk6x/hades_ansi/keyboard.json
@@ -13,6 +13,78 @@
"rows": ["A0", "A1", "A2", "A3", "A4"]
},
"diode_direction": "ROW2COL",
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 202, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 127, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 205, "y": 16, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 43, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 58, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 73, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 88, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 103, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 118, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 133, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 148, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 163, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 178, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 200, "y": 32, "flags": 1},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 36, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 51, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 66, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 81, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 111, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 126, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 141, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 156, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 171, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 192, "y": 48, "flags": 1},
+ {"matrix": [3, 13], "x": 209, "y": 48, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 38, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 98, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 149, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 164, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 179, "y": 64, "flags": 1},
+ {"matrix": [4, 12], "x": 194, "y": 64, "flags": 4},
+ {"matrix": [4, 13], "x": 209, "y": 64, "flags": 4},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4}
+ ]
+ },
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
diff --git a/keyboards/durgod/dgk6x/venus/keyboard.json b/keyboards/durgod/dgk6x/venus/keyboard.json
index cc7b321e23..a32a5b1065 100644
--- a/keyboards/durgod/dgk6x/venus/keyboard.json
+++ b/keyboards/durgod/dgk6x/venus/keyboard.json
@@ -13,6 +13,71 @@
"rows": ["A0", "A1", "A2", "A3", "A4"]
},
"diode_direction": "ROW2COL",
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 220, "y": 16, "flags": 4},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 214, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 36, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 52, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 68, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 84, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 100, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 116, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 132, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 148, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 164, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 180, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 210, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 102, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 162, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 182, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 202, "y": 64, "flags": 1},
+ {"matrix": [4, 12], "x": 222, "y": 64, "flags": 1}
+ ]
+ },
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
index 5433266e3b..30735fc80e 100644
--- a/keyboards/durgod/dgk6x/venus/venus.c
+++ b/keyboards/durgod/dgk6x/venus/venus.c
@@ -92,24 +92,4 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{1, SW3_CS12, SW2_CS12, SW1_CS12}, // RCtrl/Fn2
{1, SW3_CS13, SW2_CS13, SW1_CS13}, // LEFT/RCtrl
};
-
-led_config_t g_led_config = { {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 },
- { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 },
- { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, NO_LED, 40 },
- { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NO_LED, NO_LED },
- { 53, 54, 55, NO_LED, NO_LED, 56, NO_LED, NO_LED, NO_LED, 57, 58, 59, 60, NO_LED }
-}, {
- { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 216, 0 },
- { 4, 16 }, { 24, 16 }, { 40, 16 }, { 56, 16 }, { 72, 16 }, { 88, 16 }, { 104, 16 }, { 120, 16 }, { 136, 16 }, { 152, 16 }, { 168, 16 }, { 184, 16 }, { 200, 16 }, { 220, 16 },
- { 6, 32 }, { 28, 32 }, { 44, 32 }, { 60, 32 }, { 76, 32 }, { 92, 32 }, { 108, 32 }, { 124, 32 }, { 140, 32 }, { 156, 32 }, { 172, 32 }, { 188, 32 }, { 214, 32 },
- { 10, 48 }, { 36, 48 }, { 52, 48 }, { 68, 48 }, { 84, 48 }, { 100, 48 }, { 116, 48 }, { 132, 48 }, { 148, 48 }, { 164, 48 }, { 180, 48 }, { 210, 48 },
- { 2, 64 }, { 22, 64 }, { 42, 64 }, { 102, 64 }, { 162, 64 }, { 182, 64 }, { 202, 64 }, { 222, 64 },
-}, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 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, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 4, 1, 1, 1, 1
-} };
#endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 207fccd4f9..e729f6d578 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -71,28 +71,6 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{ 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
-led_config_t g_led_config = {
- {
- { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
- { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
- { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 },
- { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, NO_LED, 41 },
- { 62, 61, 60, NO_LED, NO_LED, 59, NO_LED, NO_LED, 58, 57, 56, 55, NO_LED, 54 }
- }, {
- { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
- { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
- { 214, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
- { 224, 48 }, { 208, 48 }, { 186, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 36, 48 }, { 9, 48 },
- { 224, 64 }, { 208, 64 }, { 192, 64 }, { 176, 64 }, { 160, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 }
- }, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 1, 1, 4, 1, 1, 1
- }
-};
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
diff --git a/keyboards/dztech/dz60rgb/info.json b/keyboards/dztech/dz60rgb/info.json
index 1bcc77c605..c4f87c70f0 100644
--- a/keyboards/dztech/dz60rgb/info.json
+++ b/keyboards/dztech/dz60rgb/info.json
@@ -5,6 +5,73 @@
"usb": {
"vid": "0x445A"
},
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [1, 13], "x": 220, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [2, 13], "x": 214, "y": 32, "flags": 1},
+ {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
+ {"matrix": [3, 13], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [3, 11], "x": 208, "y": 48, "flags": 1},
+ {"matrix": [3, 10], "x": 186, "y": 48, "flags": 1},
+ {"matrix": [3, 9], "x": 164, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 148, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 132, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 116, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 100, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 84, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 68, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 52, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 36, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+ {"matrix": [4, 13], "x": 224, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 208, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 192, "y": 64, "flags": 1},
+ {"matrix": [4, 9], "x": 176, "y": 64, "flags": 1},
+ {"matrix": [4, 8], "x": 160, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 102, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index cdc5148e11..20dd1a8b95 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -69,28 +69,6 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{ 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
-led_config_t g_led_config = {
- {
- { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
- { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
- { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 },
- { 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, NO_LED },
- { 60, 59, 58, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, 56, 55, 54, NO_LED, 53 }
- }, {
- { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
- { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
- { 214, 24 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
- { 210, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 },
- { 222, 64 }, { 202, 64 }, { 182, 64 }, { 162, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 }
- }, {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 1, 4, 1, 1, 1
- }
-};
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
diff --git a/keyboards/dztech/dz60rgb_ansi/info.json b/keyboards/dztech/dz60rgb_ansi/info.json
index dddbd47315..b5f962b997 100644
--- a/keyboards/dztech/dz60rgb_ansi/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/info.json
@@ -5,6 +5,71 @@
"usb": {
"vid": "0x445A"
},
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 1},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 1},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 1},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 1},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 1},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 1},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 1},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 1},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [1, 13], "x": 220, "y": 16, "flags": 1},
+ {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [2, 13], "x": 214, "y": 24, "flags": 1},
+ {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
+ {"matrix": [3, 11], "x": 210, "y": 48, "flags": 1},
+ {"matrix": [3, 10], "x": 180, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 164, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 148, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 132, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 116, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 100, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 84, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 68, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 52, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+ {"matrix": [4, 13], "x": 222, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 202, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 182, "y": 64, "flags": 1},
+ {"matrix": [4, 9], "x": 162, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 102, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}
+ ]
+ },
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index b5af34be38..59cbb09a1b 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -70,28 +70,6 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{ 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
-led_config_t g_led_config = {
- {
- { 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 },
- { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 },
- { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 0, 29 },
- { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, NO_LED, 42 },
- { 61, 60, 59, NO_LED, NO_LED, 58, NO_LED, NO_LED, NO_LED, NO_LED, 57, 56, NO_LED, 55 }
- }, {
- { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
- { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
- { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
- { 224, 48 }, { 202, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 },
- { 218, 64 }, { 198, 64 }, { 178, 64 }, { 112, 64 }, { 46, 64 }, { 26, 64 }, { 6, 64 }
- }, {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 4, 1, 1, 1
- }
-};
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
diff --git a/keyboards/dztech/dz60rgb_wkl/info.json b/keyboards/dztech/dz60rgb_wkl/info.json
index a4dfb63c7a..d0d66d046c 100644
--- a/keyboards/dztech/dz60rgb_wkl/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/info.json
@@ -5,6 +5,72 @@
"usb": {
"vid": "0x445A"
},
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [2, 12], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [0, 13], "x": 208, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 1},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 1},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 1},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 1},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 1},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 1},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 1},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 1},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [1, 13], "x": 220, "y": 16, "flags": 1},
+ {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [2, 13], "x": 204, "y": 32, "flags": 1},
+ {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
+ {"matrix": [3, 13], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [3, 11], "x": 202, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 180, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 164, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 148, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 132, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 116, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 100, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 84, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 68, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 52, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+ {"matrix": [4, 13], "x": 218, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 198, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 178, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 112, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 46, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 26, "y": 64, "flags": 1},
+ {"matrix": [4, 0], "x": 6, "y": 64, "flags": 1}
+ ]
+ },
"community_layouts": ["60_ansi_tsangan_split_bs_rshift"],
"layout_aliases": {
"LAYOUT_HHKB": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
index e2512c72a5..788658bdce 100644
--- a/keyboards/dztech/dz64rgb/dz64rgb.c
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -88,29 +88,6 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{ 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
-led_config_t g_led_config = {
- {
- { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
- { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
- { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 },
- { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41 },
- { 63, 62, 61, NO_LED, NO_LED, 60, NO_LED, NO_LED, 59, 58, 57, 56, NO_LED, 55 }
- }, {
- { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
- { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
- { 214, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
- { 224, 48 }, { 218, 48 }, { 192, 48 }, { 176, 48 }, { 160, 48 }, { 144, 48 }, { 128, 48 }, { 112, 48 }, { 96, 48 },{80, 48}, { 64, 48 }, { 48, 48 }, { 32, 48 }, { 8, 48 },
- { 224, 64 }, { 208, 64 }, { 192, 64 }, { 176, 64 }, { 160, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 }
- }, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1
- }
-};
-
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
diff --git a/keyboards/dztech/dz64rgb/keyboard.json b/keyboards/dztech/dz64rgb/keyboard.json
index ef95b52400..926721a12e 100644
--- a/keyboards/dztech/dz64rgb/keyboard.json
+++ b/keyboards/dztech/dz64rgb/keyboard.json
@@ -40,6 +40,72 @@
"animation": "cycle_all"
},
"driver": "is31fl3733",
+ "layout": [
+ {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [1, 13], "x": 220, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [2, 13], "x": 214, "y": 32, "flags": 1},
+ {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
+ {"matrix": [3, 13], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [3, 12], "x": 218, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 192, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 176, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 160, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 144, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 128, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 112, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 80, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 48, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 32, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 8, "y": 48, "flags": 1},
+ {"matrix": [4, 13], "x": 224, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 208, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 192, "y": 64, "flags": 1},
+ {"matrix": [4, 9], "x": 176, "y": 64, "flags": 1},
+ {"matrix": [4, 8], "x": 160, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 102, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}
+ ],
"sleep": true
},
"matrix_pins": {
diff --git a/keyboards/dztech/dz65rgb/v1/keyboard.json b/keyboards/dztech/dz65rgb/v1/keyboard.json
index 32b830052d..cdbd9ae10d 100644
--- a/keyboards/dztech/dz65rgb/v1/keyboard.json
+++ b/keyboards/dztech/dz65rgb/v1/keyboard.json
@@ -39,6 +39,76 @@
"animation": "cycle_all"
},
"driver": "is31fl3731",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
+ {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 201, "y": 32, "flags": 4},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
+ {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 8], "x": 150, "y": 64, "flags": 1},
+ {"matrix": [4, 9], "x": 165, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 180, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 195, "y": 64, "flags": 1},
+ {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+ ],
"led_process_limit": 4,
"led_flush_limit": 26,
"max_brightness": 200,
diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c
index 6e8cf96e4c..e05e35b74b 100644
--- a/keyboards/dztech/dz65rgb/v1/v1.c
+++ b/keyboards/dztech/dz65rgb/v1/v1.c
@@ -91,29 +91,6 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{ 0, C9_16, C7_15, C6_15 }
};
-led_config_t g_led_config = {
- {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
- { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57 },
- { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64, 65, NO_LED, 66, 67 }
- }, {
- { 0, 0 }, { 15, 0 }, { 30, 0 }, { 45, 0 }, { 60, 0 }, { 75, 0 }, { 90, 0 }, { 105, 0 }, { 120, 0 }, { 135, 0 }, { 150, 0 }, { 165, 0 }, { 180, 0 }, { 203, 0 }, { 224, 0 },
- { 4, 16 }, { 23, 16 }, { 38, 16 }, { 53, 16 }, { 68, 16 }, { 83, 16 }, { 98, 16 }, { 113, 16 }, { 128, 16 }, { 143, 16 }, { 158, 16 }, { 173, 16 }, { 188, 16 }, { 206, 16 }, { 224, 16 },
- { 6, 32 }, { 26, 32 }, { 41, 32 }, { 56, 32 }, { 71, 32 }, { 86, 32 }, { 101, 32 }, { 116, 32 }, { 131, 32 }, { 146, 32 }, { 161, 32 }, { 176, 32 }, { 201, 32 }, { 224, 32 },
- { 9, 48 }, { 34, 48 }, { 49, 48 }, { 64, 48 }, { 79, 48 }, { 94, 48 }, { 109, 48 }, { 124, 48 }, { 139, 48 }, { 154, 48 }, { 169, 48 }, { 189, 48 }, { 210, 48 }, { 224, 48 },
- { 2, 64 }, { 21, 64 }, { 39, 64 }, { 96, 64 }, { 150, 64 }, { 165, 64 }, { 180, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 }
- }, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 4, 1, 1, 1, 1, 1, 1
- }
-};
-
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
diff --git a/keyboards/dztech/dz65rgb/v2/keyboard.json b/keyboards/dztech/dz65rgb/v2/keyboard.json
index bf7331e101..7c922bc273 100644
--- a/keyboards/dztech/dz65rgb/v2/keyboard.json
+++ b/keyboards/dztech/dz65rgb/v2/keyboard.json
@@ -39,6 +39,76 @@
"animation": "cycle_all"
},
"driver": "is31fl3731",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
+ {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 201, "y": 32, "flags": 4},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
+ {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 8], "x": 150, "y": 64, "flags": 1},
+ {"matrix": [4, 9], "x": 165, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 180, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 195, "y": 64, "flags": 1},
+ {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+ ],
"led_process_limit": 4,
"led_flush_limit": 26,
"max_brightness": 200,
diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c
index a9f7fc104f..2591a4ddcb 100644
--- a/keyboards/dztech/dz65rgb/v2/v2.c
+++ b/keyboards/dztech/dz65rgb/v2/v2.c
@@ -91,29 +91,6 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{ 0, C9_16, C7_15, C6_15 }
};
-led_config_t g_led_config = {
- {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
- { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57 },
- { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64, 65, NO_LED, 66, 67 }
- }, {
- { 0, 0 }, { 15, 0 }, { 30, 0 }, { 45, 0 }, { 60, 0 }, { 75, 0 }, { 90, 0 }, { 105, 0 }, { 120, 0 }, { 135, 0 }, { 150, 0 }, { 165, 0 }, { 180, 0 }, { 203, 0 }, { 224, 0 },
- { 4, 16 }, { 23, 16 }, { 38, 16 }, { 53, 16 }, { 68, 16 }, { 83, 16 }, { 98, 16 }, { 113, 16 }, { 128, 16 }, { 143, 16 }, { 158, 16 }, { 173, 16 }, { 188, 16 }, { 206, 16 }, { 224, 16 },
- { 6, 32 }, { 26, 32 }, { 41, 32 }, { 56, 32 }, { 71, 32 }, { 86, 32 }, { 101, 32 }, { 116, 32 }, { 131, 32 }, { 146, 32 }, { 161, 32 }, { 176, 32 }, { 201, 32 }, { 224, 32 },
- { 9, 48 }, { 34, 48 }, { 49, 48 }, { 64, 48 }, { 79, 48 }, { 94, 48 }, { 109, 48 }, { 124, 48 }, { 139, 48 }, { 154, 48 }, { 169, 48 }, { 189, 48 }, { 210, 48 }, { 224, 48 },
- { 2, 64 }, { 21, 64 }, { 39, 64 }, { 96, 64 }, { 150, 64 }, { 165, 64 }, { 180, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 }
- }, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 4, 1, 1, 1, 1, 1, 1
- }
-};
-
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
diff --git a/keyboards/dztech/dz65rgb/v3/keyboard.json b/keyboards/dztech/dz65rgb/v3/keyboard.json
index 8fef8b3468..6ed8b8c9da 100644
--- a/keyboards/dztech/dz65rgb/v3/keyboard.json
+++ b/keyboards/dztech/dz65rgb/v3/keyboard.json
@@ -53,6 +53,76 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
+ {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 201, "y": 32, "flags": 4},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
+ {"matrix": [3, 12], "x": 189, "y": 48, "flags": 4},
+ {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 150, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 165, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 180, "y": 64, "flags": 1},
+ {"matrix": [4, 12], "x": 195, "y": 64, "flags": 1},
+ {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+ ],
"led_process_limit": 4,
"led_flush_limit": 26,
"sleep": true
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index bf54a8cdfc..f5f863de9a 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -93,26 +93,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW7_CS39, SW7_CS38, SW7_CS37}
};
-led_config_t g_led_config = { {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
- { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, NO_LED,55, 56, 57 },
- { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 }
-}, {
- {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
- {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
- {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
- {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
- { 2, 64 }, { 21, 64 }, { 39, 64 }, { 96, 64 }, { 150, 64 }, { 165, 64 }, { 180, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 }
-}, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 4, 1, 1, 1, 1, 1, 1
-} };
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {