summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJack Sangdahl <jack@pngu.org>2025-09-09 03:03:52 -0600
committerGitHub <noreply@github.com>2025-09-09 10:03:52 +0100
commitc1b428bb4e4d2ecf4b904c8e4886d8e8e37602c7 (patch)
treedad21216d16f0013e9772fd9e13110522f592c21 /keyboards
parent0828fc4b6ff126b2466bd92110770ac412a1ad56 (diff)
Migrate `g_led_config` to DD (JK1) (#25601)
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/joshajohnson/hub20/hub20.c171
-rw-r--r--keyboards/joshajohnson/hub20/keyboard.json31
-rw-r--r--keyboards/junco/rev1/keyboard.json76
-rw-r--r--keyboards/junco/rev1/rev1.c103
-rw-r--r--keyboards/kapl/rev1/keyboard.json90
-rw-r--r--keyboards/kapl/rev1/rev1.c55
-rw-r--r--keyboards/kbdfans/baguette66/rgb/keyboard.json68
-rw-r--r--keyboards/kbdfans/baguette66/rgb/rgb.c20
-rw-r--r--keyboards/kbdfans/bella/rgb/keyboard.json96
-rw-r--r--keyboards/kbdfans/bella/rgb/rgb.c30
-rw-r--r--keyboards/kbdfans/bella/rgb_iso/keyboard.json97
-rw-r--r--keyboards/kbdfans/bella/rgb_iso/rgb_iso.c30
-rw-r--r--keyboards/kbdfans/boop65/rgb/keyboard.json85
-rw-r--r--keyboards/kbdfans/boop65/rgb/rgb.c23
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json69
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c4
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json69
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c21
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json69
-rwxr-xr-xkeyboards/kbdfans/kbd67/mkiirgb/v3/v3.c26
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json69
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c22
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json70
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c22
-rw-r--r--keyboards/kbdfans/kbd75rgb/kbd75rgb.c23
-rw-r--r--keyboards/kbdfans/kbd75rgb/keyboard.json86
-rw-r--r--keyboards/kbdfans/kbdmini/kbdmini.c19
-rw-r--r--keyboards/kbdfans/kbdmini/keyboard.json54
-rw-r--r--keyboards/kbdfans/maja/keyboard.json69
-rwxr-xr-xkeyboards/kbdfans/maja/maja.c20
-rw-r--r--keyboards/kbdfans/odin/rgb/keyboard.json106
-rw-r--r--keyboards/kbdfans/odin/rgb/rgb.c25
32 files changed, 1203 insertions, 615 deletions
diff --git a/keyboards/joshajohnson/hub20/hub20.c b/keyboards/joshajohnson/hub20/hub20.c
deleted file mode 100644
index 8b1c58e1f7..0000000000
--- a/keyboards/joshajohnson/hub20/hub20.c
+++ /dev/null
@@ -1,171 +0,0 @@
1/* Copyright 2020 joshajohnson 2021 peepeetee
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "quantum.h"
18
19
20#ifdef RGB_MATRIX_ENABLE
21led_config_t g_led_config = { {
22 // Key Matrix to LED Index
23 {NO_LED,NO_LED,NO_LED,NO_LED},
24 { 7, 8, 9, 10},
25 { 11, 12, 13, 14},
26 { 15, 16, 17, 18},
27 { 19, 20, 21, 22},
28 { 23, 24, 25, 26}
29 //todo: assign leds to keys differently for the different layouts
30}, {
31 // LED Index to Physical Position
32 { 190, 50}, { 111, 50}, { 35, 50}, {38, 0}, {38, 35}, {186, 35}, {186, 0}, // UNDERGLOW
33 //todo: underglow location needs to be recalculated. The top row is above row 4, and for now they have the same y value 0
34 { 0, 0}, {75, 0}, {150, 0}, {225, 0}, // row 4
35 { 0, 16}, {75, 16}, {150, 16}, {225, 16}, // row 3
36 { 0, 32}, {75, 32}, {150, 32}, {225, 32}, // row 2
37 { 0, 48}, {75, 48}, {150, 48}, {225, 48}, // row 1
38 { 0, 64}, {75, 64}, {150, 64}, {225, 64} // row 0
39
40}, {
41 // LED Index to Flag
42 LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, // UNDERGLOW
43 LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // row 4
44 LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // row 3
45 LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // row 2
46 LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // row 1
47 LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT // row 0
48
49} };
50#endif
51
52
53
54// #if LED_MERGE_NUMPAD_LEFT_HANDED_ENTER && LED_MERGE_NUMPAD_RIGHT_HANDED_ZERO
55// #error lower left enter conflicts with lower left zero
56// #endif
57
58// #if LED_MERGE_NUMPAD_RIGHT_HANDED_ENTER && LED_MERGE_NUMPAD_LEFT_HANDED_ZERO
59// #error lower right enter conflicts with lower right zero
60// #endif
61
62// /* LAYOUT_left_handed
63
64
65// * ┌───┬───┐
66// * │01 │02 │
67// * ┌───┼───┼───┼───┐
68// * │10 │11 │12 │13 │
69// * ├───┼───┼───┼───┤
70// * │ │21 │22 │23 │
71// * │20 ├───┼───┼───┤
72// * │ │31 │32 │33 │
73// * ├───┼───┼───┼───┤
74// * │ │41 │42 │43 │
75// * │40 ├───┼───┴───┤
76// * │ │51 │ 52 │
77// * └───┴───┴───────┘
78// */
79
80// #ifndef LED_MERGE_NUMPAD_LEFT_HANDED_PLUS //key 20
81// #define LED_MERGE_NUMPAD_LEFT_HANDED_PLUS FALSE
82// #endif // LED_MERGE_NUMPAD_LEFT_HANDED_PLUS
83
84// #ifndef LED_MERGE_NUMPAD_LEFT_HANDED_ENTER //key 40
85// #define LED_MERGE_NUMPAD_LEFT_HANDED_ENTER FALSE
86// #endif // LED_MERGE_NUMPAD_LEFT_HANDED_ENTER
87
88// #ifndef LED_MERGE_NUMPAD_LEFT_HANDED_ZERO //key 52
89// #define LED_MERGE_NUMPAD_LEFT_HANDED_ZERO FALSE
90// #endif // LED_MERGE_NUMPAD_LEFT_HANDED_ZERO
91
92
93// /* LAYOUT_right_handed
94
95
96// * ┌───┬───┐
97// * │01 │02 │
98// * ┌───┼───┼───┼───┐
99// * │10 │11 │12 │13 │
100// * ├───┼───┼───┼───┤
101// * │20 │21 │22 │ │
102// * ├───┼───┼───┤23 │
103// * │30 │31 │32 │ │
104// * ├───┼───┼───┼───┤
105// * │40 │41 │42 │ │
106// * ├───┴───┼───┤43 │
107// * │ 50 │52 │ │
108// * └───────┴───┴───┘
109// */
110// //LOCATION OF bottom row 0 NOT TESTED, WAITING ENDORSEMENT FROM MANUFACTURER
111
112// #ifndef LED_MERGE_NUMPAD_RIGHT_HANDED_PLUS // key 23
113// #define LED_MERGE_NUMPAD_RIGHT_HANDED_PLUS FALSE
114// #endif // LED_MERGE_NUMPAD_RIGHT_HANDED_PLUS
115
116// #ifndef LED_MERGE_NUMPAD_RIGHT_HANDED_ENTER // key 43
117// #define LED_MERGE_NUMPAD_RIGHT_HANDED_ENTER FALSE
118// #endif // LED_MERGE_NUMPAD_RIGHT_HANDED_ENTER
119
120// #ifndef LED_MERGE_NUMPAD_RIGHT_HANDED_ZERO // key 50 (confirm with manufacturer)
121// #define LED_MERGE_NUMPAD_RIGHT_HANDED_ZERO FALSE
122// #endif // LED_MERGE_NUMPAD_RIGHT_HANDED_ZERO
123
124// uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
125// // Keys here have 2 leds. Here we add the led that is not bound to the key
126// // and the default led would be added
127// // by the default code that runs after this in rgb_matrix_map_row_column_to_led
128
129// uint8_t counter = 0;
130
131// #if LED_MERGE_NUMPAD_LEFT_HANDED_PLUS //key 20, leds 7 and 11, 7 already bound
132
133// if (row == 2 && column == 0) {
134// led_i[counter] = 11;
135// counter ++;
136// }
137// #endif
138// #if LED_MERGE_NUMPAD_LEFT_HANDED_ENTER //key 40, leds 19 and 23, 23 already bound
139// if (row == 4 && column == 0) {
140// led_i[counter] = 23;
141// counter ++;
142// }
143// #endif
144// #if LED_MERGE_NUMPAD_LEFT_HANDED_ZERO //key 52, leds 25 and 26, 26 already bound
145// if (row == 5 && column == 2) {
146// led_i[counter] = 26;
147// counter ++;
148// }
149// #endif
150
151// #if LED_MERGE_NUMPAD_RIGHT_HANDED_PLUS // key 23, led 14 and 18, 14 already bound
152// if (row == 2 && column == 3) {
153// led_i[counter] = 18;
154// counter ++;
155// }
156// #endif
157// #if LED_MERGE_NUMPAD_RIGHT_HANDED_ENTER // key 43, led 22 and 26, 22 already bound
158// if (row == 4 && column == 3) {
159// led_i[counter] = 26;
160// counter ++;
161// }
162// #endif
163// #if LED_MERGE_NUMPAD_RIGHT_HANDED_ZERO // key 50 (confirm with manufacturer)
164// // LED 23 and 24, 23(?) already bound
165// if (row == 5 && column == 0) {
166// led_i[counter] = 24;
167// counter ++;
168// }
169// #endif
170// return counter;
171// }
diff --git a/keyboards/joshajohnson/hub20/keyboard.json b/keyboards/joshajohnson/hub20/keyboard.json
index 0d557c58b5..c26a25de3c 100644
--- a/keyboards/joshajohnson/hub20/keyboard.json
+++ b/keyboards/joshajohnson/hub20/keyboard.json
@@ -28,7 +28,36 @@
28 "solid_reactive_simple": true, 28 "solid_reactive_simple": true,
29 "solid_reactive": true 29 "solid_reactive": true
30 }, 30 },
31 "driver": "ws2812" 31 "driver": "ws2812",
32 "layout": [
33 {"x": 190, "y": 50, "flags": 2},
34 {"x": 111, "y": 50, "flags": 2},
35 {"x": 35, "y": 50, "flags": 2},
36 {"x": 38, "y": 0, "flags": 2},
37 {"x": 38, "y": 35, "flags": 2},
38 {"x": 186, "y": 35, "flags": 2},
39 {"x": 186, "y": 0, "flags": 2},
40 {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
41 {"matrix": [1, 1], "x": 75, "y": 0, "flags": 4},
42 {"matrix": [1, 2], "x": 150, "y": 0, "flags": 4},
43 {"matrix": [1, 3], "x": 224, "y": 0, "flags": 4},
44 {"matrix": [2, 0], "x": 0, "y": 16, "flags": 4},
45 {"matrix": [2, 1], "x": 75, "y": 16, "flags": 4},
46 {"matrix": [2, 2], "x": 150, "y": 16, "flags": 4},
47 {"matrix": [2, 3], "x": 224, "y": 16, "flags": 4},
48 {"matrix": [3, 0], "x": 0, "y": 32, "flags": 4},
49 {"matrix": [3, 1], "x": 75, "y": 32, "flags": 4},
50 {"matrix": [3, 2], "x": 150, "y": 32, "flags": 4},
51 {"matrix": [3, 3], "x": 224, "y": 32, "flags": 4},
52 {"matrix": [4, 0], "x": 0, "y": 48, "flags": 4},
53 {"matrix": [4, 1], "x": 75, "y": 48, "flags": 4},
54 {"matrix": [4, 2], "x": 150, "y": 48, "flags": 4},
55 {"matrix": [4, 3], "x": 224, "y": 48, "flags": 4},
56 {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
57 {"matrix": [5, 1], "x": 75, "y": 64, "flags": 4},
58 {"matrix": [5, 2], "x": 150, "y": 64, "flags": 4},
59 {"matrix": [5, 3], "x": 224, "y": 64, "flags": 4}
60 ]
32 }, 61 },
33 "features": { 62 "features": {
34 "bootmagic": true, 63 "bootmagic": true,
diff --git a/keyboards/junco/rev1/keyboard.json b/keyboards/junco/rev1/keyboard.json
index 936a0bf29c..1ec680aa3a 100644
--- a/keyboards/junco/rev1/keyboard.json
+++ b/keyboards/junco/rev1/keyboard.json
@@ -22,6 +22,82 @@
22 }, 22 },
23 "rgb_matrix": { 23 "rgb_matrix": {
24 "driver": "ws2812", 24 "driver": "ws2812",
25 "layout": [
26 {"x": 95, "y": 64, "flags": 2},
27 {"x": 52, "y": 64, "flags": 2},
28 {"x": 86, "y": 40, "flags": 2},
29 {"x": 52, "y": 40, "flags": 2},
30 {"x": 9, "y": 40, "flags": 2},
31 {"x": 9, "y": 8, "flags": 2},
32 {"x": 52, "y": 8, "flags": 2},
33 {"x": 86, "y": 8, "flags": 2},
34 {"matrix": [0, 5], "x": 86, "y": 0, "flags": 4},
35 {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
36 {"matrix": [0, 3], "x": 52, "y": 0, "flags": 4},
37 {"matrix": [0, 2], "x": 34, "y": 0, "flags": 4},
38 {"matrix": [0, 1], "x": 17, "y": 0, "flags": 4},
39 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
40 {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
41 {"matrix": [1, 1], "x": 17, "y": 16, "flags": 4},
42 {"matrix": [1, 2], "x": 34, "y": 16, "flags": 4},
43 {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
44 {"matrix": [1, 4], "x": 69, "y": 16, "flags": 4},
45 {"matrix": [1, 5], "x": 86, "y": 16, "flags": 4},
46 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
47 {"matrix": [2, 4], "x": 69, "y": 32, "flags": 4},
48 {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
49 {"matrix": [2, 2], "x": 34, "y": 32, "flags": 4},
50 {"matrix": [2, 1], "x": 17, "y": 32, "flags": 4},
51 {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
52 {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
53 {"matrix": [3, 1], "x": 17, "y": 48, "flags": 4},
54 {"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
55 {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
56 {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
57 {"matrix": [3, 5], "x": 86, "y": 48, "flags": 4},
58 {"matrix": [4, 4], "x": 103, "y": 64, "flags": 4},
59 {"matrix": [4, 3], "x": 86, "y": 64, "flags": 4},
60 {"matrix": [4, 2], "x": 69, "y": 64, "flags": 4},
61 {"matrix": [4, 1], "x": 52, "y": 64, "flags": 4},
62 {"matrix": [4, 0], "x": 34, "y": 64, "flags": 4},
63 {"x": 129, "y": 64, "flags": 2},
64 {"x": 172, "y": 64, "flags": 2},
65 {"x": 138, "y": 40, "flags": 2},
66 {"x": 172, "y": 40, "flags": 2},
67 {"x": 215, "y": 40, "flags": 2},
68 {"x": 215, "y": 8, "flags": 2},
69 {"x": 172, "y": 8, "flags": 2},
70 {"x": 138, "y": 8, "flags": 2},
71 {"matrix": [5, 5], "x": 138, "y": 0, "flags": 4},
72 {"matrix": [5, 4], "x": 155, "y": 0, "flags": 4},
73 {"matrix": [5, 3], "x": 172, "y": 0, "flags": 4},
74 {"matrix": [5, 2], "x": 190, "y": 0, "flags": 4},
75 {"matrix": [5, 1], "x": 207, "y": 0, "flags": 4},
76 {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4},
77 {"matrix": [6, 0], "x": 224, "y": 16, "flags": 4},
78 {"matrix": [6, 1], "x": 207, "y": 16, "flags": 4},
79 {"matrix": [6, 2], "x": 190, "y": 16, "flags": 4},
80 {"matrix": [6, 3], "x": 172, "y": 16, "flags": 4},
81 {"matrix": [6, 4], "x": 155, "y": 16, "flags": 4},
82 {"matrix": [6, 5], "x": 138, "y": 16, "flags": 4},
83 {"matrix": [7, 5], "x": 138, "y": 32, "flags": 4},
84 {"matrix": [7, 4], "x": 155, "y": 32, "flags": 4},
85 {"matrix": [7, 3], "x": 172, "y": 32, "flags": 4},
86 {"matrix": [7, 2], "x": 190, "y": 32, "flags": 4},
87 {"matrix": [7, 1], "x": 207, "y": 32, "flags": 4},
88 {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
89 {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4},
90 {"matrix": [8, 1], "x": 207, "y": 48, "flags": 4},
91 {"matrix": [8, 2], "x": 190, "y": 48, "flags": 4},
92 {"matrix": [8, 3], "x": 172, "y": 48, "flags": 4},
93 {"matrix": [8, 4], "x": 155, "y": 48, "flags": 4},
94 {"matrix": [8, 5], "x": 138, "y": 48, "flags": 4},
95 {"matrix": [9, 4], "x": 121, "y": 64, "flags": 4},
96 {"matrix": [9, 3], "x": 138, "y": 64, "flags": 4},
97 {"matrix": [9, 2], "x": 155, "y": 64, "flags": 4},
98 {"matrix": [9, 1], "x": 172, "y": 64, "flags": 4},
99 {"matrix": [9, 0], "x": 190, "y": 64, "flags": 4}
100 ],
25 "split_count": [37, 37] 101 "split_count": [37, 37]
26 }, 102 },
27 "encoder": { 103 "encoder": {
diff --git a/keyboards/junco/rev1/rev1.c b/keyboards/junco/rev1/rev1.c
index d1346b82e2..0167a095ad 100644
--- a/keyboards/junco/rev1/rev1.c
+++ b/keyboards/junco/rev1/rev1.c
@@ -21,106 +21,3 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
21 {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}} 21 {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}}
22}; 22};
23#endif 23#endif
24
25/* RGB LED matrix */
26#ifdef RGB_MATRIX_ENABLE
27/*
28 Key Matrix Physical
29 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05,
30 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15,
31 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25,
32 L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35,
33 L40, L41, L42, L43, L44, R42, R41, R43, R44, R45
34
35 Key Electrical
36 Left:
37 { L00, L01, L02, L03, L04, L05 },
38 { L10, L11, L12, L13, L14, L15 },
39 { L20, L21, L22, L23, L24, L25 },
40 { L30, L31, L32, L33, L34, L35 },
41 { L40, L41, L42, L43, L44, L45 },
42 Right:
43 { R05, R04, R03, R02, R01, R00 },
44 { R15, R14, R13, R12, R11, R10 },
45 { R25, R24, R23, R22, R21, R20 },
46 { R35, R34, R33, R32, R31, R30 },
47 { R45, R44, R43, R42, R41, R40 }
48
49 Key matrix physical filled with LED electrical indexes, count starting at 1
50
51 Col
52 0 1 2 3 4 5 6 7 8 9 10 11 12 13 Row
53
54 14 13 12 11 10 9 46 47 48 49 50 51 0
55 6 7 8 45 44 43
56 15 16 17 18 19 20 57 56 55 54 53 52 1
57
58 26 25 24 23 22 21 58 59 60 61 62 63 2
59 5 4 3 40 41 42
60 27 28 29 30 31 32 NO NO 69 68 67 66 65 64 3
61
62 37 36 35 34 33 70 71 72 73 74 4
63 2 1 38 39
64*/
65
66// clang-format off
67led_config_t g_led_config = {
68 { // Key Electrical Matrix to LED Index (count start at 0, so 8 is the first non-underglow key)
69
70 // Left Half
71 { 13, 12, 11, 10, 9, 8 },
72 { 14, 15, 16, 17, 18, 19 },
73 { 25, 24, 23, 22, 21, 20 },
74 { 26, 27, 28, 29, 30, 31 },
75 { 36, 35, 34, 33, 32, NO_LED },
76
77 // Right Half
78 { 50, 49, 48, 47, 46, 45 },
79 { 51, 52, 53, 54, 55, 56 },
80 { 62, 61, 60, 59, 58, 57 },
81 { 63, 64, 65, 66, 67, 68 },
82 { 73, 72, 71, 70, 69, NO_LED }
83 },
84 { // LED Index to LED Physical Position (mirrored on right half)
85
86 // Left Underglow (indicies 1 - 8)
87 { 95, 72 }, { 52, 72 }, { 86, 40 }, { 52, 40 }, { 9, 40 }, { 9, 8 }, { 52, 8 }, { 86, 8 },
88 // Left Matrix (indicies 9 - 37)
89 { 86, 0 }, { 69, 0 }, { 52, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 },
90 { 0, 16 }, { 17, 16 }, { 34, 16 }, { 52, 16 }, { 69, 16 }, { 86, 16 },
91 { 86, 32 }, { 69, 32 }, { 52, 32 }, { 34, 32 }, { 17, 32 }, { 0, 32 },
92 { 0, 48 }, { 17, 48 }, { 34, 48 }, { 52, 48 }, { 69, 48 }, { 86, 48 }, /* No Led */
93 { 103, 64 }, { 86, 64 }, { 69, 64 }, { 52, 64 }, { 34, 64 },
94
95 // Right Underglow (indicies 38 - 45)
96 { 129, 72 }, { 172, 72 }, { 138, 40 }, { 172, 40 }, { 215, 40 }, { 215, 8 }, { 172, 8 }, { 138, 8 },
97 // Right Matrix (indicies 46 - 74)
98 { 138, 0 }, { 155, 0 }, { 172, 0 }, { 190, 0 }, { 207, 0 }, { 224, 0 },
99 { 224, 16 }, { 207, 16 }, { 190, 16 }, { 172, 16 }, { 155, 16 }, { 138, 16 },
100 { 138, 32 }, { 155, 32 }, { 172, 32 }, { 190, 32 }, { 207, 32 }, { 224, 32 },
101 /* No Led */ { 224, 48 }, { 207, 48 }, { 190, 48 }, { 172, 48 }, { 155, 48 }, { 138, 48 },
102 { 121, 64 }, { 138, 64 }, { 155, 64 }, { 172, 64 }, { 190, 64 }
103 },
104 { // LED Index to Flag (2 - Underglow, 4 - Key Backlight)
105
106 // Left Underglow
107 2, 2, 2, 2, 2, 2, 2, 2,
108 // Left Matrix
109 4, 4, 4, 4, 4, 4,
110 4, 4, 4, 4, 4, 4,
111 4, 4, 4, 4, 4, 4,
112 4, 4, 4, 4, 4, 4,
113 4, 4, 4, 4, 4,
114
115 // Right Underglow
116 2, 2, 2, 2, 2, 2, 2, 2,
117 // Right Matrix
118 4, 4, 4, 4, 4, 4,
119 4, 4, 4, 4, 4, 4,
120 4, 4, 4, 4, 4, 4,
121 4, 4, 4, 4, 4, 4,
122 4, 4, 4, 4, 4
123 }
124};
125
126#endif
diff --git a/keyboards/kapl/rev1/keyboard.json b/keyboards/kapl/rev1/keyboard.json
index 843847d8fe..9354a5e4fe 100644
--- a/keyboards/kapl/rev1/keyboard.json
+++ b/keyboards/kapl/rev1/keyboard.json
@@ -35,6 +35,96 @@
35 "solid_multisplash": true 35 "solid_multisplash": true
36 }, 36 },
37 "driver": "ws2812", 37 "driver": "ws2812",
38 "layout": [
39 {"x": 96, "y": 57, "flags": 2},
40 {"x": 112, "y": 44, "flags": 2},
41 {"x": 112, "y": 19, "flags": 2},
42 {"x": 80, "y": 19, "flags": 2},
43 {"x": 48, "y": 19, "flags": 2},
44 {"x": 16, "y": 19, "flags": 2},
45 {"x": 16, "y": 57, "flags": 2},
46 {"x": 48, "y": 57, "flags": 2},
47 {"x": 80, "y": 57, "flags": 2},
48 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
49 {"matrix": [0, 1], "x": 17, "y": 0, "flags": 4},
50 {"matrix": [0, 2], "x": 34, "y": 0, "flags": 4},
51 {"matrix": [0, 3], "x": 52, "y": 0, "flags": 4},
52 {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
53 {"matrix": [0, 5], "x": 86, "y": 0, "flags": 4},
54 {"matrix": [0, 6], "x": 103, "y": 0, "flags": 1},
55 {"matrix": [1, 6], "x": 103, "y": 16, "flags": 1},
56 {"matrix": [1, 5], "x": 86, "y": 16, "flags": 4},
57 {"matrix": [1, 4], "x": 69, "y": 16, "flags": 4},
58 {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
59 {"matrix": [1, 2], "x": 34, "y": 16, "flags": 4},
60 {"matrix": [1, 1], "x": 17, "y": 16, "flags": 4},
61 {"matrix": [1, 0], "x": 0, "y": 16, "flags": 1},
62 {"matrix": [2, 0], "x": 0, "y": 32, "flags": 1},
63 {"matrix": [2, 1], "x": 17, "y": 32, "flags": 4},
64 {"matrix": [2, 2], "x": 34, "y": 32, "flags": 4},
65 {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
66 {"matrix": [2, 4], "x": 69, "y": 32, "flags": 4},
67 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
68 {"matrix": [2, 6], "x": 103, "y": 32, "flags": 1},
69 {"matrix": [3, 6], "x": 103, "y": 48, "flags": 1},
70 {"matrix": [3, 5], "x": 86, "y": 48, "flags": 4},
71 {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
72 {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
73 {"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
74 {"matrix": [3, 1], "x": 17, "y": 48, "flags": 4},
75 {"matrix": [3, 0], "x": 0, "y": 48, "flags": 1},
76 {"matrix": [4, 0], "x": 0, "y": 64, "flags": 1},
77 {"matrix": [4, 1], "x": 17, "y": 64, "flags": 1},
78 {"matrix": [4, 2], "x": 34, "y": 64, "flags": 1},
79 {"matrix": [4, 3], "x": 52, "y": 64, "flags": 1},
80 {"matrix": [4, 4], "x": 69, "y": 64, "flags": 1},
81 {"matrix": [4, 5], "x": 86, "y": 64, "flags": 1},
82 {"matrix": [4, 6], "x": 103, "y": 64, "flags": 1},
83 {"x": 144, "y": 57, "flags": 2},
84 {"x": 128, "y": 44, "flags": 2},
85 {"x": 128, "y": 19, "flags": 2},
86 {"x": 160, "y": 19, "flags": 2},
87 {"x": 192, "y": 19, "flags": 2},
88 {"x": 224, "y": 19, "flags": 2},
89 {"x": 224, "y": 57, "flags": 2},
90 {"x": 192, "y": 57, "flags": 2},
91 {"x": 160, "y": 57, "flags": 2},
92 {"matrix": [5, 0], "x": 224, "y": 0, "flags": 1},
93 {"matrix": [5, 1], "x": 207, "y": 0, "flags": 4},
94 {"matrix": [5, 2], "x": 190, "y": 0, "flags": 4},
95 {"matrix": [5, 3], "x": 172, "y": 0, "flags": 4},
96 {"matrix": [5, 4], "x": 155, "y": 0, "flags": 4},
97 {"matrix": [5, 5], "x": 138, "y": 0, "flags": 4},
98 {"matrix": [5, 6], "x": 121, "y": 0, "flags": 1},
99 {"matrix": [6, 6], "x": 121, "y": 16, "flags": 1},
100 {"matrix": [6, 5], "x": 138, "y": 16, "flags": 4},
101 {"matrix": [6, 4], "x": 155, "y": 16, "flags": 4},
102 {"matrix": [6, 3], "x": 172, "y": 16, "flags": 4},
103 {"matrix": [6, 2], "x": 190, "y": 16, "flags": 4},
104 {"matrix": [6, 1], "x": 207, "y": 16, "flags": 4},
105 {"matrix": [6, 0], "x": 224, "y": 16, "flags": 1},
106 {"matrix": [7, 0], "x": 224, "y": 32, "flags": 1},
107 {"matrix": [7, 1], "x": 207, "y": 32, "flags": 4},
108 {"matrix": [7, 2], "x": 190, "y": 32, "flags": 4},
109 {"matrix": [7, 3], "x": 172, "y": 32, "flags": 4},
110 {"matrix": [7, 4], "x": 155, "y": 32, "flags": 4},
111 {"matrix": [7, 5], "x": 138, "y": 32, "flags": 4},
112 {"matrix": [7, 6], "x": 121, "y": 32, "flags": 1},
113 {"matrix": [8, 6], "x": 121, "y": 48, "flags": 1},
114 {"matrix": [8, 5], "x": 138, "y": 48, "flags": 4},
115 {"matrix": [8, 4], "x": 155, "y": 48, "flags": 4},
116 {"matrix": [8, 3], "x": 172, "y": 48, "flags": 4},
117 {"matrix": [8, 2], "x": 190, "y": 48, "flags": 4},
118 {"matrix": [8, 1], "x": 207, "y": 48, "flags": 4},
119 {"matrix": [8, 0], "x": 224, "y": 48, "flags": 1},
120 {"matrix": [9, 0], "x": 224, "y": 64, "flags": 1},
121 {"matrix": [9, 1], "x": 207, "y": 64, "flags": 1},
122 {"matrix": [9, 2], "x": 190, "y": 64, "flags": 1},
123 {"matrix": [9, 3], "x": 172, "y": 64, "flags": 1},
124 {"matrix": [9, 4], "x": 155, "y": 64, "flags": 1},
125 {"matrix": [9, 5], "x": 138, "y": 64, "flags": 1},
126 {"matrix": [9, 6], "x": 121, "y": 64, "flags": 1}
127 ],
38 "max_brightness": 120, 128 "max_brightness": 120,
39 "speed_steps": 10, 129 "speed_steps": 10,
40 "split_count": [44, 44] 130 "split_count": [44, 44]
diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c
deleted file mode 100644
index fd3b9289dc..0000000000
--- a/keyboards/kapl/rev1/rev1.c
+++ /dev/null
@@ -1,55 +0,0 @@
1// Copyright 2022 Alexander Lozyuk (@keyzog)
2// SPDX-License-Identifier: GPL-2.0-or-later
3#include "quantum.h"
4
5#ifdef RGB_MATRIX_ENABLE
6led_config_t g_led_config = { {
7 // Left Hand
8 // { 8, 7, 6, 5, 4, 3, 2, 1, 0 }, // underglow
9 { 9, 10, 11, 12, 13, 14, 15 },
10 { 22, 21, 20, 19, 18, 17, 16 },
11 { 23, 24, 25, 26, 27, 28, 29 },
12 { 36, 35, 34, 33, 32, 31, 30 },
13 { 37, 38, 39, 40, 41, 42, 43 },
14
15 // Right Hand
16 // { 44, 45, 46, 47, 48, 49, 50, 51, 52 }, // underglow
17 { 53, 54, 55, 56, 57, 58, 59 },
18 { 66, 65, 64, 63, 62, 61, 60 },
19 { 67, 68, 69, 70, 71, 72, 73 },
20 { 80, 79, 78, 77, 76, 75, 74 },
21 { 81, 82, 83, 84, 85, 86, 87 }
22}, {
23 // Left Hand
24 {96, 57}, {112, 44}, {112, 19}, {80, 19}, {48, 19}, {16, 19}, {16, 57}, {48, 57}, {80, 57}, // underglow
25 {0, 0}, {17, 0}, {34, 0}, {52, 0}, {69, 0}, {86, 0}, {103, 0},
26 {103, 16}, {86, 16}, {69, 16}, {52, 16}, {34, 16}, {17, 16}, {0, 16},
27 {0, 32}, {17, 32}, {34, 32}, {52, 32}, {69, 32}, {86, 32}, {103, 32},
28 {103, 48}, {86, 48}, {69, 48}, {52, 48}, {34, 48}, {17, 48}, {0, 48},
29 {0, 64}, {17, 64}, {34, 64}, {52, 64}, {69, 64}, {86, 64}, {103, 64},
30
31 // Right Hand
32 {144, 57}, {128, 44}, {128, 19}, {160, 19}, {192, 19}, {224, 19}, {224, 57}, {192, 57}, {160, 57}, // underglow
33 {224, 0}, {207, 0}, {190, 0}, {172, 0}, {155, 0}, {138, 0}, {121, 0},
34 {121, 16}, {138, 16}, {155, 16}, {172, 16}, {190, 16}, {207, 16}, {224, 16},
35 {224, 32}, {207, 32}, {190, 32}, {172, 32}, {155, 32}, {138, 32}, {121, 32},
36 {121, 48}, {138, 48}, {155, 48}, {172, 48}, {190, 48}, {207, 48}, {224, 48},
37 {224, 64}, {207, 64}, {190, 64}, {172, 64}, {155, 64}, {138, 64}, {121, 64}
38}, {
39 // Left Hand
40 2, 2, 2, 2, 2, 2, 2, 2, 2, // underglow
41 1, 4, 4, 4, 4, 4, 1,
42 1, 4, 4, 4, 4, 4, 1,
43 1, 4, 4, 4, 4, 4, 1,
44 1, 4, 4, 4, 4, 4, 1,
45 1, 1, 1, 1, 1, 1, 1,
46
47 // Right Hand
48 2, 2, 2, 2, 2, 2, 2, 2, 2, // underglow
49 1, 4, 4, 4, 4, 4, 1,
50 1, 4, 4, 4, 4, 4, 1,
51 1, 4, 4, 4, 4, 4, 1,
52 1, 4, 4, 4, 4, 4, 1,
53 1, 1, 1, 1, 1, 1, 1
54} };
55#endif
diff --git a/keyboards/kbdfans/baguette66/rgb/keyboard.json b/keyboards/kbdfans/baguette66/rgb/keyboard.json
index 5955add028..77103382bd 100644
--- a/keyboards/kbdfans/baguette66/rgb/keyboard.json
+++ b/keyboards/kbdfans/baguette66/rgb/keyboard.json
@@ -58,6 +58,74 @@
58 "animation": "cycle_all" 58 "animation": "cycle_all"
59 }, 59 },
60 "driver": "ws2812", 60 "driver": "ws2812",
61 "layout": [
62 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
63 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
64 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
65 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
66 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
67 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
68 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
69 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
70 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
71 {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
72 {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
73 {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
74 {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
75 {"matrix": [0, 13], "x": 195, "y": 0, "flags": 4},
76 {"matrix": [2, 14], "x": 210, "y": 0, "flags": 4},
77 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
78 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
79 {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
80 {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
81 {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
82 {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
83 {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
84 {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
85 {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
86 {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
87 {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
88 {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
89 {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
90 {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
91 {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
92 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
93 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
94 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
95 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
96 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
97 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
98 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
99 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
100 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
101 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
102 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
103 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
104 {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
105 {"matrix": [2, 12], "x": 201, "y": 32, "flags": 4},
106 {"matrix": [3, 13], "x": 220, "y": 48, "flags": 1},
107 {"matrix": [3, 12], "x": 205, "y": 48, "flags": 4},
108 {"matrix": [3, 11], "x": 187, "y": 48, "flags": 4},
109 {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
110 {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
111 {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
112 {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
113 {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
114 {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
115 {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
116 {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
117 {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
118 {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
119 {"matrix": [3, 0], "x": 9, "y": 48, "flags": 4},
120 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 4},
121 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 4},
122 {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
123 {"matrix": [4, 8], "x": 152, "y": 64, "flags": 4},
124 {"matrix": [4, 10], "x": 171, "y": 64, "flags": 4},
125 {"matrix": [4, 12], "x": 195, "y": 64, "flags": 1},
126 {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
127 {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
128 ],
61 "max_brightness": 150, 129 "max_brightness": 150,
62 "sat_steps": 8, 130 "sat_steps": 8,
63 "sleep": true, 131 "sleep": true,
diff --git a/keyboards/kbdfans/baguette66/rgb/rgb.c b/keyboards/kbdfans/baguette66/rgb/rgb.c
index 8e1dbc5bcd..379597b58e 100644
--- a/keyboards/kbdfans/baguette66/rgb/rgb.c
+++ b/keyboards/kbdfans/baguette66/rgb/rgb.c
@@ -17,26 +17,6 @@
17#include "quantum.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20led_config_t g_led_config = { {
21 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15 },
22 { 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16 },
23 { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,NO_LED, 14 },
24 { 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, NO_LED},
25 { NO_LED, 58, 59, NO_LED, NO_LED, 60, NO_LED, NO_LED, 61, NO_LED, 62, NO_LED, 63, 64, 65 }
26}, {
27 {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},{195,0}, {210,0},{224,0},
28 {224,16}, {206,16},{188,16},{173,16},{158,16},{143,16},{128,16},{113,16},{98,16},{83,16},{68,16},{53,16},{38,16},{23,16},{4,16},
29 {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},
30 {220,48},{205,48},{187,48},{169,48},{154,48},{139,48},{124,48},{109,48},{94,48},{79,48},{64,48},{49,48},{34,48},{9,48},
31 {21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
32}, {
33 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
34 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
35 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
36 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
37 4, 4, 4, 4, 4, 1, 1, 1
38} };
39
40bool rgb_matrix_indicators_kb(void) { 20bool rgb_matrix_indicators_kb(void) {
41 if (!rgb_matrix_indicators_user()) { 21 if (!rgb_matrix_indicators_user()) {
42 return false; 22 return false;
diff --git a/keyboards/kbdfans/bella/rgb/keyboard.json b/keyboards/kbdfans/bella/rgb/keyboard.json
index 2ca18d2851..7bbc5ea7a2 100644
--- a/keyboards/kbdfans/bella/rgb/keyboard.json
+++ b/keyboards/kbdfans/bella/rgb/keyboard.json
@@ -54,6 +54,102 @@
54 "animation": "cycle_all" 54 "animation": "cycle_all"
55 }, 55 },
56 "driver": "is31fl3741", 56 "driver": "is31fl3741",
57 "layout": [
58 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
59 {"matrix": [0, 2], "x": 29, "y": 0, "flags": 1},
60 {"matrix": [0, 3], "x": 44, "y": 0, "flags": 1},
61 {"matrix": [0, 4], "x": 59, "y": 0, "flags": 1},
62 {"matrix": [0, 5], "x": 73, "y": 0, "flags": 1},
63 {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
64 {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
65 {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
66 {"matrix": [0, 9], "x": 140, "y": 0, "flags": 1},
67 {"matrix": [0, 11], "x": 161, "y": 0, "flags": 1},
68 {"matrix": [0, 12], "x": 176, "y": 0, "flags": 1},
69 {"matrix": [0, 13], "x": 191, "y": 0, "flags": 1},
70 {"matrix": [0, 14], "x": 206, "y": 0, "flags": 1},
71 {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
72 {"matrix": [1, 0], "x": 0, "y": 17, "flags": 4},
73 {"matrix": [1, 1], "x": 15, "y": 17, "flags": 4},
74 {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
75 {"matrix": [1, 3], "x": 44, "y": 17, "flags": 4},
76 {"matrix": [1, 4], "x": 59, "y": 17, "flags": 4},
77 {"matrix": [1, 5], "x": 73, "y": 17, "flags": 4},
78 {"matrix": [1, 6], "x": 88, "y": 17, "flags": 4},
79 {"matrix": [1, 7], "x": 102, "y": 17, "flags": 4},
80 {"matrix": [1, 8], "x": 117, "y": 17, "flags": 4},
81 {"matrix": [1, 9], "x": 132, "y": 17, "flags": 4},
82 {"matrix": [1, 10], "x": 147, "y": 17, "flags": 4},
83 {"matrix": [1, 11], "x": 161, "y": 17, "flags": 4},
84 {"matrix": [1, 12], "x": 176, "y": 17, "flags": 4},
85 {"matrix": [1, 14], "x": 198, "y": 17, "flags": 4},
86 {"matrix": [1, 15], "x": 224, "y": 17, "flags": 4},
87 {"matrix": [2, 0], "x": 4, "y": 29, "flags": 4},
88 {"matrix": [2, 1], "x": 22, "y": 29, "flags": 4},
89 {"matrix": [2, 2], "x": 37, "y": 29, "flags": 4},
90 {"matrix": [2, 3], "x": 51, "y": 29, "flags": 4},
91 {"matrix": [2, 4], "x": 66, "y": 29, "flags": 4},
92 {"matrix": [2, 5], "x": 81, "y": 29, "flags": 4},
93 {"matrix": [2, 6], "x": 95, "y": 29, "flags": 4},
94 {"matrix": [2, 7], "x": 110, "y": 29, "flags": 4},
95 {"matrix": [2, 8], "x": 125, "y": 29, "flags": 4},
96 {"matrix": [2, 9], "x": 140, "y": 29, "flags": 4},
97 {"matrix": [2, 10], "x": 154, "y": 29, "flags": 4},
98 {"matrix": [2, 11], "x": 169, "y": 29, "flags": 4},
99 {"matrix": [2, 12], "x": 184, "y": 29, "flags": 4},
100 {"matrix": [2, 13], "x": 202, "y": 29, "flags": 4},
101 {"matrix": [2, 15], "x": 224, "y": 29, "flags": 4},
102 {"matrix": [3, 0], "x": 5, "y": 41, "flags": 4},
103 {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4},
104 {"matrix": [3, 2], "x": 40, "y": 41, "flags": 4},
105 {"matrix": [3, 3], "x": 55, "y": 41, "flags": 4},
106 {"matrix": [3, 4], "x": 70, "y": 41, "flags": 4},
107 {"matrix": [3, 5], "x": 84, "y": 41, "flags": 4},
108 {"matrix": [3, 6], "x": 99, "y": 41, "flags": 4},
109 {"matrix": [3, 7], "x": 114, "y": 41, "flags": 4},
110 {"matrix": [3, 8], "x": 129, "y": 41, "flags": 4},
111 {"matrix": [3, 9], "x": 143, "y": 41, "flags": 4},
112 {"matrix": [3, 10], "x": 158, "y": 41, "flags": 4},
113 {"matrix": [3, 11], "x": 172, "y": 41, "flags": 4},
114 {"matrix": [3, 13], "x": 196, "y": 41, "flags": 4},
115 {"matrix": [3, 15], "x": 224, "y": 41, "flags": 4},
116 {"matrix": [4, 0], "x": 9, "y": 52, "flags": 4},
117 {"matrix": [4, 2], "x": 33, "y": 52, "flags": 4},
118 {"matrix": [4, 3], "x": 48, "y": 52, "flags": 4},
119 {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
120 {"matrix": [4, 5], "x": 77, "y": 52, "flags": 4},
121 {"matrix": [4, 6], "x": 92, "y": 52, "flags": 4},
122 {"matrix": [4, 7], "x": 106, "y": 52, "flags": 4},
123 {"matrix": [4, 8], "x": 121, "y": 52, "flags": 4},
124 {"matrix": [4, 9], "x": 136, "y": 52, "flags": 4},
125 {"matrix": [4, 10], "x": 150, "y": 52, "flags": 4},
126 {"matrix": [4, 11], "x": 165, "y": 52, "flags": 4},
127 {"matrix": [4, 12], "x": 185, "y": 52, "flags": 4},
128 {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
129 {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4},
130 {"matrix": [5, 1], "x": 20, "y": 64, "flags": 4},
131 {"matrix": [5, 2], "x": 38, "y": 64, "flags": 4},
132 {"matrix": [5, 6], "x": 94, "y": 64, "flags": 4},
133 {"matrix": [5, 10], "x": 150, "y": 64, "flags": 4},
134 {"matrix": [5, 11], "x": 172, "y": 64, "flags": 4},
135 {"matrix": [5, 12], "x": 195, "y": 64, "flags": 1},
136 {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
137 {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1},
138 {"x": 0, "y": 0, "flags": 2},
139 {"x": 45, "y": 0, "flags": 2},
140 {"x": 90, "y": 0, "flags": 2},
141 {"x": 134, "y": 0, "flags": 2},
142 {"x": 179, "y": 0, "flags": 2},
143 {"x": 224, "y": 0, "flags": 2},
144 {"x": 0, "y": 32, "flags": 2},
145 {"x": 224, "y": 32, "flags": 2},
146 {"x": 0, "y": 64, "flags": 2},
147 {"x": 45, "y": 64, "flags": 2},
148 {"x": 90, "y": 64, "flags": 2},
149 {"x": 134, "y": 64, "flags": 2},
150 {"x": 179, "y": 64, "flags": 2},
151 {"x": 224, "y": 64, "flags": 2}
152 ],
57 "led_flush_limit": 26, 153 "led_flush_limit": 26,
58 "led_process_limit": 4, 154 "led_process_limit": 4,
59 "sleep": true 155 "sleep": true
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index 4818c99005..2dd792c5bc 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -118,36 +118,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
118 {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */ 118 {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */
119}; 119};
120 120
121led_config_t g_led_config = {
122 {
123 /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15*/
124 { 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, NO_LED, 9, 10, 11, 12, 13, }, /* R0 */
125 { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, NO_LED, 27, 28, }, /* R1 */
126 { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43, }, /* R2 */
127 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, NO_LED, 57, }, /* R3 */
128 { 58, NO_LED, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, NO_LED, 70, NO_LED, }, /* R4 */
129 { 71, 72, 73, NO_LED, NO_LED, NO_LED, 74, NO_LED, NO_LED, NO_LED, 75, 76, 77, NO_LED, 78, 79, }, /* R5 */
130 }, {
131 {0, 0}, {29, 0}, {44, 0}, {59, 0}, {73, 0}, {95, 0}, {110, 0}, {125, 0}, {140, 0}, {161, 0}, {176, 0}, {191, 0}, {206, 0}, {224, 0},
132 {0, 17}, {15, 17}, {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17},
133 {4, 29}, {22, 29}, {37, 29}, {51, 29}, {66, 29}, {81, 29}, {95, 29}, {110, 29}, {125, 29}, {140, 29}, {154, 29}, {169, 29}, {184, 29}, {202, 29}, {224, 29},
134 {5, 41}, {26, 41}, {40, 41}, {55, 41}, {70, 41}, {84, 41}, {99, 41}, {114, 41}, {129, 41}, {143, 41}, {158, 41}, {172, 41}, {196, 41}, {224, 41},
135 {9, 52}, {33, 52}, {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {185, 52}, {209, 52},
136 {2, 64}, {20, 64}, {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64},
137 {0, 0}, {45, 0}, {90, 0}, {134, 0}, {179, 0}, {224, 0},
138 {0, 32}, {224,32},
139 {0, 64}, {45, 64}, {90, 64}, {134, 64}, {179, 64}, {224, 64},
140 }, {
141 4,1,1,1,1,1,1,1,1,1,1,1,1,4,
142 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
143 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
144 4,4,4,4,4,4,4,4,4,4,4,4,4,4,
145 4,4,4,4,4,4,4,4,4,4,4,4,1,
146 4,4,4,4,4,4,1,1,1,
147 2,2,2,2,2,2,2,2,2,2,2,2,2,2,
148 }
149};
150
151bool rgb_matrix_indicators_kb(void) { 121bool rgb_matrix_indicators_kb(void) {
152 if (!rgb_matrix_indicators_user()) { 122 if (!rgb_matrix_indicators_user()) {
153 return false; 123 return false;
diff --git a/keyboards/kbdfans/bella/rgb_iso/keyboard.json b/keyboards/kbdfans/bella/rgb_iso/keyboard.json
index c7dd6423b5..43f36625f9 100644
--- a/keyboards/kbdfans/bella/rgb_iso/keyboard.json
+++ b/keyboards/kbdfans/bella/rgb_iso/keyboard.json
@@ -54,6 +54,103 @@
54 "animation": "cycle_all" 54 "animation": "cycle_all"
55 }, 55 },
56 "driver": "is31fl3741", 56 "driver": "is31fl3741",
57 "layout": [
58 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
59 {"matrix": [0, 2], "x": 29, "y": 0, "flags": 1},
60 {"matrix": [0, 3], "x": 44, "y": 0, "flags": 1},
61 {"matrix": [0, 4], "x": 59, "y": 0, "flags": 1},
62 {"matrix": [0, 5], "x": 73, "y": 0, "flags": 1},
63 {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
64 {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
65 {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
66 {"matrix": [0, 9], "x": 140, "y": 0, "flags": 1},
67 {"matrix": [0, 11], "x": 161, "y": 0, "flags": 1},
68 {"matrix": [0, 12], "x": 176, "y": 0, "flags": 1},
69 {"matrix": [0, 13], "x": 191, "y": 0, "flags": 1},
70 {"matrix": [0, 14], "x": 206, "y": 0, "flags": 1},
71 {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
72 {"matrix": [1, 0], "x": 0, "y": 17, "flags": 4},
73 {"matrix": [1, 1], "x": 15, "y": 17, "flags": 4},
74 {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
75 {"matrix": [1, 3], "x": 44, "y": 17, "flags": 4},
76 {"matrix": [1, 4], "x": 59, "y": 17, "flags": 4},
77 {"matrix": [1, 5], "x": 73, "y": 17, "flags": 4},
78 {"matrix": [1, 6], "x": 88, "y": 17, "flags": 4},
79 {"matrix": [1, 7], "x": 102, "y": 17, "flags": 4},
80 {"matrix": [1, 8], "x": 117, "y": 17, "flags": 4},
81 {"matrix": [1, 9], "x": 132, "y": 17, "flags": 4},
82 {"matrix": [1, 10], "x": 147, "y": 17, "flags": 4},
83 {"matrix": [1, 11], "x": 161, "y": 17, "flags": 4},
84 {"matrix": [1, 12], "x": 176, "y": 17, "flags": 4},
85 {"matrix": [1, 14], "x": 198, "y": 17, "flags": 4},
86 {"matrix": [1, 15], "x": 224, "y": 17, "flags": 4},
87 {"matrix": [2, 0], "x": 4, "y": 29, "flags": 4},
88 {"matrix": [2, 1], "x": 22, "y": 29, "flags": 4},
89 {"matrix": [2, 2], "x": 37, "y": 29, "flags": 4},
90 {"matrix": [2, 3], "x": 51, "y": 29, "flags": 4},
91 {"matrix": [2, 4], "x": 66, "y": 29, "flags": 4},
92 {"matrix": [2, 5], "x": 81, "y": 29, "flags": 4},
93 {"matrix": [2, 6], "x": 95, "y": 29, "flags": 4},
94 {"matrix": [2, 7], "x": 110, "y": 29, "flags": 4},
95 {"matrix": [2, 8], "x": 125, "y": 29, "flags": 4},
96 {"matrix": [2, 9], "x": 140, "y": 29, "flags": 4},
97 {"matrix": [2, 10], "x": 154, "y": 29, "flags": 4},
98 {"matrix": [2, 11], "x": 169, "y": 29, "flags": 4},
99 {"matrix": [2, 12], "x": 184, "y": 29, "flags": 4},
100 {"matrix": [3, 13], "x": 200, "y": 35, "flags": 4},
101 {"matrix": [2, 15], "x": 224, "y": 29, "flags": 4},
102 {"matrix": [3, 0], "x": 5, "y": 41, "flags": 4},
103 {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4},
104 {"matrix": [3, 2], "x": 40, "y": 41, "flags": 4},
105 {"matrix": [3, 3], "x": 55, "y": 41, "flags": 4},
106 {"matrix": [3, 4], "x": 70, "y": 41, "flags": 4},
107 {"matrix": [3, 5], "x": 84, "y": 41, "flags": 4},
108 {"matrix": [3, 6], "x": 99, "y": 41, "flags": 4},
109 {"matrix": [3, 7], "x": 114, "y": 41, "flags": 4},
110 {"matrix": [3, 8], "x": 129, "y": 41, "flags": 4},
111 {"matrix": [3, 9], "x": 143, "y": 41, "flags": 4},
112 {"matrix": [3, 10], "x": 158, "y": 41, "flags": 4},
113 {"matrix": [3, 11], "x": 172, "y": 41, "flags": 4},
114 {"matrix": [2, 13], "x": 187, "y": 41, "flags": 4},
115 {"matrix": [3, 15], "x": 224, "y": 41, "flags": 4},
116 {"matrix": [4, 0], "x": 2, "y": 52, "flags": 4},
117 {"matrix": [4, 1], "x": 18, "y": 52, "flags": 4},
118 {"matrix": [4, 2], "x": 33, "y": 52, "flags": 4},
119 {"matrix": [4, 3], "x": 48, "y": 52, "flags": 4},
120 {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
121 {"matrix": [4, 5], "x": 77, "y": 52, "flags": 4},
122 {"matrix": [4, 6], "x": 92, "y": 52, "flags": 4},
123 {"matrix": [4, 7], "x": 106, "y": 52, "flags": 4},
124 {"matrix": [4, 8], "x": 121, "y": 52, "flags": 4},
125 {"matrix": [4, 9], "x": 136, "y": 52, "flags": 4},
126 {"matrix": [4, 10], "x": 150, "y": 52, "flags": 4},
127 {"matrix": [4, 11], "x": 165, "y": 52, "flags": 4},
128 {"matrix": [4, 12], "x": 185, "y": 52, "flags": 4},
129 {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
130 {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4},
131 {"matrix": [5, 1], "x": 20, "y": 64, "flags": 4},
132 {"matrix": [5, 2], "x": 38, "y": 64, "flags": 4},
133 {"matrix": [5, 6], "x": 94, "y": 64, "flags": 4},
134 {"matrix": [5, 10], "x": 150, "y": 64, "flags": 4},
135 {"matrix": [5, 11], "x": 172, "y": 64, "flags": 4},
136 {"matrix": [5, 12], "x": 195, "y": 64, "flags": 1},
137 {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
138 {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1},
139 {"x": 0, "y": 0, "flags": 2},
140 {"x": 45, "y": 0, "flags": 2},
141 {"x": 90, "y": 0, "flags": 2},
142 {"x": 134, "y": 0, "flags": 2},
143 {"x": 179, "y": 0, "flags": 2},
144 {"x": 224, "y": 0, "flags": 2},
145 {"x": 0, "y": 32, "flags": 2},
146 {"x": 224, "y": 32, "flags": 2},
147 {"x": 0, "y": 64, "flags": 2},
148 {"x": 45, "y": 64, "flags": 2},
149 {"x": 90, "y": 64, "flags": 2},
150 {"x": 134, "y": 64, "flags": 2},
151 {"x": 179, "y": 64, "flags": 2},
152 {"x": 224, "y": 64, "flags": 2}
153 ],
57 "led_flush_limit": 26, 154 "led_flush_limit": 26,
58 "led_process_limit": 4, 155 "led_process_limit": 4,
59 "sleep": true 156 "sleep": true
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index 8d9349e295..ecbe4b3122 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -119,36 +119,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
119 {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */ 119 {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */
120}; 120};
121 121
122led_config_t g_led_config = {
123 {
124 /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15*/
125 { 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, NO_LED, 9, 10, 11, 12, 13, }, /* R0 */
126 { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, NO_LED, 27, 28, }, /* R1 */
127 { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 56, NO_LED, 43, }, /* R2 */
128 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 42, NO_LED, 57, }, /* R3 */
129 { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NO_LED, 71, NO_LED, }, /* R4 */
130 { 72, 73, 74, NO_LED, NO_LED, NO_LED, 75, NO_LED, NO_LED, NO_LED, 76, 77, 78, NO_LED, 79, 80, }, /* R5 */
131 }, {
132 {0, 0}, {29, 0}, {44, 0}, {59, 0}, {73, 0}, {95, 0}, {110, 0}, {125, 0}, {140, 0}, {161, 0}, {176, 0}, {191, 0}, {206, 0}, {224, 0},
133 {0, 17}, {15, 17}, {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17},
134 {4, 29}, {22, 29}, {37, 29}, {51, 29}, {66, 29}, {81, 29}, {95, 29}, {110, 29}, {125, 29}, {140, 29}, {154, 29}, {169, 29}, {184, 29}, {200, 35}, {224, 29},
135 {5, 41}, {26, 41}, {40, 41}, {55, 41}, {70, 41}, {84, 41}, {99, 41}, {114, 41}, {129, 41}, {143, 41}, {158, 41}, {172, 41}, {187, 41}, {224, 41},
136 {2, 52}, {18, 52}, {33, 52}, {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {185, 52}, {209, 52},
137 {2, 64}, {20, 64}, {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64},
138 {0, 0}, {45, 0}, {90, 0}, {134, 0}, {179, 0}, {224, 0},
139 {0, 32}, {224,32},
140 {0, 64}, {45, 64}, {90, 64}, {134, 64}, {179, 64}, {224, 64},
141 }, {
142 4,1,1,1,1,1,1,1,1,1,1,1,1,4,
143 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
144 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
145 4,4,4,4,4,4,4,4,4,4,4,4,4,4,
146 4,4,4,4,4,4,4,4,4,4,4,4,4,1,
147 4,4,4,4,4,4,1,1,1,
148 2,2,2,2,2,2,2,2,2,2,2,2,2,2,
149 }
150};
151
152bool rgb_matrix_indicators_kb(void) { 122bool rgb_matrix_indicators_kb(void) {
153 if (!rgb_matrix_indicators_user()) { 123 if (!rgb_matrix_indicators_user()) {
154 return false; 124 return false;
diff --git a/keyboards/kbdfans/boop65/rgb/keyboard.json b/keyboards/kbdfans/boop65/rgb/keyboard.json
index 4a051c9112..6fc36d1539 100644
--- a/keyboards/kbdfans/boop65/rgb/keyboard.json
+++ b/keyboards/kbdfans/boop65/rgb/keyboard.json
@@ -56,6 +56,91 @@
56 "animation": "cycle_all" 56 "animation": "cycle_all"
57 }, 57 },
58 "driver": "is31fl3741", 58 "driver": "is31fl3741",
59 "layout": [
60 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
61 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
62 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
63 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
64 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
65 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
66 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
67 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
68 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
69 {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
70 {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
71 {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
72 {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
73 {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
74 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
75 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
76 {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
77 {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
78 {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
79 {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
80 {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
81 {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
82 {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
83 {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
84 {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
85 {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
86 {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
87 {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
88 {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
89 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
90 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
91 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
92 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
93 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
94 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
95 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
96 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
97 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
98 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
99 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
100 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
101 {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
102 {"matrix": [2, 13], "x": 201, "y": 32, "flags": 4},
103 {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
104 {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
105 {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
106 {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
107 {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
108 {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
109 {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
110 {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
111 {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
112 {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
113 {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
114 {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
115 {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
116 {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
117 {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
118 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
119 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
120 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
121 {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
122 {"matrix": [4, 8], "x": 152, "y": 64, "flags": 1},
123 {"matrix": [4, 10], "x": 171, "y": 64, "flags": 1},
124 {"matrix": [4, 11], "x": 195, "y": 64, "flags": 1},
125 {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
126 {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1},
127 {"x": 0, "y": 8, "flags": 2},
128 {"x": 32, "y": 8, "flags": 2},
129 {"x": 64, "y": 8, "flags": 2},
130 {"x": 96, "y": 8, "flags": 2},
131 {"x": 128, "y": 8, "flags": 2},
132 {"x": 160, "y": 8, "flags": 2},
133 {"x": 192, "y": 8, "flags": 2},
134 {"x": 224, "y": 8, "flags": 2},
135 {"x": 0, "y": 56, "flags": 2},
136 {"x": 32, "y": 56, "flags": 2},
137 {"x": 64, "y": 56, "flags": 2},
138 {"x": 96, "y": 56, "flags": 2},
139 {"x": 128, "y": 56, "flags": 2},
140 {"x": 160, "y": 56, "flags": 2},
141 {"x": 192, "y": 56, "flags": 2},
142 {"x": 224, "y": 56, "flags": 2}
143 ],
59 "led_flush_limit": 26, 144 "led_flush_limit": 26,
60 "led_process_limit": 4, 145 "led_process_limit": 4,
61 "max_brightness": 200, 146 "max_brightness": 200,
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index f70c92812f..5a6caf64d1 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -112,29 +112,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
112 {0, SW6_CS39, SW6_CS38, SW6_CS37} 112 {0, SW6_CS39, SW6_CS38, SW6_CS37}
113 113
114}; 114};
115led_config_t g_led_config = { {
116 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
117 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
118 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
119 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED,56, 57 },
120 { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
121}, {
122 {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},
123 {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},
124 {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},
125 {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},
126 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64},
127 {0,8},{32,8},{64,8},{96,8},{128,8},{160,8},{192,8},{224,8},
128 {0,56},{32,56},{64,56},{96,56},{128,56},{160,56},{192,56},{224,56}
129}, {
130 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
131 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
132 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
133 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
134 1, 1, 1, 4, 1, 1, 1, 1, 1,
135 2, 2, 2, 2, 2, 2, 2, 2,
136 2, 2, 2, 2, 2, 2, 2, 2
137} };
138 115
139bool rgb_matrix_indicators_kb(void) { 116bool rgb_matrix_indicators_kb(void) {
140 if (!rgb_matrix_indicators_user()) { 117 if (!rgb_matrix_indicators_user()) {
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json
index f55a649f43..9b034ef194 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json
@@ -37,6 +37,75 @@
37 "animation": "cycle_all" 37 "animation": "cycle_all"
38 }, 38 },
39 "driver": "is31fl3731", 39 "driver": "is31fl3731",
40 "layout": [
41 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
42 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
43 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
44 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
45 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
46 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
47 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
48 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
49 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
50 {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
51 {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
52 {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
53 {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
54 {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
55 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
56 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
57 {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
58 {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
59 {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
60 {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
61 {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
62 {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
63 {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
64 {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
65 {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
66 {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
67 {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
68 {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
69 {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
70 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
71 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
72 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
73 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
74 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
75 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
76 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
77 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
78 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
79 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
80 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
81 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
82 {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
83 {"matrix": [2, 13], "x": 201, "y": 32, "flags": 4},
84 {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
85 {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
86 {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
87 {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
88 {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
89 {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
90 {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
91 {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
92 {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
93 {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
94 {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
95 {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
96 {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
97 {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
98 {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
99 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
100 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
101 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
102 {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
103 {"matrix": [4, 8], "x": 152, "y": 64, "flags": 1},
104 {"matrix": [4, 10], "x": 171, "y": 64, "flags": 1},
105 {"matrix": [4, 11], "x": 195, "y": 64, "flags": 1},
106 {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
107 {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
108 ],
40 "led_flush_limit": 26, 109 "led_flush_limit": 26,
41 "led_process_limit": 4, 110 "led_process_limit": 4,
42 "max_brightness": 200, 111 "max_brightness": 200,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
index 210be85d3f..7d25400d7f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
@@ -92,10 +92,6 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
92 92
93}; 93};
94 94
95led_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, NO_LED, 63, 64, NO_LED, 65, 66}},
96 {{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}, {152, 64}, {171, 64}, {195, 64}, {210, 64}, {224, 64}},
97 {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}};
98
99bool rgb_matrix_indicators_kb(void) { 95bool rgb_matrix_indicators_kb(void) {
100 if (!rgb_matrix_indicators_user()) { 96 if (!rgb_matrix_indicators_user()) {
101 return false; 97 return false;
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json
index 916ee0f33a..012ab5257b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json
@@ -35,6 +35,75 @@
35 "animation": "cycle_all" 35 "animation": "cycle_all"
36 }, 36 },
37 "driver": "is31fl3731", 37 "driver": "is31fl3731",
38 "layout": [
39 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
40 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
41 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
42 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
43 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
44 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
45 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
46 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
47 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
48 {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
49 {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
50 {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
51 {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
52 {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
53 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
54 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
55 {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
56 {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
57 {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
58 {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
59 {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
60 {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
61 {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
62 {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
63 {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
64 {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
65 {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
66 {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
67 {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
68 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
69 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
70 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
71 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
72 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
73 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
74 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
75 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
76 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
77 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
78 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
79 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
80 {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
81 {"matrix": [2, 13], "x": 201, "y": 32, "flags": 4},
82 {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
83 {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
84 {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
85 {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
86 {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
87 {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
88 {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
89 {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
90 {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
91 {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
92 {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
93 {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
94 {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
95 {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
96 {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
97 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
98 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
99 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
100 {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
101 {"matrix": [4, 8], "x": 152, "y": 64, "flags": 1},
102 {"matrix": [4, 10], "x": 171, "y": 64, "flags": 1},
103 {"matrix": [4, 11], "x": 195, "y": 64, "flags": 1},
104 {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
105 {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
106 ],
38 "led_flush_limit": 26, 107 "led_flush_limit": 26,
39 "led_process_limit": 4, 108 "led_process_limit": 4,
40 "sleep": true 109 "sleep": true
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
index 50958017a2..f32d5b2f1d 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
@@ -92,27 +92,6 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
92 92
93}; 93};
94 94
95led_config_t g_led_config = { {
96 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
97 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
98 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
99 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED,56, 57 },
100 { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
101}, {
102 {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},
103 {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},
104 {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},
105 {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},
106 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
107}, {
108 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
109 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
110 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
111 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
112 1, 1, 1, 4, 1, 1, 1, 1, 1
113} };
114
115
116bool rgb_matrix_indicators_kb(void) { 95bool rgb_matrix_indicators_kb(void) {
117 if (!rgb_matrix_indicators_user()) { 96 if (!rgb_matrix_indicators_user()) {
118 return false; 97 return false;
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
index 4a3beea9eb..bab449e144 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
@@ -37,6 +37,75 @@
37 "animation": "cycle_all" 37 "animation": "cycle_all"
38 }, 38 },
39 "driver": "is31fl3741", 39 "driver": "is31fl3741",
40 "layout": [
41 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
42 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
43 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
44 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
45 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
46 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
47 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
48 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
49 {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
50 {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
51 {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
52 {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
53 {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
54 {"matrix": [0, 13], "x": 202, "y": 0, "flags": 4},
55 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
56 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
57 {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
58 {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
59 {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
60 {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
61 {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
62 {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
63 {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
64 {"matrix": [1, 8], "x": 127, "y": 16, "flags": 4},
65 {"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
66 {"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
67 {"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
68 {"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
69 {"matrix": [1, 13], "x": 205, "y": 16, "flags": 4},
70 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
71 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 9},
72 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
73 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
74 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
75 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
76 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
77 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
78 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
79 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
80 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
81 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
82 {"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
83 {"matrix": [2, 13], "x": 200, "y": 32, "flags": 4},
84 {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
85 {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
86 {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
87 {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
88 {"matrix": [3, 3], "x": 63, "y": 48, "flags": 4},
89 {"matrix": [3, 4], "x": 78, "y": 48, "flags": 4},
90 {"matrix": [3, 5], "x": 93, "y": 48, "flags": 4},
91 {"matrix": [3, 6], "x": 108, "y": 48, "flags": 4},
92 {"matrix": [3, 7], "x": 123, "y": 48, "flags": 4},
93 {"matrix": [3, 8], "x": 138, "y": 48, "flags": 4},
94 {"matrix": [3, 9], "x": 153, "y": 48, "flags": 4},
95 {"matrix": [3, 10], "x": 168, "y": 48, "flags": 4},
96 {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
97 {"matrix": [3, 13], "x": 209, "y": 48, "flags": 4},
98 {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
99 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
100 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
101 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
102 {"matrix": [4, 5], "x": 95, "y": 64, "flags": 4},
103 {"matrix": [4, 8], "x": 151, "y": 64, "flags": 1},
104 {"matrix": [4, 10], "x": 170, "y": 64, "flags": 1},
105 {"matrix": [4, 11], "x": 194, "y": 64, "flags": 1},
106 {"matrix": [4, 13], "x": 209, "y": 64, "flags": 1},
107 {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
108 ],
40 "val_steps": 8, 109 "val_steps": 8,
41 "led_flush_limit": 26, 110 "led_flush_limit": 26,
42 "led_process_limit": 4, 111 "led_process_limit": 4,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 0b40afadf9..dd3fd96e1c 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -94,33 +94,7 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
94 94
95}; 95};
96 96
97#define __ NO_LED
98#define CAPS_LOCK_LED_INDEX 30 97#define CAPS_LOCK_LED_INDEX 30
99
100led_config_t g_led_config = { {
101 // Key Matrix to LED Index
102 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
103 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
104 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, 43 },
105 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57 },
106 { 58, 59, 60, __, __, 61, __, __, 62, __, 63, 64, __, 65, 66 }
107}, {
108 // LED Index to Physical Position
109 // based on: https://gist.github.com/vinorodrigues/07fd735683856b2a06c7c52b9b3878cb
110 {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {202, 0}, {224, 0},
111 {4, 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}, {205, 16}, {224, 16},
112 {6, 32}, {26, 32}, {41, 32}, {56, 32}, {71, 32}, {86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {175, 32}, {200, 32}, {224, 32},
113 {9, 48}, {34, 48}, {49, 48}, {63, 48}, {78, 48}, {93, 48}, {108, 48}, {123, 48}, {138, 48}, {153, 48}, {168, 48}, {189, 48}, {209, 48}, {224, 48},
114 {2, 64}, {21, 64}, {39, 64}, {95, 64}, {151, 64}, {170, 64}, {194, 64}, {209, 64}, {224, 64}
115}, {
116 // LED Index to Flag
117 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
118 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
119 9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, // caps lock is also an indicator so mask is `0x01 | 0x08`
120 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
121 1, 1, 1, 4, 1, 1, 1, 1, 1
122} };
123
124#endif 98#endif
125 99
126#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX) 100#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json
index ed47182ae5..574a02088f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json
@@ -52,6 +52,75 @@
52 "animation": "cycle_all" 52 "animation": "cycle_all"
53 }, 53 },
54 "driver": "ws2812", 54 "driver": "ws2812",
55 "layout": [
56 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
57 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
58 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
59 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
60 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
61 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
62 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
63 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
64 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
65 {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
66 {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
67 {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
68 {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
69 {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
70 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
71 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
72 {"matrix": [1, 13], "x": 206, "y": 16, "flags": 4},
73 {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
74 {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
75 {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
76 {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
77 {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
78 {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
79 {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
80 {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
81 {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
82 {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
83 {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
84 {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
85 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
86 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
87 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
88 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
89 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
90 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
91 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
92 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
93 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
94 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
95 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
96 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
97 {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
98 {"matrix": [2, 12], "x": 201, "y": 32, "flags": 4},
99 {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
100 {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
101 {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
102 {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
103 {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
104 {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
105 {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
106 {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
107 {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
108 {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
109 {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
110 {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
111 {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
112 {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
113 {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
114 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
115 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
116 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
117 {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
118 {"matrix": [4, 9], "x": 152, "y": 64, "flags": 1},
119 {"matrix": [4, 10], "x": 171, "y": 64, "flags": 1},
120 {"matrix": [4, 11], "x": 195, "y": 64, "flags": 1},
121 {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
122 {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
123 ],
55 "max_brightness": 150, 124 "max_brightness": 150,
56 "sat_steps": 8, 125 "sat_steps": 8,
57 "val_steps": 8, 126 "val_steps": 8,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
index 24ccaea968..f9af0a3df9 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
@@ -17,28 +17,6 @@
17#include "quantum.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20
21led_config_t g_led_config = {
22{
23 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
24 { 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 },
25 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,NO_LED, 43 },
26 { 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, NO_LED,45, 44 },
27 { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, NO_LED,65, 66 }
28}, {
29 {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},
30 {224,16},{206,16},{188,16},{173,16},{158,16},{143,16},{128,16},{113,16},{98,16},{83,16}, {68,16},{53,16},{38,16},{23,16},{4,16},
31 {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},
32 {224,48},{210,48},{189,48},{169,48},{154,48},{139,48},{124,48},{109,48},{94,48},{79,48},{64,48},{49,48},{34,48},{9,48},
33 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
34}, {
35 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
36 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
37 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
38 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
39 1, 1, 1, 4, 1, 1, 1, 1, 1
40} };
41
42bool rgb_matrix_indicators_kb(void) { 20bool rgb_matrix_indicators_kb(void) {
43 if (!rgb_matrix_indicators_user()) { 21 if (!rgb_matrix_indicators_user()) {
44 return false; 22 return false;
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
index 5000f8fb0a..3d544fe88c 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
@@ -40,6 +40,76 @@
40 "animation": "cycle_all" 40 "animation": "cycle_all"
41 }, 41 },
42 "driver": "ws2812", 42 "driver": "ws2812",
43 "layout": [
44 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
45 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
46 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
47 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
48 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
49 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
50 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
51 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
52 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
53 {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
54 {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
55 {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
56 {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
57 {"matrix": [0, 13], "x": 203, "y": 0, "flags": 4},
58 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
59 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
60 {"matrix": [1, 12], "x": 188, "y": 16, "flags": 4},
61 {"matrix": [1, 11], "x": 173, "y": 16, "flags": 4},
62 {"matrix": [1, 10], "x": 158, "y": 16, "flags": 4},
63 {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
64 {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
65 {"matrix": [1, 7], "x": 113, "y": 16, "flags": 4},
66 {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
67 {"matrix": [1, 5], "x": 83, "y": 16, "flags": 4},
68 {"matrix": [1, 4], "x": 68, "y": 16, "flags": 4},
69 {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
70 {"matrix": [1, 2], "x": 38, "y": 16, "flags": 4},
71 {"matrix": [1, 1], "x": 23, "y": 16, "flags": 4},
72 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
73 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
74 {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
75 {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
76 {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
77 {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
78 {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
79 {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
80 {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
81 {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
82 {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
83 {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
84 {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
85 {"matrix": [2, 12], "x": 191, "y": 32, "flags": 4},
86 {"matrix": [1, 13], "x": 206, "y": 24, "flags": 4},
87 {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
88 {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
89 {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
90 {"matrix": [3, 11], "x": 189, "y": 48, "flags": 4},
91 {"matrix": [3, 10], "x": 169, "y": 48, "flags": 4},
92 {"matrix": [3, 9], "x": 154, "y": 48, "flags": 4},
93 {"matrix": [3, 8], "x": 139, "y": 48, "flags": 4},
94 {"matrix": [3, 7], "x": 124, "y": 48, "flags": 4},
95 {"matrix": [3, 6], "x": 109, "y": 48, "flags": 4},
96 {"matrix": [3, 5], "x": 94, "y": 48, "flags": 4},
97 {"matrix": [3, 4], "x": 79, "y": 48, "flags": 4},
98 {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
99 {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
100 {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
101 {"matrix": [4, 3], "x": 21, "y": 48, "flags": 4},
102 {"matrix": [3, 0], "x": 2, "y": 48, "flags": 1},
103 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
104 {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
105 {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
106 {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4},
107 {"matrix": [4, 9], "x": 152, "y": 64, "flags": 1},
108 {"matrix": [4, 10], "x": 171, "y": 64, "flags": 1},
109 {"matrix": [4, 11], "x": 195, "y": 64, "flags": 1},
110 {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
111 {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
112 ],
43 "sat_steps": 8, 113 "sat_steps": 8,
44 "val_steps": 8, 114 "val_steps": 8,
45 "speed_steps": 10, 115 "speed_steps": 10,
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
index 432c871dba..8aa7d42ef3 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
@@ -17,28 +17,6 @@
17#include "quantum.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20led_config_t g_led_config = {
21{
22 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
23 { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 42, 15 },
24 { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,NO_LED, 43 },
25 { 58, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, NO_LED,45, 44 },
26 { 59, 60, 61, 57, NO_LED, 62, NO_LED, NO_LED, NO_LED, 63, 64, 65, NO_LED,66, 67 }
27}, {
28 {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},
29 {224,16},{188,16},{173,16},{158,16},{143,16},{128,16},{113,16},{98,16},{83,16}, {68,16},{53,16},{38,16},{23,16},{4,16},
30 {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{191,32},{206,24},{224,32},
31 {224,48},{210,48},{189,48},{169,48},{154,48},{139,48},{124,48},{109,48},{94,48},{79,48},{64,48},{49,48},{34,48},{21,48},{2,48},
32 {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
33}, {
34 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
35 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
36 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
37 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
38 1, 1, 1, 4, 1, 1, 1, 1, 1
39} };
40
41
42bool rgb_matrix_indicators_kb(void) { 20bool rgb_matrix_indicators_kb(void) {
43 if (!rgb_matrix_indicators_user()) { 21 if (!rgb_matrix_indicators_user()) {
44 return false; 22 return false;
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
index 622ca83b68..45e195524a 100644
--- a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
+++ b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
@@ -17,29 +17,6 @@
17#include "quantum.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20led_config_t g_led_config = { {
21 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15},
22 { 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16},
23 { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45},
24 { 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 14, 47, 46},
25 { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, NO_LED,72, 73},
26 { 83, 82, 81, NO_LED, NO_LED, 80, NO_LED, NO_LED, 79, 78, 77, 76, NO_LED,75 ,74}
27}, {
28 {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}, {195, 0}, {210, 0}, {224, 0},
29 {224, 12}, {218, 12},{192, 12},{176, 12},{160, 12},{144, 12},{128, 12},{112, 12},{96, 12},{80, 12},{64, 12},{48, 12},{32, 12},{16, 12},{0, 12},
30 {0, 25},{16, 25}, {32, 25}, {48, 25}, {64, 25}, {80, 25}, {96, 25}, {112, 25}, {128, 25}, {144, 25}, {160, 25},{176, 25}, {192, 25}, {218, 25}, {224, 25},
31{224, 38},{200, 38},{176, 38},{160, 38},{144, 38},{128, 38},{112, 38},{96, 38},{80, 38},{64, 38},{48, 38},{32, 38},{16, 38},{0, 38},
32 {0, 51},{16, 51}, {32, 51}, {48, 51}, {64, 51}, {80, 51}, {96, 51}, {112, 51}, {128, 51}, {144, 51}, {160, 51}, {189, 51}, {218, 51}, {224, 51},
33{224, 64},{218, 64},{192, 64},{176, 64},{160, 64},{144, 64}, {80, 64}, {32, 64},{16, 64},{0, 64}
34}, {
354,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
364,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
374,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
384,4,4,4,4,4,4,4,4,4,4,4,1,4,1,1,1,4,4,4,
394,4,4,4
40} };
41
42
43bool rgb_matrix_indicators_kb(void) { 20bool rgb_matrix_indicators_kb(void) {
44 if (!rgb_matrix_indicators_user()) { 21 if (!rgb_matrix_indicators_user()) {
45 return false; 22 return false;
diff --git a/keyboards/kbdfans/kbd75rgb/keyboard.json b/keyboards/kbdfans/kbd75rgb/keyboard.json
index 6a69d78c03..af6379071d 100644
--- a/keyboards/kbdfans/kbd75rgb/keyboard.json
+++ b/keyboards/kbdfans/kbd75rgb/keyboard.json
@@ -58,6 +58,92 @@
58 "animation": "cycle_all" 58 "animation": "cycle_all"
59 }, 59 },
60 "driver": "ws2812", 60 "driver": "ws2812",
61 "layout": [
62 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
63 {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
64 {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
65 {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
66 {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
67 {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
68 {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
69 {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
70 {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
71 {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
72 {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
73 {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
74 {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
75 {"matrix": [0, 13], "x": 195, "y": 0, "flags": 4},
76 {"matrix": [3, 12], "x": 210, "y": 0, "flags": 4},
77 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
78 {"matrix": [1, 14], "x": 224, "y": 12, "flags": 4},
79 {"matrix": [1, 13], "x": 218, "y": 12, "flags": 4},
80 {"matrix": [1, 12], "x": 192, "y": 12, "flags": 4},
81 {"matrix": [1, 11], "x": 176, "y": 12, "flags": 4},
82 {"matrix": [1, 10], "x": 160, "y": 12, "flags": 4},
83 {"matrix": [1, 9], "x": 144, "y": 12, "flags": 4},
84 {"matrix": [1, 8], "x": 128, "y": 12, "flags": 4},
85 {"matrix": [1, 7], "x": 112, "y": 12, "flags": 4},
86 {"matrix": [1, 6], "x": 96, "y": 12, "flags": 4},
87 {"matrix": [1, 5], "x": 80, "y": 12, "flags": 4},
88 {"matrix": [1, 4], "x": 64, "y": 12, "flags": 4},
89 {"matrix": [1, 3], "x": 48, "y": 12, "flags": 4},
90 {"matrix": [1, 2], "x": 32, "y": 12, "flags": 4},
91 {"matrix": [1, 1], "x": 16, "y": 12, "flags": 4},
92 {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4},
93 {"matrix": [2, 0], "x": 0, "y": 25, "flags": 4},
94 {"matrix": [2, 1], "x": 16, "y": 25, "flags": 4},
95 {"matrix": [2, 2], "x": 32, "y": 25, "flags": 4},
96 {"matrix": [2, 3], "x": 48, "y": 25, "flags": 4},
97 {"matrix": [2, 4], "x": 64, "y": 25, "flags": 4},
98 {"matrix": [2, 5], "x": 80, "y": 25, "flags": 4},
99 {"matrix": [2, 6], "x": 96, "y": 25, "flags": 4},
100 {"matrix": [2, 7], "x": 112, "y": 25, "flags": 4},
101 {"matrix": [2, 8], "x": 128, "y": 25, "flags": 4},
102 {"matrix": [2, 9], "x": 144, "y": 25, "flags": 4},
103 {"matrix": [2, 10], "x": 160, "y": 25, "flags": 4},
104 {"matrix": [2, 11], "x": 176, "y": 25, "flags": 4},
105 {"matrix": [2, 12], "x": 192, "y": 25, "flags": 4},
106 {"matrix": [2, 13], "x": 218, "y": 25, "flags": 4},
107 {"matrix": [2, 14], "x": 224, "y": 25, "flags": 4},
108 {"matrix": [3, 14], "x": 224, "y": 38, "flags": 4},
109 {"matrix": [3, 13], "x": 200, "y": 38, "flags": 4},
110 {"matrix": [3, 11], "x": 176, "y": 38, "flags": 4},
111 {"matrix": [3, 10], "x": 160, "y": 38, "flags": 4},
112 {"matrix": [3, 9], "x": 144, "y": 38, "flags": 4},
113 {"matrix": [3, 8], "x": 128, "y": 38, "flags": 4},
114 {"matrix": [3, 7], "x": 112, "y": 38, "flags": 4},
115 {"matrix": [3, 6], "x": 96, "y": 38, "flags": 4},
116 {"matrix": [3, 5], "x": 80, "y": 38, "flags": 4},
117 {"matrix": [3, 4], "x": 64, "y": 38, "flags": 4},
118 {"matrix": [3, 3], "x": 48, "y": 38, "flags": 4},
119 {"matrix": [3, 2], "x": 32, "y": 38, "flags": 4},
120 {"matrix": [3, 1], "x": 16, "y": 38, "flags": 4},
121 {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
122 {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4},
123 {"matrix": [4, 1], "x": 16, "y": 51, "flags": 4},
124 {"matrix": [4, 2], "x": 32, "y": 51, "flags": 4},
125 {"matrix": [4, 3], "x": 48, "y": 51, "flags": 4},
126 {"matrix": [4, 4], "x": 64, "y": 51, "flags": 4},
127 {"matrix": [4, 5], "x": 80, "y": 51, "flags": 4},
128 {"matrix": [4, 6], "x": 96, "y": 51, "flags": 4},
129 {"matrix": [4, 7], "x": 112, "y": 51, "flags": 4},
130 {"matrix": [4, 8], "x": 128, "y": 51, "flags": 4},
131 {"matrix": [4, 9], "x": 144, "y": 51, "flags": 4},
132 {"matrix": [4, 10], "x": 160, "y": 51, "flags": 4},
133 {"matrix": [4, 11], "x": 189, "y": 51, "flags": 4},
134 {"matrix": [4, 13], "x": 218, "y": 51, "flags": 1},
135 {"matrix": [4, 14], "x": 224, "y": 51, "flags": 4},
136 {"matrix": [5, 14], "x": 224, "y": 64, "flags": 1},
137 {"matrix": [5, 13], "x": 218, "y": 64, "flags": 1},
138 {"matrix": [5, 11], "x": 192, "y": 64, "flags": 1},
139 {"matrix": [5, 10], "x": 176, "y": 64, "flags": 4},
140 {"matrix": [5, 9], "x": 160, "y": 64, "flags": 4},
141 {"matrix": [5, 8], "x": 144, "y": 64, "flags": 4},
142 {"matrix": [5, 5], "x": 80, "y": 64, "flags": 4},
143 {"matrix": [5, 2], "x": 32, "y": 64, "flags": 4},
144 {"matrix": [5, 1], "x": 16, "y": 64, "flags": 4},
145 {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}
146 ],
61 "sat_steps": 8, 147 "sat_steps": 8,
62 "val_steps": 8, 148 "val_steps": 8,
63 "speed_steps": 10, 149 "speed_steps": 10,
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index 18acc21da4..c9b558b7d3 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -57,22 +57,3 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
57 { 0, SW11_CS2, SW10_CS2, SW12_CS2 }, //LA8 57 { 0, SW11_CS2, SW10_CS2, SW12_CS2 }, //LA8
58 { 0, SW11_CS1, SW10_CS1, SW12_CS1 } //LA4 58 { 0, SW11_CS1, SW10_CS1, SW12_CS1 } //LA4
59}; 59};
60
61led_config_t g_led_config = {
62 {
63 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 },
64 { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 },
65 { 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38 },
66 { 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 }
67 }, {
68 { 0, 0 }, { 19, 0 }, { 38, 0 }, { 57, 0 }, { 76, 0 }, { 95, 0 }, { 114, 0 }, { 133, 0 }, { 152, 0 }, { 171, 0 }, { 190, 0 }, { 209, 0 }, { 224, 0 },
69 { 0, 21 }, { 19, 21 }, { 38, 21 }, { 57, 21 }, { 76, 21 }, { 95, 21 }, { 114, 21 }, { 133, 21 }, { 152, 21 }, { 171, 21 }, { 190, 21 }, { 209, 21 }, { 224, 21 },
70 { 0, 42 }, { 19, 42 }, { 38, 42 }, { 57, 42 }, { 76, 42 }, { 95, 42 }, { 114, 42 }, { 133, 42 }, { 152, 42 }, { 171, 42 }, { 190, 42 }, { 209, 42 }, { 224, 42 },
71 { 0, 64 }, { 19, 64 }, { 38, 64 }, { 57, 64 }, { 76, 64 }, { 95, 64 }, { 114, 64 }, { 133, 64 }, { 152, 64 }, { 171, 64 }, { 190, 64 }, { 209, 64 }, { 224, 64 }
72 }, {
73 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
74 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
75 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
76 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
77 }
78};
diff --git a/keyboards/kbdfans/kbdmini/keyboard.json b/keyboards/kbdfans/kbdmini/keyboard.json
index 97edf073e6..90ec227140 100644
--- a/keyboards/kbdfans/kbdmini/keyboard.json
+++ b/keyboards/kbdfans/kbdmini/keyboard.json
@@ -37,6 +37,60 @@
37 "typing_heatmap": true 37 "typing_heatmap": true
38 }, 38 },
39 "driver": "is31fl3733", 39 "driver": "is31fl3733",
40 "layout": [
41 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
42 {"matrix": [0, 1], "x": 19, "y": 0, "flags": 1},
43 {"matrix": [0, 2], "x": 38, "y": 0, "flags": 1},
44 {"matrix": [0, 3], "x": 57, "y": 0, "flags": 1},
45 {"matrix": [0, 4], "x": 76, "y": 0, "flags": 1},
46 {"matrix": [0, 5], "x": 95, "y": 0, "flags": 1},
47 {"matrix": [0, 6], "x": 114, "y": 0, "flags": 1},
48 {"matrix": [0, 7], "x": 133, "y": 0, "flags": 1},
49 {"matrix": [0, 8], "x": 152, "y": 0, "flags": 1},
50 {"matrix": [0, 9], "x": 171, "y": 0, "flags": 1},
51 {"matrix": [0, 10], "x": 190, "y": 0, "flags": 1},
52 {"matrix": [0, 11], "x": 209, "y": 0, "flags": 1},
53 {"matrix": [0, 12], "x": 224, "y": 0, "flags": 1},
54 {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
55 {"matrix": [1, 1], "x": 19, "y": 21, "flags": 4},
56 {"matrix": [1, 2], "x": 38, "y": 21, "flags": 4},
57 {"matrix": [1, 3], "x": 57, "y": 21, "flags": 4},
58 {"matrix": [1, 4], "x": 76, "y": 21, "flags": 4},
59 {"matrix": [1, 5], "x": 95, "y": 21, "flags": 4},
60 {"matrix": [1, 6], "x": 114, "y": 21, "flags": 4},
61 {"matrix": [1, 7], "x": 133, "y": 21, "flags": 4},
62 {"matrix": [1, 8], "x": 152, "y": 21, "flags": 4},
63 {"matrix": [1, 9], "x": 171, "y": 21, "flags": 4},
64 {"matrix": [1, 10], "x": 190, "y": 21, "flags": 4},
65 {"matrix": [1, 11], "x": 209, "y": 21, "flags": 4},
66 {"matrix": [1, 12], "x": 224, "y": 21, "flags": 1},
67 {"matrix": [2, 0], "x": 0, "y": 42, "flags": 1},
68 {"matrix": [2, 1], "x": 19, "y": 42, "flags": 4},
69 {"matrix": [2, 2], "x": 38, "y": 42, "flags": 4},
70 {"matrix": [2, 3], "x": 57, "y": 42, "flags": 4},
71 {"matrix": [2, 4], "x": 76, "y": 42, "flags": 4},
72 {"matrix": [2, 5], "x": 95, "y": 42, "flags": 4},
73 {"matrix": [2, 6], "x": 114, "y": 42, "flags": 4},
74 {"matrix": [2, 7], "x": 133, "y": 42, "flags": 4},
75 {"matrix": [2, 8], "x": 152, "y": 42, "flags": 4},
76 {"matrix": [2, 9], "x": 171, "y": 42, "flags": 4},
77 {"matrix": [2, 10], "x": 190, "y": 42, "flags": 4},
78 {"matrix": [2, 11], "x": 209, "y": 42, "flags": 4},
79 {"matrix": [2, 12], "x": 224, "y": 42, "flags": 1},
80 {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
81 {"matrix": [3, 1], "x": 19, "y": 64, "flags": 1},
82 {"matrix": [3, 2], "x": 38, "y": 64, "flags": 1},
83 {"matrix": [3, 3], "x": 57, "y": 64, "flags": 1},
84 {"matrix": [3, 4], "x": 76, "y": 64, "flags": 1},
85 {"matrix": [3, 5], "x": 95, "y": 64, "flags": 1},
86 {"matrix": [3, 6], "x": 114, "y": 64, "flags": 1},
87 {"matrix": [3, 7], "x": 133, "y": 64, "flags": 1},
88 {"matrix": [3, 8], "x": 152, "y": 64, "flags": 1},
89 {"matrix": [3, 9], "x": 171, "y": 64, "flags": 1},
90 {"matrix": [3, 10], "x": 190, "y": 64, "flags": 1},
91 {"matrix": [3, 11], "x": 209, "y": 64, "flags": 1},
92 {"matrix": [3, 12], "x": 224, "y": 64, "flags": 1}
93 ],
40 "sleep": true 94 "sleep": true
41 }, 95 },
42 "features": { 96 "features": {
diff --git a/keyboards/kbdfans/maja/keyboard.json b/keyboards/kbdfans/maja/keyboard.json
index 949dd09fe2..fd5d10d833 100644
--- a/keyboards/kbdfans/maja/keyboard.json
+++ b/keyboards/kbdfans/maja/keyboard.json
@@ -40,6 +40,75 @@
40 "animation": "cycle_all" 40 "animation": "cycle_all"
41 }, 41 },
42 "driver": "is31fl3731", 42 "driver": "is31fl3731",
43 "layout": [
44 {"matrix": [0, 0], "x": 4, "y": 1, "flags": 1},
45 {"matrix": [0, 1], "x": 18, "y": 1, "flags": 4},
46 {"matrix": [0, 2], "x": 31, "y": 0, "flags": 4},
47 {"matrix": [0, 3], "x": 46, "y": 3, "flags": 4},
48 {"matrix": [0, 4], "x": 59, "y": 5, "flags": 4},
49 {"matrix": [0, 5], "x": 73, "y": 7, "flags": 4},
50 {"matrix": [0, 6], "x": 86, "y": 10, "flags": 4},
51 {"matrix": [0, 7], "x": 107, "y": 9, "flags": 4},
52 {"matrix": [0, 8], "x": 121, "y": 7, "flags": 4},
53 {"matrix": [0, 9], "x": 134, "y": 4, "flags": 4},
54 {"matrix": [0, 10], "x": 148, "y": 2, "flags": 4},
55 {"matrix": [0, 11], "x": 162, "y": 0, "flags": 4},
56 {"matrix": [0, 12], "x": 176, "y": 2, "flags": 4},
57 {"matrix": [0, 13], "x": 196, "y": 2, "flags": 4},
58 {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
59 {"matrix": [1, 0], "x": 5, "y": 15, "flags": 4},
60 {"matrix": [1, 1], "x": 22, "y": 15, "flags": 4},
61 {"matrix": [1, 2], "x": 37, "y": 15, "flags": 4},
62 {"matrix": [1, 3], "x": 50, "y": 17, "flags": 4},
63 {"matrix": [1, 4], "x": 64, "y": 20, "flags": 4},
64 {"matrix": [1, 5], "x": 77, "y": 22, "flags": 4},
65 {"matrix": [1, 6], "x": 103, "y": 23, "flags": 4},
66 {"matrix": [1, 7], "x": 117, "y": 21, "flags": 4},
67 {"matrix": [1, 8], "x": 130, "y": 19, "flags": 4},
68 {"matrix": [1, 9], "x": 143, "y": 16, "flags": 4},
69 {"matrix": [1, 10], "x": 158, "y": 15, "flags": 4},
70 {"matrix": [1, 11], "x": 171, "y": 16, "flags": 4},
71 {"matrix": [1, 12], "x": 186, "y": 16, "flags": 4},
72 {"matrix": [1, 13], "x": 202, "y": 16, "flags": 4},
73 {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
74 {"matrix": [2, 0], "x": 4, "y": 28, "flags": 4},
75 {"matrix": [2, 1], "x": 23, "y": 28, "flags": 4},
76 {"matrix": [2, 2], "x": 38, "y": 29, "flags": 4},
77 {"matrix": [2, 3], "x": 51, "y": 31, "flags": 4},
78 {"matrix": [2, 4], "x": 65, "y": 34, "flags": 4},
79 {"matrix": [2, 5], "x": 78, "y": 36, "flags": 4},
80 {"matrix": [2, 6], "x": 109, "y": 36, "flags": 4},
81 {"matrix": [2, 7], "x": 122, "y": 34, "flags": 4},
82 {"matrix": [2, 8], "x": 136, "y": 32, "flags": 4},
83 {"matrix": [2, 9], "x": 150, "y": 29, "flags": 4},
84 {"matrix": [2, 10], "x": 164, "y": 29, "flags": 4},
85 {"matrix": [2, 11], "x": 177, "y": 29, "flags": 4},
86 {"matrix": [2, 13], "x": 200, "y": 29, "flags": 4},
87 {"matrix": [2, 14], "x": 224, "y": 29, "flags": 4},
88 {"matrix": [3, 0], "x": 5, "y": 42, "flags": 4},
89 {"matrix": [3, 1], "x": 27, "y": 42, "flags": 4},
90 {"matrix": [3, 2], "x": 42, "y": 43, "flags": 4},
91 {"matrix": [3, 3], "x": 55, "y": 46, "flags": 4},
92 {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
93 {"matrix": [3, 5], "x": 82, "y": 51, "flags": 4},
94 {"matrix": [3, 6], "x": 104, "y": 51, "flags": 4},
95 {"matrix": [3, 7], "x": 118, "y": 48, "flags": 4},
96 {"matrix": [3, 8], "x": 131, "y": 46, "flags": 4},
97 {"matrix": [3, 9], "x": 145, "y": 44, "flags": 4},
98 {"matrix": [3, 10], "x": 159, "y": 43, "flags": 4},
99 {"matrix": [3, 11], "x": 173, "y": 43, "flags": 4},
100 {"matrix": [3, 12], "x": 192, "y": 43, "flags": 4},
101 {"matrix": [3, 13], "x": 214, "y": 46, "flags": 1},
102 {"matrix": [4, 0], "x": 0, "y": 55, "flags": 4},
103 {"matrix": [4, 2], "x": 40, "y": 58, "flags": 4},
104 {"matrix": [4, 3], "x": 62, "y": 61, "flags": 4},
105 {"matrix": [4, 5], "x": 86, "y": 64, "flags": 1},
106 {"matrix": [4, 7], "x": 119, "y": 62, "flags": 4},
107 {"matrix": [4, 9], "x": 147, "y": 58, "flags": 4},
108 {"matrix": [4, 12], "x": 201, "y": 60, "flags": 1},
109 {"matrix": [4, 13], "x": 214, "y": 60, "flags": 1},
110 {"matrix": [4, 14], "x": 224, "y": 60, "flags": 1}
111 ],
43 "led_flush_limit": 26, 112 "led_flush_limit": 26,
44 "led_process_limit": 4, 113 "led_process_limit": 4,
45 "sleep": true 114 "sleep": true
diff --git a/keyboards/kbdfans/maja/maja.c b/keyboards/kbdfans/maja/maja.c
index cc073930bc..c1db8e606c 100755
--- a/keyboards/kbdfans/maja/maja.c
+++ b/keyboards/kbdfans/maja/maja.c
@@ -74,26 +74,6 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
74 {1, C8_16, C7_16, C6_16} // LD17 74 {1, C8_16, C7_16, C6_16} // LD17
75}; 75};
76 76
77led_config_t g_led_config = { {
78 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14},
79 { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,},
80 { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43},
81 { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, NO_LED},
82 { 58, NO_LED, 59, 60, NO_LED, 61, NO_LED, 62, NO_LED, 63, NO_LED, NO_LED, 64, 65, 66}
83}, {
84 {4,1},{18,1},{31,0},{46,3},{59,5},{73,7},{86,10},{107,9},{121,7},{134,4},{148,2},{162,0},{176,2},{196,2},{224,0},
85 {5,15},{22,15},{37,15},{50,17},{64,20},{77,22},{103,23},{117,21},{130,19},{143,16},{158,15},{171,16},{186,16},{202,16},{224,16},
86 {4,28},{23,28},{38,29},{51,31},{65,34},{78,36},{109,36},{122,34},{136,32},{150,29},{164,29},{177,29},{200,29},{224,29},
87 {5,42},{27,42},{42,43},{55,46},{69,48},{82,51},{104,51},{118,48},{131,46},{145,44},{159,43},{173,43},{192,43},{214,46},
88 {0,55},{40,58},{62,61},{86,64},{119,62},{147,58},{201,60},{214,60},{224,60}
89}, {
90 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
91 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
92 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
93 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
94 4, 4, 4, 1, 4, 4, 1, 1, 1
95} };
96
97bool rgb_matrix_indicators_kb(void) { 77bool rgb_matrix_indicators_kb(void) {
98 if (!rgb_matrix_indicators_user()) { 78 if (!rgb_matrix_indicators_user()) {
99 return false; 79 return false;
diff --git a/keyboards/kbdfans/odin/rgb/keyboard.json b/keyboards/kbdfans/odin/rgb/keyboard.json
index 1fb5a833ec..8e14e1210a 100644
--- a/keyboards/kbdfans/odin/rgb/keyboard.json
+++ b/keyboards/kbdfans/odin/rgb/keyboard.json
@@ -59,6 +59,112 @@
59 "animation": "cycle_all" 59 "animation": "cycle_all"
60 }, 60 },
61 "driver": "ws2812", 61 "driver": "ws2812",
62 "layout": [
63 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
64 {"matrix": [0, 2], "x": 24, "y": 0, "flags": 4},
65 {"matrix": [0, 3], "x": 36, "y": 0, "flags": 4},
66 {"matrix": [0, 4], "x": 48, "y": 0, "flags": 4},
67 {"matrix": [0, 5], "x": 60, "y": 0, "flags": 4},
68 {"matrix": [0, 7], "x": 84, "y": 0, "flags": 4},
69 {"matrix": [0, 8], "x": 96, "y": 0, "flags": 4},
70 {"matrix": [0, 9], "x": 108, "y": 0, "flags": 4},
71 {"matrix": [0, 10], "x": 120, "y": 0, "flags": 4},
72 {"matrix": [0, 11], "x": 132, "y": 0, "flags": 4},
73 {"matrix": [0, 12], "x": 144, "y": 0, "flags": 4},
74 {"matrix": [0, 13], "x": 156, "y": 0, "flags": 4},
75 {"matrix": [0, 14], "x": 168, "y": 0, "flags": 4},
76 {"matrix": [0, 15], "x": 180, "y": 0, "flags": 4},
77 {"matrix": [0, 16], "x": 192, "y": 0, "flags": 4},
78 {"matrix": [0, 17], "x": 204, "y": 0, "flags": 4},
79 {"matrix": [0, 18], "x": 216, "y": 0, "flags": 4},
80 {"matrix": [0, 19], "x": 224, "y": 0, "flags": 4},
81 {"matrix": [1, 19], "x": 224, "y": 14, "flags": 4},
82 {"matrix": [1, 18], "x": 216, "y": 14, "flags": 4},
83 {"matrix": [1, 17], "x": 204, "y": 14, "flags": 4},
84 {"matrix": [1, 16], "x": 192, "y": 14, "flags": 4},
85 {"matrix": [1, 15], "x": 180, "y": 14, "flags": 4},
86 {"matrix": [1, 13], "x": 156, "y": 14, "flags": 4},
87 {"matrix": [1, 12], "x": 144, "y": 14, "flags": 4},
88 {"matrix": [1, 11], "x": 132, "y": 14, "flags": 4},
89 {"matrix": [1, 10], "x": 120, "y": 14, "flags": 4},
90 {"matrix": [1, 9], "x": 108, "y": 14, "flags": 4},
91 {"matrix": [1, 8], "x": 96, "y": 14, "flags": 4},
92 {"matrix": [1, 7], "x": 84, "y": 14, "flags": 4},
93 {"matrix": [1, 6], "x": 72, "y": 14, "flags": 4},
94 {"matrix": [1, 5], "x": 60, "y": 14, "flags": 4},
95 {"matrix": [1, 4], "x": 48, "y": 14, "flags": 4},
96 {"matrix": [1, 3], "x": 36, "y": 14, "flags": 4},
97 {"matrix": [1, 2], "x": 24, "y": 14, "flags": 4},
98 {"matrix": [1, 1], "x": 12, "y": 14, "flags": 4},
99 {"matrix": [1, 0], "x": 0, "y": 14, "flags": 4},
100 {"matrix": [2, 0], "x": 0, "y": 27, "flags": 4},
101 {"matrix": [2, 1], "x": 12, "y": 27, "flags": 4},
102 {"matrix": [2, 2], "x": 24, "y": 27, "flags": 4},
103 {"matrix": [2, 3], "x": 36, "y": 27, "flags": 4},
104 {"matrix": [2, 4], "x": 48, "y": 27, "flags": 4},
105 {"matrix": [2, 5], "x": 60, "y": 27, "flags": 4},
106 {"matrix": [2, 6], "x": 72, "y": 27, "flags": 4},
107 {"matrix": [2, 7], "x": 84, "y": 27, "flags": 4},
108 {"matrix": [2, 8], "x": 96, "y": 27, "flags": 4},
109 {"matrix": [2, 9], "x": 108, "y": 27, "flags": 4},
110 {"matrix": [2, 10], "x": 120, "y": 27, "flags": 4},
111 {"matrix": [2, 11], "x": 132, "y": 27, "flags": 4},
112 {"matrix": [2, 12], "x": 144, "y": 27, "flags": 4},
113 {"matrix": [2, 13], "x": 156, "y": 27, "flags": 4},
114 {"matrix": [2, 15], "x": 180, "y": 27, "flags": 4},
115 {"matrix": [2, 16], "x": 192, "y": 27, "flags": 4},
116 {"matrix": [2, 17], "x": 204, "y": 27, "flags": 4},
117 {"matrix": [2, 18], "x": 216, "y": 27, "flags": 4},
118 {"matrix": [2, 19], "x": 224, "y": 33, "flags": 4},
119 {"matrix": [3, 18], "x": 216, "y": 40, "flags": 4},
120 {"matrix": [3, 17], "x": 204, "y": 40, "flags": 4},
121 {"matrix": [3, 16], "x": 192, "y": 40, "flags": 4},
122 {"x": 224, "y": 0, "flags": 4},
123 {"x": 0, "y": 0, "flags": 4},
124 {"x": 0, "y": 64, "flags": 4},
125 {"x": 224, "y": 64, "flags": 4},
126 {"matrix": [3, 13], "x": 156, "y": 40, "flags": 4},
127 {"matrix": [3, 11], "x": 132, "y": 40, "flags": 4},
128 {"matrix": [3, 10], "x": 120, "y": 40, "flags": 4},
129 {"matrix": [3, 9], "x": 108, "y": 40, "flags": 4},
130 {"matrix": [3, 8], "x": 96, "y": 40, "flags": 4},
131 {"matrix": [3, 7], "x": 84, "y": 40, "flags": 4},
132 {"matrix": [3, 6], "x": 72, "y": 40, "flags": 4},
133 {"matrix": [3, 5], "x": 60, "y": 40, "flags": 4},
134 {"matrix": [3, 4], "x": 48, "y": 40, "flags": 4},
135 {"matrix": [3, 3], "x": 36, "y": 40, "flags": 4},
136 {"matrix": [3, 2], "x": 24, "y": 40, "flags": 4},
137 {"matrix": [3, 1], "x": 12, "y": 40, "flags": 4},
138 {"matrix": [3, 0], "x": 0, "y": 40, "flags": 4},
139 {"matrix": [4, 0], "x": 0, "y": 52, "flags": 4},
140 {"matrix": [4, 2], "x": 24, "y": 52, "flags": 4},
141 {"matrix": [4, 3], "x": 36, "y": 52, "flags": 4},
142 {"matrix": [4, 4], "x": 48, "y": 52, "flags": 4},
143 {"matrix": [4, 5], "x": 60, "y": 52, "flags": 4},
144 {"matrix": [4, 6], "x": 72, "y": 52, "flags": 4},
145 {"matrix": [4, 7], "x": 84, "y": 52, "flags": 4},
146 {"matrix": [4, 8], "x": 96, "y": 52, "flags": 4},
147 {"matrix": [4, 9], "x": 108, "y": 52, "flags": 4},
148 {"matrix": [4, 10], "x": 120, "y": 52, "flags": 4},
149 {"matrix": [4, 11], "x": 132, "y": 52, "flags": 4},
150 {"matrix": [4, 13], "x": 156, "y": 52, "flags": 4},
151 {"matrix": [4, 15], "x": 180, "y": 52, "flags": 4},
152 {"matrix": [4, 16], "x": 192, "y": 52, "flags": 4},
153 {"matrix": [4, 17], "x": 204, "y": 52, "flags": 4},
154 {"matrix": [4, 18], "x": 216, "y": 52, "flags": 4},
155 {"matrix": [4, 19], "x": 224, "y": 58, "flags": 4},
156 {"matrix": [5, 18], "x": 216, "y": 64, "flags": 4},
157 {"matrix": [5, 17], "x": 204, "y": 64, "flags": 4},
158 {"matrix": [5, 16], "x": 192, "y": 64, "flags": 4},
159 {"matrix": [5, 15], "x": 180, "y": 64, "flags": 4},
160 {"matrix": [5, 14], "x": 168, "y": 64, "flags": 4},
161 {"matrix": [5, 13], "x": 156, "y": 64, "flags": 4},
162 {"matrix": [5, 11], "x": 132, "y": 64, "flags": 4},
163 {"matrix": [5, 6], "x": 72, "y": 64, "flags": 4},
164 {"matrix": [5, 2], "x": 24, "y": 64, "flags": 4},
165 {"matrix": [5, 1], "x": 12, "y": 64, "flags": 4},
166 {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}
167 ],
62 "max_brightness": 150, 168 "max_brightness": 150,
63 "sleep": true 169 "sleep": true
64 }, 170 },
diff --git a/keyboards/kbdfans/odin/rgb/rgb.c b/keyboards/kbdfans/odin/rgb/rgb.c
index 2774ca7a6e..1cfe8d487c 100644
--- a/keyboards/kbdfans/odin/rgb/rgb.c
+++ b/keyboards/kbdfans/odin/rgb/rgb.c
@@ -16,31 +16,6 @@
16#include "quantum.h" 16#include "quantum.h"
17 17
18#ifdef RGB_MATRIX_ENABLE 18#ifdef RGB_MATRIX_ENABLE
19led_config_t g_led_config = {
20 {
21 { 0, NO_LED, 1, 2, 3, 4, NO_LED, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 },
22 { 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, NO_LED, 22, 21, 20, 19, 18 },
23 { 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, NO_LED, 51, 52, 53, 54, 55 },
24 { 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, NO_LED, 63, NO_LED, NO_LED, 58, 57, 56, NO_LED },
25 { 76, NO_LED, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, NO_LED, 87, NO_LED, 88, 89, 90, 91, 92 },
26 { 103, 102, 101, NO_LED, NO_LED, NO_LED, 100, NO_LED, NO_LED, NO_LED, NO_LED, 99, NO_LED, 98, 97, 96, 95, 94, 93, NO_LED }
27 }, {
28 { 0, 0 }, { 24, 0 }, { 36, 0 }, { 48, 0 }, { 60, 0 }, { 84, 0 }, { 96, 0 }, { 108, 0 }, { 120, 0 }, { 132, 0 }, { 144, 0 }, { 156, 0 }, { 168, 0 }, { 180, 0 }, { 192, 0 }, { 204, 0 }, { 216, 0 }, { 224, 0 },
29 { 224, 14 }, { 216, 14 }, { 204, 14 }, { 192, 14 }, { 180, 14 }, { 156, 14 }, { 144, 14 }, { 132, 14 }, { 120, 14 }, { 108, 14 }, { 96, 14 }, { 84, 14 }, { 72, 14 }, { 60, 14 }, { 48, 14 }, { 36, 14 }, { 24, 14 }, { 12, 14 }, { 0, 14 },
30 { 0, 27 }, { 12, 27 }, { 24, 27 }, { 36, 27 }, { 48, 27 }, { 60, 27 }, { 72, 27 }, { 84, 27 }, { 96, 27 }, { 108, 27 }, { 120, 27 }, { 132, 27 }, { 144, 27 }, { 156, 27 }, { 180, 27 }, { 192, 27 }, { 204, 27 }, { 216, 27 }, { 224, 33 },
31 { 216, 40 }, { 204, 40 }, { 192, 40 }, { 224, 0 }, { 0, 0 }, { 0, 64 }, { 224, 64 }, { 156, 40 }, { 132, 40 }, { 120, 40 }, { 108, 40 }, { 96, 40 }, { 84, 40 }, { 72, 40 }, { 60, 40 }, { 48, 40 }, { 36, 40 }, { 24, 40 }, { 12, 40 }, { 0, 40 },
32 { 0, 52 }, { 24, 52 }, { 36, 52 }, { 48, 52 }, { 60, 52 }, { 72, 52 }, { 84, 52 }, { 96, 52 }, { 108, 52 }, { 120, 52 }, { 132, 52 }, { 156, 52 }, { 180, 52 }, { 192, 52 }, { 204, 52 }, { 216, 52 }, { 224, 58 },
33 { 216, 64 }, { 204, 64 }, { 192, 64 }, { 180, 64 }, { 168, 64 }, { 156, 64 }, { 132, 64 }, { 72, 64 }, { 24, 64 }, { 12, 64 }, { 0, 64 }
34 }, {
35 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
36 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
37 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
38 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
39 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
40 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
41 }
42};
43
44bool rgb_matrix_indicators_kb(void) { 19bool rgb_matrix_indicators_kb(void) {
45 if (!rgb_matrix_indicators_user()) { 20 if (!rgb_matrix_indicators_user()) {
46 return false; 21 return false;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 07:06:35 +0000