diff --git a/keyboards/keebio/bamfk4/bamfk4.c b/keyboards/keebio/bamfk4/bamfk4.c
deleted file mode 100644
index 757bc03f72..0000000000
--- a/keyboards/keebio/bamfk4/bamfk4.c
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2022 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { NO_LED, NO_LED, NO_LED, NO_LED },
-}, {
- // LED Index to Physical Position
- //through switch
- { 26, 10 }, { 4, 10 }, { 3, 49 }, { 23, 49 },
- { 69, 49 }, { 68, 10 }, { 90, 10 }, { 89, 49 },
- { 134, 49 }, { 132, 10 }, { 155, 10 }, { 155, 49 },
- { 199, 49 }, { 199, 10 }, { 219, 10 }, { 219, 49 },
-
- //underglow
- { 218, 62 }, { 188, 62 }, { 159, 62 }, { 123, 62 }, //bottom right
- { 100, 62 }, { 59, 62 }, { 35, 62 }, { 5, 62 }, //bottom left
- { 6, 6 }, { 35, 6 }, { 59, 6 }, { 100, 6 }, //top left
- { 123, 6 }, { 159, 6 }, { 188, 6 }, { 218, 6 } //top right
-}, {
- // LED Index to Flag
- 4, 4, 4, 4,
- 4, 4, 4, 4,
- 4, 4, 4, 4,
- 4, 4, 4, 4,
- 2, 2, 2, 2,
- 2, 2, 2, 2,
- 2, 2, 2, 2,
- 2, 2, 2, 2
-} };
-
-
-
-#endif
\ No newline at end of file
diff --git a/keyboards/keebio/bamfk4/keyboard.json b/keyboards/keebio/bamfk4/keyboard.json
index 08b3900766..98ea684637 100644
--- a/keyboards/keebio/bamfk4/keyboard.json
+++ b/keyboards/keebio/bamfk4/keyboard.json
@@ -50,6 +50,40 @@
"solid_multisplash": true
},
"driver": "ws2812",
+ "layout": [
+ {"x": 26, "y": 10, "flags": 4},
+ {"x": 4, "y": 10, "flags": 4},
+ {"x": 3, "y": 49, "flags": 4},
+ {"x": 23, "y": 49, "flags": 4},
+ {"x": 69, "y": 49, "flags": 4},
+ {"x": 68, "y": 10, "flags": 4},
+ {"x": 90, "y": 10, "flags": 4},
+ {"x": 89, "y": 49, "flags": 4},
+ {"x": 134, "y": 49, "flags": 4},
+ {"x": 132, "y": 10, "flags": 4},
+ {"x": 155, "y": 10, "flags": 4},
+ {"x": 155, "y": 49, "flags": 4},
+ {"x": 199, "y": 49, "flags": 4},
+ {"x": 199, "y": 10, "flags": 4},
+ {"x": 219, "y": 10, "flags": 4},
+ {"x": 219, "y": 49, "flags": 4},
+ {"x": 218, "y": 62, "flags": 2},
+ {"x": 188, "y": 62, "flags": 2},
+ {"x": 159, "y": 62, "flags": 2},
+ {"x": 123, "y": 62, "flags": 2},
+ {"x": 100, "y": 62, "flags": 2},
+ {"x": 59, "y": 62, "flags": 2},
+ {"x": 35, "y": 62, "flags": 2},
+ {"x": 5, "y": 62, "flags": 2},
+ {"x": 6, "y": 6, "flags": 2},
+ {"x": 35, "y": 6, "flags": 2},
+ {"x": 59, "y": 6, "flags": 2},
+ {"x": 100, "y": 6, "flags": 2},
+ {"x": 123, "y": 6, "flags": 2},
+ {"x": 159, "y": 6, "flags": 2},
+ {"x": 188, "y": 6, "flags": 2},
+ {"x": 218, "y": 6, "flags": 2}
+ ],
"max_brightness": 160,
"sleep": true
},
diff --git a/keyboards/keebio/bdn9/rev2/keyboard.json b/keyboards/keebio/bdn9/rev2/keyboard.json
index a8a0c8d10d..ee1787e169 100644
--- a/keyboards/keebio/bdn9/rev2/keyboard.json
+++ b/keyboards/keebio/bdn9/rev2/keyboard.json
@@ -71,7 +71,20 @@
"solid_splash": true,
"solid_multisplash": true
},
- "driver": "ws2812"
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [1, 1], "x": 112, "y": 32, "flags": 4},
+ {"matrix": [1, 2], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [2, 1], "x": 112, "y": 64, "flags": 4},
+ {"matrix": [2, 2], "x": 224, "y": 64, "flags": 4},
+ {"x": 56, "y": 64, "flags": 2},
+ {"x": 168, "y": 64, "flags": 2}
+ ]
},
"encoder": {
"rotary": [
diff --git a/keyboards/keebio/bdn9/rev2/rev2.c b/keyboards/keebio/bdn9/rev2/rev2.c
index 5c6d940325..70b0b0c4fd 100644
--- a/keyboards/keebio/bdn9/rev2/rev2.c
+++ b/keyboards/keebio/bdn9/rev2/rev2.c
@@ -1,26 +1,5 @@
#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { 0, 1, 2 },
- { 3, 4, 5 },
- { 6, 7, 8 }
-}, {
- // LED Index to Physical Position
- { 0, 0 }, { 112, 0 }, { 224, 0 },
- { 0, 32 }, { 112, 32 }, { 224, 32 },
- { 0, 64 }, { 112, 64 }, { 224, 64 },
- { 56, 64 }, { 168, 64 },
-}, {
- // LED Index to Flag
- 4, 4, 4,
- 4, 4, 4,
- 4, 4, 4,
- 2, 2
-} };
-#endif
-
void eeconfig_init_kb(void) {
#ifdef RGBLIGHT_ENABLE
rgblight_enable(); // Enable RGB by default
diff --git a/keyboards/keebio/iris/rev6/keyboard.json b/keyboards/keebio/iris/rev6/keyboard.json
index ef240c5ab9..910c4b35ce 100644
--- a/keyboards/keebio/iris/rev6/keyboard.json
+++ b/keyboards/keebio/iris/rev6/keyboard.json
@@ -43,6 +43,76 @@
"solid_multisplash": true
},
"driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 5, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 2, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 2, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 3, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 17, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 15, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 15, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 18, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 28, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 27, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 28, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 30, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 43, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 42, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 40, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 42, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 45, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 45, "flags": 4},
+ {"matrix": [4, 2], "x": 56, "y": 47, "flags": 4},
+ {"matrix": [4, 3], "x": 72, "y": 58, "flags": 4},
+ {"matrix": [4, 4], "x": 90, "y": 64, "flags": 4},
+ {"matrix": [4, 5], "x": 98, "y": 52, "flags": 4},
+ {"x": 80, "y": 58, "flags": 2},
+ {"x": 40, "y": 50, "flags": 2},
+ {"x": 8, "y": 43, "flags": 2},
+ {"x": 8, "y": 5, "flags": 2},
+ {"x": 40, "y": 1, "flags": 2},
+ {"x": 72, "y": 3, "flags": 2},
+ {"matrix": [5, 0], "x": 224, "y": 5, "flags": 4},
+ {"matrix": [5, 1], "x": 208, "y": 5, "flags": 4},
+ {"matrix": [5, 2], "x": 192, "y": 2, "flags": 4},
+ {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 160, "y": 2, "flags": 4},
+ {"matrix": [5, 5], "x": 144, "y": 3, "flags": 4},
+ {"matrix": [6, 5], "x": 144, "y": 18, "flags": 4},
+ {"matrix": [6, 4], "x": 160, "y": 18, "flags": 4},
+ {"matrix": [6, 3], "x": 176, "y": 15, "flags": 4},
+ {"matrix": [6, 2], "x": 192, "y": 13, "flags": 4},
+ {"matrix": [6, 1], "x": 208, "y": 15, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 17, "flags": 4},
+ {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
+ {"matrix": [7, 2], "x": 192, "y": 28, "flags": 4},
+ {"matrix": [7, 3], "x": 176, "y": 27, "flags": 4},
+ {"matrix": [7, 4], "x": 160, "y": 28, "flags": 4},
+ {"matrix": [7, 5], "x": 144, "y": 30, "flags": 4},
+ {"matrix": [8, 5], "x": 144, "y": 45, "flags": 4},
+ {"matrix": [8, 4], "x": 160, "y": 45, "flags": 4},
+ {"matrix": [8, 3], "x": 176, "y": 42, "flags": 4},
+ {"matrix": [8, 2], "x": 192, "y": 40, "flags": 4},
+ {"matrix": [8, 1], "x": 208, "y": 42, "flags": 4},
+ {"matrix": [8, 0], "x": 224, "y": 43, "flags": 4},
+ {"matrix": [9, 2], "x": 168, "y": 47, "flags": 4},
+ {"matrix": [9, 3], "x": 152, "y": 58, "flags": 4},
+ {"matrix": [9, 4], "x": 134, "y": 64, "flags": 4},
+ {"matrix": [9, 5], "x": 126, "y": 52, "flags": 4},
+ {"x": 144, "y": 58, "flags": 2},
+ {"x": 184, "y": 50, "flags": 2},
+ {"x": 216, "y": 43, "flags": 2},
+ {"x": 216, "y": 5, "flags": 2},
+ {"x": 184, "y": 1, "flags": 2},
+ {"x": 152, "y": 3, "flags": 2}
+ ],
"max_brightness": 160,
"sleep": true,
"split_count": [34, 34]
diff --git a/keyboards/keebio/iris/rev6/rev6.c b/keyboards/keebio/iris/rev6/rev6.c
index 3d9e18fd01..1547a0a6e8 100644
--- a/keyboards/keebio/iris/rev6/rev6.c
+++ b/keyboards/keebio/iris/rev6/rev6.c
@@ -13,57 +13,6 @@ along with this program. If not, see .
*/
#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- // Left Half
- { 0, 1, 2, 3, 4, 5 },
- { 11, 10, 9, 8, 7, 6 },
- { 12, 13, 14, 15, 16, 17 },
- { 23, 22, 21, 20, 19, 18 },
- { NO_LED, NO_LED, 24, 25, 26, 27 },
- // Right Half
- { 34, 35, 36, 37, 38, 39 },
- { 45, 44, 43, 42, 41, 40 },
- { 46, 47, 48, 49, 50, 51 },
- { 57, 56, 55, 54, 53, 52 },
- { NO_LED, NO_LED, 58, 59, 60, 61 }
-}, {
- // LED Index to Physical Position
- // Left Half
- { 0, 5 }, { 16, 5 }, { 32, 2 }, { 48, 0 }, { 64, 2 }, { 80, 3 },
- { 80, 17 }, { 64, 15 }, { 48, 13 }, { 32, 15 }, { 16, 18 }, { 0, 18 },
- { 0, 32 }, { 16, 32 }, { 32, 28 }, { 48, 27 }, { 64, 28 }, { 80, 30 },
- { 80, 43 }, { 64, 42 }, { 48, 40 }, { 32, 42 }, { 16, 45 }, { 0, 45 },
- { 56, 47 }, { 72, 58 }, { 90, 64 }, { 98, 52 },
- { 80, 58 }, { 40, 50 }, { 8, 43 }, { 8, 5 }, { 40, 1 }, { 72, 3 },
- // Right Half
- { 224, 5 }, { 208, 5 }, { 192, 2 }, { 176, 0 }, { 160, 2 }, { 144, 3 },
- { 144, 18 }, { 160, 18 }, { 176, 15 }, { 192, 13 }, { 208, 15 }, { 224, 17 },
- { 224, 32 }, { 208, 32 }, { 192, 28 }, { 176, 27 }, { 160, 28 }, { 144, 30 },
- { 144, 45 }, { 160, 45 }, { 176, 42 }, { 192, 40 }, { 208, 42 }, { 224, 43 },
- { 168, 47 }, { 152, 58 }, { 134, 64 }, { 126, 52 },
- { 144, 58 }, { 184, 50 }, { 216, 43 }, { 216, 5 }, { 184, 1 }, { 152, 3 }
-}, {
- // LED Index to Flag
- // Left Half
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4,
- 2, 2, 2, 2, 2, 2,
- // Right Half
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4,
- 2, 2, 2, 2, 2, 2
-
-} };
-#endif
-
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/keebio/iris/rev7/keyboard.json b/keyboards/keebio/iris/rev7/keyboard.json
index 79b410cd94..7b58990d18 100644
--- a/keyboards/keebio/iris/rev7/keyboard.json
+++ b/keyboards/keebio/iris/rev7/keyboard.json
@@ -41,6 +41,76 @@
"multisplash": true
},
"driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 5, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 2, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 2, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 3, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 17, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 15, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 15, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 18, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 28, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 27, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 28, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 30, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 43, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 42, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 40, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 42, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 45, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 45, "flags": 4},
+ {"matrix": [4, 2], "x": 56, "y": 47, "flags": 4},
+ {"matrix": [4, 3], "x": 72, "y": 58, "flags": 4},
+ {"matrix": [4, 4], "x": 90, "y": 64, "flags": 4},
+ {"matrix": [4, 5], "x": 98, "y": 52, "flags": 4},
+ {"x": 80, "y": 58, "flags": 2},
+ {"x": 40, "y": 50, "flags": 2},
+ {"x": 8, "y": 43, "flags": 2},
+ {"x": 8, "y": 5, "flags": 2},
+ {"x": 40, "y": 1, "flags": 2},
+ {"x": 72, "y": 3, "flags": 2},
+ {"matrix": [5, 0], "x": 224, "y": 5, "flags": 4},
+ {"matrix": [5, 1], "x": 208, "y": 5, "flags": 4},
+ {"matrix": [5, 2], "x": 192, "y": 2, "flags": 4},
+ {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 160, "y": 2, "flags": 4},
+ {"matrix": [5, 5], "x": 144, "y": 3, "flags": 4},
+ {"matrix": [6, 5], "x": 144, "y": 18, "flags": 4},
+ {"matrix": [6, 4], "x": 160, "y": 18, "flags": 4},
+ {"matrix": [6, 3], "x": 176, "y": 15, "flags": 4},
+ {"matrix": [6, 2], "x": 192, "y": 13, "flags": 4},
+ {"matrix": [6, 1], "x": 208, "y": 15, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 17, "flags": 4},
+ {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
+ {"matrix": [7, 2], "x": 192, "y": 28, "flags": 4},
+ {"matrix": [7, 3], "x": 176, "y": 27, "flags": 4},
+ {"matrix": [7, 4], "x": 160, "y": 28, "flags": 4},
+ {"matrix": [7, 5], "x": 144, "y": 30, "flags": 4},
+ {"matrix": [8, 5], "x": 144, "y": 45, "flags": 4},
+ {"matrix": [8, 4], "x": 160, "y": 45, "flags": 4},
+ {"matrix": [8, 3], "x": 176, "y": 42, "flags": 4},
+ {"matrix": [8, 2], "x": 192, "y": 40, "flags": 4},
+ {"matrix": [8, 1], "x": 208, "y": 42, "flags": 4},
+ {"matrix": [8, 0], "x": 224, "y": 43, "flags": 4},
+ {"matrix": [9, 2], "x": 168, "y": 47, "flags": 4},
+ {"matrix": [9, 3], "x": 152, "y": 58, "flags": 4},
+ {"matrix": [9, 4], "x": 134, "y": 64, "flags": 4},
+ {"matrix": [9, 5], "x": 126, "y": 52, "flags": 4},
+ {"x": 144, "y": 58, "flags": 2},
+ {"x": 184, "y": 50, "flags": 2},
+ {"x": 216, "y": 43, "flags": 2},
+ {"x": 216, "y": 5, "flags": 2},
+ {"x": 184, "y": 1, "flags": 2},
+ {"x": 152, "y": 3, "flags": 2}
+ ],
"max_brightness": 120,
"sleep": true,
"split_count": [34, 34]
diff --git a/keyboards/keebio/iris/rev7/rev7.c b/keyboards/keebio/iris/rev7/rev7.c
index deab7acc8a..197a9dec75 100644
--- a/keyboards/keebio/iris/rev7/rev7.c
+++ b/keyboards/keebio/iris/rev7/rev7.c
@@ -13,59 +13,6 @@ along with this program. If not, see .
*/
#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- // Left Half
- { 0, 1, 2, 3, 4, 5 },
- { 11, 10, 9, 8, 7, 6 },
- { 12, 13, 14, 15, 16, 17 },
- { 23, 22, 21, 20, 19, 18 },
- { NO_LED, NO_LED, 24, 25, 26, 27 },
- // Right Half
- { 34, 35, 36, 37, 38, 39 },
- { 45, 44, 43, 42, 41, 40 },
- { 46, 47, 48, 49, 50, 51 },
- { 57, 56, 55, 54, 53, 52 },
- { NO_LED, NO_LED, 58, 59, 60, 61 }
-}, {
- // LED Index to Physical Position
- // Left Half
- { 0, 5 }, { 16, 5 }, { 32, 2 }, { 48, 0 }, { 64, 2 }, { 80, 3 },
- { 80, 17 }, { 64, 15 }, { 48, 13 }, { 32, 15 }, { 16, 18 }, { 0, 18 },
- { 0, 32 }, { 16, 32 }, { 32, 28 }, { 48, 27 }, { 64, 28 }, { 80, 30 },
- { 80, 43 }, { 64, 42 }, { 48, 40 }, { 32, 42 }, { 16, 45 }, { 0, 45 },
- { 56, 47 }, { 72, 58 }, { 90, 64 }, { 98, 52 },
- { 80, 58 }, { 40, 50 }, { 8, 43 }, { 8, 5 }, { 40, 1 }, { 72, 3 },
- // Right Half
- { 224, 5 }, { 208, 5 }, { 192, 2 }, { 176, 0 }, { 160, 2 }, { 144, 3 },
- { 144, 18 }, { 160, 18 }, { 176, 15 }, { 192, 13 }, { 208, 15 }, { 224, 17 },
- { 224, 32 }, { 208, 32 }, { 192, 28 }, { 176, 27 }, { 160, 28 }, { 144, 30 },
- { 144, 45 }, { 160, 45 }, { 176, 42 }, { 192, 40 }, { 208, 42 }, { 224, 43 },
- { 168, 47 }, { 152, 58 }, { 134, 64 }, { 126, 52 },
- { 144, 58 }, { 184, 50 }, { 216, 43 }, { 216, 5 }, { 184, 1 }, { 152, 3 }
-}, {
- // LED Index to Flag
- // Left Half
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4,
- 2, 2, 2, 2, 2, 2,
- // Right Half
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4,
- 2, 2, 2, 2, 2, 2
-
-} };
-
-
-#endif
-
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/keebio/stick/keyboard.json b/keyboards/keebio/stick/keyboard.json
index b8d1184ec1..00102c565a 100644
--- a/keyboards/keebio/stick/keyboard.json
+++ b/keyboards/keebio/stick/keyboard.json
@@ -54,7 +54,21 @@
"solid_splash": true,
"solid_multisplash": true
},
- "driver": "ws2812"
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 40, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 100, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 140, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 200, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 220, "y": 0, "flags": 4}
+ ]
},
"encoder": {
"rotary": [
diff --git a/keyboards/keebio/stick/stick.c b/keyboards/keebio/stick/stick.c
index 6fac145091..e54a0aa09f 100644
--- a/keyboards/keebio/stick/stick.c
+++ b/keyboards/keebio/stick/stick.c
@@ -17,21 +17,6 @@ along with this program. If not, see .
#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }
-}, {
- // LED Index to Physical Position
- { 0, 0 }, { 20, 0 }, { 40, 0 }, { 60, 0 },
- { 80, 0 }, { 100, 0 }, { 120, 0 }, { 140, 0 },
- { 160, 0 }, { 180, 0 }, { 200, 0 }, { 220, 0 },
-}, {
- // LED Index to Flag
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-} };
-#endif
-
void eeconfig_init_kb(void) {
#ifdef RGBLIGHT_ENABLE
rgblight_enable(); // Enable RGB by default
diff --git a/keyboards/keybee/keybee65/keybee65.c b/keyboards/keybee/keybee65/keybee65.c
deleted file mode 100644
index 6033dbeaaa..0000000000
--- a/keyboards/keybee/keybee65/keybee65.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-#include "quantum.h"
-
-led_config_t g_led_config = {
- {
- // Key Matrix to LED Index
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NO_LED, 13, 14 },
- { 29, NO_LED, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 },
- { 30, NO_LED, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
- { 57, NO_LED, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, NO_LED, 45, 44 },
- { 58, 59, 60, NO_LED, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 }
- }, {
- // LED Index to Physical Position
- { 6, 2 }, { 20, 2 }, { 35, 11 }, { 49, 11 }, { 64, 11 }, { 78, 11 }, { 92, 11 }, { 107, 11 }, { 120, 11 }, { 135, 11 }, { 148, 11 }, { 164, 11 }, { 177, 11 }, { 198, 11 }, { 220, 11 },
- { 9, 24 }, { 26, 24 }, { 42, 24 }, { 56, 24 }, { 70, 24 }, { 85, 24 }, { 100, 24 }, { 113, 24 }, { 128, 24 }, { 143, 24 }, { 156, 24 }, { 170, 24 }, { 184, 24 }, { 202, 24 }, { 220, 24 },
- { 11, 38 }, { 29, 38 }, { 46, 38 }, { 60, 38 }, { 74, 38 }, { 88, 38 }, { 103, 38 }, { 118, 38 }, { 132, 38 }, { 146, 38 }, { 160, 38 }, { 174, 38 }, { 198, 38 }, { 220, 38 },
- { 16, 53 }, { 37, 53 }, { 52, 53 }, { 66, 53 }, { 80, 53 }, { 96, 53 }, { 110, 53 }, { 125, 53 }, { 140, 53 }, { 153, 53 }, { 168, 53 }, { 187, 53 }, { 207, 53 }, { 220, 53 },
- { 6, 68 }, { 25, 68 }, { 44, 68 }, { 96, 68 }, { 148, 68 }, { 164, 68 }, { 180, 68 }, { 192, 68 }, { 207, 68 }, { 220, 68 }
- }, {
- // LED Index to Flag
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
- }
-};
diff --git a/keyboards/keybee/keybee65/keyboard.json b/keyboards/keybee/keybee65/keyboard.json
index a2a4862836..a1f3426dbe 100644
--- a/keyboards/keybee/keybee65/keyboard.json
+++ b/keyboards/keybee/keybee65/keyboard.json
@@ -12,6 +12,76 @@
},
"rgb_matrix": {
"driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 6, "y": 2, "flags": 4},
+ {"matrix": [0, 1], "x": 20, "y": 2, "flags": 4},
+ {"matrix": [0, 2], "x": 35, "y": 11, "flags": 4},
+ {"matrix": [0, 3], "x": 49, "y": 11, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 11, "flags": 4},
+ {"matrix": [0, 5], "x": 78, "y": 11, "flags": 4},
+ {"matrix": [0, 6], "x": 92, "y": 11, "flags": 4},
+ {"matrix": [0, 7], "x": 107, "y": 11, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 11, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 11, "flags": 4},
+ {"matrix": [0, 10], "x": 148, "y": 11, "flags": 4},
+ {"matrix": [0, 11], "x": 164, "y": 11, "flags": 4},
+ {"matrix": [0, 12], "x": 177, "y": 11, "flags": 4},
+ {"matrix": [0, 14], "x": 198, "y": 11, "flags": 4},
+ {"matrix": [0, 15], "x": 220, "y": 11, "flags": 4},
+ {"matrix": [1, 15], "x": 9, "y": 24, "flags": 4},
+ {"matrix": [1, 14], "x": 26, "y": 24, "flags": 4},
+ {"matrix": [1, 13], "x": 42, "y": 24, "flags": 4},
+ {"matrix": [1, 12], "x": 56, "y": 24, "flags": 4},
+ {"matrix": [1, 11], "x": 70, "y": 24, "flags": 4},
+ {"matrix": [1, 10], "x": 85, "y": 24, "flags": 4},
+ {"matrix": [1, 9], "x": 100, "y": 24, "flags": 4},
+ {"matrix": [1, 8], "x": 113, "y": 24, "flags": 4},
+ {"matrix": [1, 7], "x": 128, "y": 24, "flags": 4},
+ {"matrix": [1, 6], "x": 143, "y": 24, "flags": 4},
+ {"matrix": [1, 5], "x": 156, "y": 24, "flags": 4},
+ {"matrix": [1, 4], "x": 170, "y": 24, "flags": 4},
+ {"matrix": [1, 3], "x": 184, "y": 24, "flags": 4},
+ {"matrix": [1, 2], "x": 202, "y": 24, "flags": 4},
+ {"matrix": [1, 0], "x": 220, "y": 24, "flags": 4},
+ {"matrix": [2, 0], "x": 11, "y": 38, "flags": 4},
+ {"matrix": [2, 2], "x": 29, "y": 38, "flags": 4},
+ {"matrix": [2, 3], "x": 46, "y": 38, "flags": 4},
+ {"matrix": [2, 4], "x": 60, "y": 38, "flags": 4},
+ {"matrix": [2, 5], "x": 74, "y": 38, "flags": 4},
+ {"matrix": [2, 6], "x": 88, "y": 38, "flags": 4},
+ {"matrix": [2, 7], "x": 103, "y": 38, "flags": 4},
+ {"matrix": [2, 8], "x": 118, "y": 38, "flags": 4},
+ {"matrix": [2, 9], "x": 132, "y": 38, "flags": 4},
+ {"matrix": [2, 10], "x": 146, "y": 38, "flags": 4},
+ {"matrix": [2, 11], "x": 160, "y": 38, "flags": 4},
+ {"matrix": [2, 12], "x": 174, "y": 38, "flags": 4},
+ {"matrix": [2, 14], "x": 198, "y": 38, "flags": 4},
+ {"matrix": [2, 15], "x": 220, "y": 38, "flags": 4},
+ {"matrix": [3, 15], "x": 16, "y": 53, "flags": 4},
+ {"matrix": [3, 14], "x": 37, "y": 53, "flags": 4},
+ {"matrix": [3, 12], "x": 52, "y": 53, "flags": 4},
+ {"matrix": [3, 11], "x": 66, "y": 53, "flags": 4},
+ {"matrix": [3, 10], "x": 80, "y": 53, "flags": 4},
+ {"matrix": [3, 9], "x": 96, "y": 53, "flags": 4},
+ {"matrix": [3, 8], "x": 110, "y": 53, "flags": 4},
+ {"matrix": [3, 7], "x": 125, "y": 53, "flags": 4},
+ {"matrix": [3, 6], "x": 140, "y": 53, "flags": 4},
+ {"matrix": [3, 5], "x": 153, "y": 53, "flags": 4},
+ {"matrix": [3, 4], "x": 164, "y": 53, "flags": 4},
+ {"matrix": [3, 3], "x": 187, "y": 53, "flags": 4},
+ {"matrix": [3, 2], "x": 207, "y": 53, "flags": 4},
+ {"matrix": [3, 0], "x": 220, "y": 53, "flags": 4},
+ {"matrix": [4, 0], "x": 6, "y": 64, "flags": 4},
+ {"matrix": [4, 1], "x": 25, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 44, "y": 64, "flags": 4},
+ {"matrix": [4, 7], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 10], "x": 148, "y": 64, "flags": 4},
+ {"matrix": [4, 11], "x": 164, "y": 64, "flags": 4},
+ {"matrix": [4, 12], "x": 180, "y": 64, "flags": 4},
+ {"matrix": [4, 13], "x": 192, "y": 64, "flags": 4},
+ {"matrix": [4, 14], "x": 207, "y": 64, "flags": 4},
+ {"matrix": [4, 15], "x": 220, "y": 64, "flags": 4}
+ ],
"sleep": true
},
"rgblight": {
diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c
deleted file mode 100644
index c99a966603..0000000000
--- a/keyboards/keycapsss/kimiko/kimiko.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2023 @BenRoe (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
- #include "quantum.h"
-
-#ifdef KEYBOARD_keycapsss_kimiko_rev1
-#ifdef RGB_MATRIX_ENABLE
-
-//Thanks to Ben (keycapsss) for helpipng me to create g_led_config
-
-// Physical LED position
-// X 0 16 32 48 64 80 96 112 128 144 160 176 208 224
-// -----------------------------------------------------------| Y
-// 5 4 3 2 1 0 0 1 2 3 4 5 | 0
-// 6 7 8 9 10 11 11 10 9 8 7 6 | 16
-// 17 16 15 14 13 12 12 13 14 15 16 17 | 32
-// 18 19 20 21 22 23 24 24 23 22 21 20 19 18 | 48
-// 29 28 27 26 25 25 26 27 28 29 | 64
-
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { 5, 4, 3, 2, 1, 0 },
- { 6, 7, 8, 9, 10, 11 },
- { 17, 16, 15, 14, 13, 12 },
- { 18, 19, 20, 21, 22, 23 },
- { 29, 28, 27, 26, 25, 24 },
- { 35, 34, 33, 32, 31, 30 },
- { 36, 37, 38, 39, 40, 41 },
- { 47, 46, 45, 44, 43, 42 },
- { 48, 49, 50, 51, 52, 53 },
- { 59, 58, 57, 56, 55, 54 }
-}, {
- // LED Index to Physical Position
- // Left half
- { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 },
- { 0, 16 }, { 16, 16 }, { 32, 16 }, { 48, 16 }, { 64, 16 }, { 80, 16 },
- { 80, 32 }, { 64, 32 }, { 48, 32 }, { 32, 32 }, { 16, 32 }, { 0, 32 },
- { 0, 48 }, { 16, 48 }, { 32, 48 }, { 48, 48 }, { 64, 48 }, { 80, 48 },
- { 96, 48 }, { 96, 64 }, { 80, 64 }, { 64, 64 }, { 48, 64 }, { 32, 64 },
- // Right half
- { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 208, 0 }, { 224, 0 },
- { 224, 16 }, { 208, 16 }, { 176, 16 }, { 160, 16 }, { 144, 16 }, { 128, 16 },
- { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 }, { 208, 32 }, { 224, 32 },
- { 224, 48 }, { 208, 48 }, { 176, 48 }, { 160, 48 }, { 144, 48 }, { 128, 48 },
- { 112, 48 }, { 112, 64 }, { 128, 64 }, { 144, 64 }, { 160, 64 }, { 176, 64 }
-
-}, {
- // LED Index to Flag
- // 0x01 = 1 = modifier key
- // 0x02 = 2 = underglow
- // 0x04 = 4 = key backlight
- // 0x08 = 8 = keyboard state indication
- // Left half
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 1,
- 4, 4, 4, 4, 4, 1,
- 4, 4, 1, 1, 1, 1,
- // Right half
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4,
- 1, 4, 4, 4, 4, 4,
- 4, 4, 1, 1, 1, 1
-} };
-
-#endif // RGB_MATRIX_ENABLE
-#endif // KEYBOARD_keycapsss_kimiko_rev1
-
-
diff --git a/keyboards/keycapsss/kimiko/rev1/keyboard.json b/keyboards/keycapsss/kimiko/rev1/keyboard.json
index ae09eb83c8..bf9aa76ed7 100644
--- a/keyboards/keycapsss/kimiko/rev1/keyboard.json
+++ b/keyboards/keycapsss/kimiko/rev1/keyboard.json
@@ -40,6 +40,71 @@
"led_count": 60,
"split_count": [30, 30]
},
+ "rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 48, "flags": 1},
+ {"matrix": [4, 5], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [4, 4], "x": 96, "y": 64, "flags": 4},
+ {"matrix": [4, 3], "x": 80, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 64, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 48, "y": 64, "flags": 1},
+ {"matrix": [4, 0], "x": 32, "y": 64, "flags": 1},
+ {"matrix": [5, 5], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [5, 3], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [5, 2], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [5, 1], "x": 208, "y": 0, "flags": 4},
+ {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [6, 1], "x": 208, "y": 16, "flags": 4},
+ {"matrix": [6, 2], "x": 176, "y": 16, "flags": 4},
+ {"matrix": [6, 3], "x": 160, "y": 16, "flags": 4},
+ {"matrix": [6, 4], "x": 144, "y": 16, "flags": 4},
+ {"matrix": [6, 5], "x": 128, "y": 16, "flags": 4},
+ {"matrix": [7, 5], "x": 128, "y": 32, "flags": 4},
+ {"matrix": [7, 4], "x": 144, "y": 32, "flags": 4},
+ {"matrix": [7, 3], "x": 160, "y": 32, "flags": 4},
+ {"matrix": [7, 2], "x": 176, "y": 32, "flags": 4},
+ {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
+ {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [8, 0], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4},
+ {"matrix": [8, 2], "x": 176, "y": 48, "flags": 4},
+ {"matrix": [8, 3], "x": 160, "y": 48, "flags": 4},
+ {"matrix": [8, 4], "x": 144, "y": 48, "flags": 4},
+ {"matrix": [8, 5], "x": 128, "y": 48, "flags": 4},
+ {"matrix": [9, 5], "x": 112, "y": 48, "flags": 4},
+ {"matrix": [9, 4], "x": 112, "y": 64, "flags": 4},
+ {"matrix": [9, 3], "x": 128, "y": 64, "flags": 1},
+ {"matrix": [9, 2], "x": 144, "y": 64, "flags": 1},
+ {"matrix": [9, 1], "x": 160, "y": 64, "flags": 1},
+ {"matrix": [9, 0], "x": 176, "y": 64, "flags": 1}
+ ]
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
index a4432cd4ce..5359d2b30b 100644
--- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
@@ -121,37 +121,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{1, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
{1, CB6_CA1, CB4_CA1, CB5_CA1}, // Right
};
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
- {
- // Key Matrix to LED Index
- { __, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
- { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46 },
- { 47, 48, 49, 50, 51, 52, 53, __, 54, 55, 56, 57, 58, 59, 60, 61 },
- { 62, 63, __, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76 },
- { 77, 78, 79, 80, 81, __, __, 82, 83, 84, __, __, __, 85, 86, 87 },
- },
- {
- // LED Index to Physical Position
- {19,0}, {34,0}, {46,0}, {60,1}, {72,3}, {87,6}, {99,8}, {120,8}, {132,6}, {147,3}, {159,1}, {173,0}, {185,0}, {201,1}, {219,1},
- {5,14}, {24,14}, {36,14}, {48,13}, {62,15}, {74,17}, {86,20}, {98,22}, {115,22}, {127,20}, {139,17}, {151,15}, {165,13}, {177,14}, {195,14}, {220,13},
- {4,24}, {24,24}, {40,24}, {53,24}, {65,27}, {77,29}, {89,31}, {112,33}, {124,31}, {136,29}, {148,27}, {160,24}, {174,24}, {186,24}, {201,24}, {222,25},
- {2,34}, {23,34}, {40,34}, {54,35}, {66,37}, {78,39}, {90,42}, {118,43}, {130,40}, {142,38}, {154,36}, {167,35}, {179,35}, {199,35}, {224,36},
- {0,45}, {24,45}, {44,45}, {57,46}, {69,48}, {81,51}, {93,53}, {111,54}, {123,52}, {135,50}, {147,48}, {159,46}, {173,45}, {190,45}, {210,47},
- {0,55}, {18,55}, {33,55}, {56,57}, {77,61}, {97,64}, {124,63}, {147,59}, {198,58}, {210,58}, {222,58},
- },
- {
- // RGB LED Index to Flag
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1,
- }
-};
-
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/ansi_encoder/keyboard.json b/keyboards/keychron/q10/ansi_encoder/keyboard.json
index f47136edf7..6cfb637b0d 100644
--- a/keyboards/keychron/q10/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q10/ansi_encoder/keyboard.json
@@ -27,6 +27,98 @@
"encoder": true,
"dip_switch": true
},
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 1], "x": 19, "y": 0, "flags": 1},
+ {"matrix": [0, 2], "x": 34, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 46, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 60, "y": 1, "flags": 1},
+ {"matrix": [0, 5], "x": 72, "y": 3, "flags": 1},
+ {"matrix": [0, 6], "x": 87, "y": 6, "flags": 1},
+ {"matrix": [0, 7], "x": 99, "y": 8, "flags": 1},
+ {"matrix": [0, 8], "x": 120, "y": 8, "flags": 1},
+ {"matrix": [0, 9], "x": 132, "y": 6, "flags": 1},
+ {"matrix": [0, 10], "x": 147, "y": 3, "flags": 1},
+ {"matrix": [0, 11], "x": 159, "y": 1, "flags": 1},
+ {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+ {"matrix": [0, 13], "x": 185, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 201, "y": 1, "flags": 1},
+ {"matrix": [0, 15], "x": 219, "y": 1, "flags": 1},
+ {"matrix": [1, 0], "x": 5, "y": 14, "flags": 1},
+ {"matrix": [1, 1], "x": 24, "y": 14, "flags": 1},
+ {"matrix": [1, 2], "x": 36, "y": 14, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+ {"matrix": [1, 4], "x": 62, "y": 15, "flags": 4},
+ {"matrix": [1, 5], "x": 74, "y": 17, "flags": 4},
+ {"matrix": [1, 6], "x": 86, "y": 20, "flags": 4},
+ {"matrix": [1, 7], "x": 98, "y": 22, "flags": 4},
+ {"matrix": [1, 8], "x": 115, "y": 22, "flags": 4},
+ {"matrix": [1, 9], "x": 127, "y": 20, "flags": 4},
+ {"matrix": [1, 10], "x": 139, "y": 17, "flags": 4},
+ {"matrix": [1, 11], "x": 151, "y": 15, "flags": 4},
+ {"matrix": [1, 12], "x": 165, "y": 13, "flags": 4},
+ {"matrix": [1, 13], "x": 177, "y": 14, "flags": 4},
+ {"matrix": [1, 14], "x": 195, "y": 14, "flags": 1},
+ {"matrix": [1, 15], "x": 220, "y": 13, "flags": 1},
+ {"matrix": [2, 0], "x": 4, "y": 24, "flags": 1},
+ {"matrix": [2, 1], "x": 24, "y": 24, "flags": 1},
+ {"matrix": [2, 2], "x": 40, "y": 24, "flags": 4},
+ {"matrix": [2, 3], "x": 53, "y": 24, "flags": 4},
+ {"matrix": [2, 4], "x": 65, "y": 27, "flags": 4},
+ {"matrix": [2, 5], "x": 77, "y": 29, "flags": 4},
+ {"matrix": [2, 6], "x": 89, "y": 31, "flags": 4},
+ {"matrix": [2, 7], "x": 112, "y": 33, "flags": 4},
+ {"matrix": [2, 8], "x": 124, "y": 31, "flags": 4},
+ {"matrix": [2, 9], "x": 136, "y": 29, "flags": 4},
+ {"matrix": [2, 10], "x": 148, "y": 27, "flags": 4},
+ {"matrix": [2, 11], "x": 160, "y": 24, "flags": 4},
+ {"matrix": [2, 12], "x": 174, "y": 24, "flags": 4},
+ {"matrix": [2, 13], "x": 186, "y": 24, "flags": 4},
+ {"matrix": [2, 14], "x": 201, "y": 24, "flags": 4},
+ {"matrix": [2, 15], "x": 222, "y": 25, "flags": 1},
+ {"matrix": [3, 0], "x": 2, "y": 34, "flags": 1},
+ {"matrix": [3, 1], "x": 23, "y": 34, "flags": 8},
+ {"matrix": [3, 2], "x": 40, "y": 34, "flags": 4},
+ {"matrix": [3, 3], "x": 54, "y": 35, "flags": 4},
+ {"matrix": [3, 4], "x": 66, "y": 37, "flags": 4},
+ {"matrix": [3, 5], "x": 78, "y": 39, "flags": 4},
+ {"matrix": [3, 6], "x": 90, "y": 42, "flags": 4},
+ {"matrix": [3, 8], "x": 118, "y": 43, "flags": 4},
+ {"matrix": [3, 9], "x": 130, "y": 40, "flags": 4},
+ {"matrix": [3, 10], "x": 142, "y": 38, "flags": 4},
+ {"matrix": [3, 11], "x": 154, "y": 36, "flags": 4},
+ {"matrix": [3, 12], "x": 167, "y": 35, "flags": 4},
+ {"matrix": [3, 13], "x": 179, "y": 35, "flags": 4},
+ {"matrix": [3, 14], "x": 199, "y": 35, "flags": 1},
+ {"matrix": [3, 15], "x": 224, "y": 36, "flags": 1},
+ {"matrix": [4, 0], "x": 0, "y": 45, "flags": 1},
+ {"matrix": [4, 1], "x": 24, "y": 45, "flags": 1},
+ {"matrix": [4, 3], "x": 44, "y": 45, "flags": 4},
+ {"matrix": [4, 4], "x": 57, "y": 46, "flags": 4},
+ {"matrix": [4, 5], "x": 69, "y": 48, "flags": 4},
+ {"matrix": [4, 6], "x": 81, "y": 51, "flags": 4},
+ {"matrix": [4, 7], "x": 93, "y": 53, "flags": 4},
+ {"matrix": [4, 8], "x": 111, "y": 54, "flags": 4},
+ {"matrix": [4, 9], "x": 123, "y": 52, "flags": 4},
+ {"matrix": [4, 10], "x": 135, "y": 50, "flags": 4},
+ {"matrix": [4, 11], "x": 147, "y": 48, "flags": 4},
+ {"matrix": [4, 12], "x": 159, "y": 46, "flags": 4},
+ {"matrix": [4, 13], "x": 173, "y": 45, "flags": 4},
+ {"matrix": [4, 14], "x": 190, "y": 45, "flags": 1},
+ {"matrix": [4, 15], "x": 210, "y": 47, "flags": 1},
+ {"matrix": [5, 0], "x": 0, "y": 55, "flags": 1},
+ {"matrix": [5, 1], "x": 18, "y": 55, "flags": 1},
+ {"matrix": [5, 2], "x": 33, "y": 55, "flags": 1},
+ {"matrix": [5, 3], "x": 56, "y": 57, "flags": 1},
+ {"matrix": [5, 4], "x": 77, "y": 61, "flags": 4},
+ {"matrix": [5, 7], "x": 97, "y": 64, "flags": 1},
+ {"matrix": [5, 8], "x": 124, "y": 63, "flags": 4},
+ {"matrix": [5, 9], "x": 147, "y": 59, "flags": 1},
+ {"matrix": [5, 13], "x": 198, "y": 58, "flags": 1},
+ {"matrix": [5, 14], "x": 210, "y": 58, "flags": 1},
+ {"matrix": [5, 15], "x": 222, "y": 58, "flags": 1}
+ ]
+ },
"layouts": {
"LAYOUT_ansi_89": {
"layout": [
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.c b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
index 9ff43263b2..c857c854ac 100644
--- a/keyboards/keychron/q10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
@@ -122,37 +122,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{1, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
{1, CB6_CA1, CB4_CA1, CB5_CA1}, // Right
};
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
- {
- // Key Matrix to LED Index
- { __, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
- { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 59, 45 },
- { 46, 47, 48, 49, 50, 51, 52, __, 53, 54, 55, 56, 57, 58, 60, 61 },
- { 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77 },
- { 78, 79, 80, 81, 82, __, __, 83, 84, 85, __, __, __, 86, 87, 88 },
- },
- {
- // LED Index to Physical Position
- {0,0}, {19,0}, {34,0}, {60,1}, {72,3}, {87,6}, {99,8}, {120,8}, {132,6}, {147,3}, {159,1}, {173,0}, {185,0}, {201,1}, {219,1},
- {5,14}, {24,14}, {36,14}, {48,13}, {62,15}, {74,17}, {86,20}, {98,22}, {115,22}, {127,20}, {139,17}, {151,15}, {165,13}, {177,14}, {195,14}, {220,15},
- {4,24}, {24,24}, {40,24}, {53,24}, {65,27}, {77,29}, {89,31}, {112,33}, {124,31}, {136,29}, {148,27}, {160,24}, {176,24}, {189,24}, {222,25},
- {2,34}, {23,34}, {40,34}, {54,35}, {66,37}, {78,39}, {90,42}, {118,43}, {130,40}, {142,38}, {154,36}, {167,35}, {179,35}, {192,35}, {208,31}, {224,36},
- {0,45}, {18,45}, {31,45}, {44,45}, {57,46}, {69,48}, {81,51}, {93,53}, {111,54}, {123,52}, {135,50}, {147,48}, {159,46}, {173,45}, {190,45}, {210,47},
- {0,55}, {18,55}, {33,55}, {56,57}, {77,61}, {97,64}, {124,63}, {147,59}, {198,58}, {210,58}, {222,58},
- },
- {
- // RGB LED Index to Flag
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1,
- }
-};
-
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/iso_encoder/keyboard.json b/keyboards/keychron/q10/iso_encoder/keyboard.json
index 5ec70d1a14..b83015971f 100644
--- a/keyboards/keychron/q10/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q10/iso_encoder/keyboard.json
@@ -27,6 +27,99 @@
"encoder": true,
"dip_switch": true
},
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 2], "x": 19, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 34, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 60, "y": 1, "flags": 1},
+ {"matrix": [0, 5], "x": 72, "y": 3, "flags": 1},
+ {"matrix": [0, 6], "x": 87, "y": 6, "flags": 1},
+ {"matrix": [0, 7], "x": 99, "y": 8, "flags": 1},
+ {"matrix": [0, 8], "x": 120, "y": 8, "flags": 1},
+ {"matrix": [0, 9], "x": 132, "y": 6, "flags": 1},
+ {"matrix": [0, 10], "x": 147, "y": 3, "flags": 1},
+ {"matrix": [0, 11], "x": 159, "y": 1, "flags": 1},
+ {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+ {"matrix": [0, 13], "x": 185, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 201, "y": 1, "flags": 1},
+ {"matrix": [0, 15], "x": 219, "y": 1, "flags": 1},
+ {"matrix": [1, 0], "x": 5, "y": 14, "flags": 1},
+ {"matrix": [1, 1], "x": 24, "y": 14, "flags": 1},
+ {"matrix": [1, 2], "x": 36, "y": 14, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+ {"matrix": [1, 4], "x": 62, "y": 15, "flags": 4},
+ {"matrix": [1, 5], "x": 74, "y": 17, "flags": 4},
+ {"matrix": [1, 6], "x": 86, "y": 20, "flags": 4},
+ {"matrix": [1, 7], "x": 98, "y": 22, "flags": 4},
+ {"matrix": [1, 8], "x": 115, "y": 22, "flags": 4},
+ {"matrix": [1, 9], "x": 127, "y": 20, "flags": 4},
+ {"matrix": [1, 10], "x": 139, "y": 17, "flags": 4},
+ {"matrix": [1, 11], "x": 151, "y": 15, "flags": 4},
+ {"matrix": [1, 12], "x": 165, "y": 13, "flags": 4},
+ {"matrix": [1, 13], "x": 177, "y": 14, "flags": 4},
+ {"matrix": [1, 14], "x": 195, "y": 14, "flags": 1},
+ {"matrix": [1, 15], "x": 220, "y": 15, "flags": 1},
+ {"matrix": [2, 0], "x": 4, "y": 24, "flags": 1},
+ {"matrix": [2, 1], "x": 24, "y": 24, "flags": 1},
+ {"matrix": [2, 2], "x": 40, "y": 24, "flags": 4},
+ {"matrix": [2, 3], "x": 53, "y": 24, "flags": 4},
+ {"matrix": [2, 4], "x": 65, "y": 27, "flags": 4},
+ {"matrix": [2, 5], "x": 77, "y": 29, "flags": 4},
+ {"matrix": [2, 6], "x": 89, "y": 31, "flags": 4},
+ {"matrix": [2, 7], "x": 112, "y": 33, "flags": 4},
+ {"matrix": [2, 8], "x": 124, "y": 31, "flags": 4},
+ {"matrix": [2, 9], "x": 136, "y": 29, "flags": 4},
+ {"matrix": [2, 10], "x": 148, "y": 27, "flags": 4},
+ {"matrix": [2, 11], "x": 160, "y": 24, "flags": 4},
+ {"matrix": [2, 12], "x": 176, "y": 24, "flags": 4},
+ {"matrix": [2, 13], "x": 189, "y": 24, "flags": 4},
+ {"matrix": [2, 15], "x": 222, "y": 25, "flags": 1},
+ {"matrix": [3, 0], "x": 2, "y": 34, "flags": 1},
+ {"matrix": [3, 1], "x": 23, "y": 34, "flags": 8},
+ {"matrix": [3, 2], "x": 40, "y": 34, "flags": 4},
+ {"matrix": [3, 3], "x": 54, "y": 35, "flags": 4},
+ {"matrix": [3, 4], "x": 66, "y": 37, "flags": 4},
+ {"matrix": [3, 5], "x": 78, "y": 39, "flags": 4},
+ {"matrix": [3, 6], "x": 90, "y": 42, "flags": 4},
+ {"matrix": [3, 8], "x": 118, "y": 43, "flags": 4},
+ {"matrix": [3, 9], "x": 130, "y": 40, "flags": 4},
+ {"matrix": [3, 10], "x": 142, "y": 38, "flags": 4},
+ {"matrix": [3, 11], "x": 154, "y": 36, "flags": 4},
+ {"matrix": [3, 12], "x": 167, "y": 35, "flags": 4},
+ {"matrix": [3, 13], "x": 179, "y": 35, "flags": 4},
+ {"matrix": [2, 14], "x": 192, "y": 35, "flags": 4},
+ {"matrix": [3, 14], "x": 208, "y": 31, "flags": 1},
+ {"matrix": [3, 15], "x": 224, "y": 36, "flags": 1},
+ {"matrix": [4, 0], "x": 0, "y": 45, "flags": 1},
+ {"matrix": [4, 1], "x": 18, "y": 45, "flags": 1},
+ {"matrix": [4, 2], "x": 31, "y": 45, "flags": 4},
+ {"matrix": [4, 3], "x": 44, "y": 45, "flags": 4},
+ {"matrix": [4, 4], "x": 57, "y": 46, "flags": 4},
+ {"matrix": [4, 5], "x": 69, "y": 48, "flags": 4},
+ {"matrix": [4, 6], "x": 81, "y": 51, "flags": 4},
+ {"matrix": [4, 7], "x": 93, "y": 53, "flags": 4},
+ {"matrix": [4, 8], "x": 111, "y": 54, "flags": 4},
+ {"matrix": [4, 9], "x": 123, "y": 52, "flags": 4},
+ {"matrix": [4, 10], "x": 135, "y": 50, "flags": 4},
+ {"matrix": [4, 11], "x": 147, "y": 48, "flags": 4},
+ {"matrix": [4, 12], "x": 159, "y": 46, "flags": 4},
+ {"matrix": [4, 13], "x": 173, "y": 45, "flags": 4},
+ {"matrix": [4, 14], "x": 190, "y": 45, "flags": 1},
+ {"matrix": [4, 15], "x": 210, "y": 47, "flags": 1},
+ {"matrix": [5, 0], "x": 0, "y": 55, "flags": 1},
+ {"matrix": [5, 1], "x": 18, "y": 55, "flags": 1},
+ {"matrix": [5, 2], "x": 33, "y": 55, "flags": 1},
+ {"matrix": [5, 3], "x": 56, "y": 57, "flags": 1},
+ {"matrix": [5, 4], "x": 77, "y": 61, "flags": 4},
+ {"matrix": [5, 7], "x": 97, "y": 64, "flags": 1},
+ {"matrix": [5, 8], "x": 124, "y": 63, "flags": 4},
+ {"matrix": [5, 9], "x": 147, "y": 59, "flags": 1},
+ {"matrix": [5, 13], "x": 198, "y": 58, "flags": 1},
+ {"matrix": [5, 14], "x": 210, "y": 58, "flags": 1},
+ {"matrix": [5, 15], "x": 222, "y": 58, "flags": 1}
+ ]
+ },
"layouts": {
"LAYOUT_iso_90": {
"layout": [
diff --git a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
index ba32f58fc6..35e8414be6 100644
--- a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
@@ -135,36 +135,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{1, CB12_CA6, CB10_CA6, CB11_CA6}, // Down
{1, CB12_CA7, CB10_CA7, CB11_CA7}, // Right
};
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
- {
- // Key Matrix to LED Index
- { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, __, 0, 1 },
- { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 18, 19, 20 },
- { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 37, 38, 39 },
- { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 76, 71, 72, 56, 57, 58 },
- { 77, __, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, __, 88, 89, 73, 74, 75 },
- { 92, 93, 94, __, __, 21, 95, 40, __, 96, 97, 98, 99, 100, 101, 90, 2, 91 },
- },
- {
- // LED Index to Physical Position
- {11,0}, {23,0}, {34,0}, {49,0}, {63,0}, {75,0}, {86,0}, {98,0}, {112,0}, {123,0}, {135,0}, {146,0}, {161,0}, {172,0}, {184,0}, {195,0}, {209,0}, {224,0},
- {0,15}, {11,15}, {23,15}, {34,15}, {49,15}, {60,15}, {72,15}, {83,15}, {95,15}, {106,15}, {118,15}, {129,15}, {141,15}, {152,15}, {164,15}, {175,15}, {186,15}, {204,15}, {224,15},
- {0,26}, {11,26}, {23,26}, {34,32}, {52,26}, {66,26}, {78,26}, {89,26}, {101,26}, {112,26}, {123,26}, {135,26}, {146,26}, {158,26}, {169,26}, {181,26}, {192,26}, {207,26}, {224,26},
- {0,38}, {11,38}, {23,38}, {53,38}, {69,38}, {81,38}, {92,38}, {103,38}, {115,38}, {126,38}, {138,38}, {149,38}, {161,38}, {172,38}, {184,38}, {202,38}, {224,38},
- {0,49}, {11,49}, {23,49}, {34,55}, {56,49}, {75,49}, {86,49}, {98,49}, {109,49}, {121,49}, {132,49}, {144,49}, {155,49}, {166,49}, {178,49}, {194,49}, {213,52},
- {6,61}, {23,61}, {50,61}, {65,61}, {79,61}, {122,61}, {163,61}, {175,61}, {186,61}, {201,64}, {213,64}, {224,64},
- },
- {
- // RGB LED Index to Flag
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 4, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 4, 4, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1,
- }
-};
#endif
diff --git a/keyboards/keychron/q12/ansi_encoder/keyboard.json b/keyboards/keychron/q12/ansi_encoder/keyboard.json
index d2f90cb8ac..faf8b5527e 100644
--- a/keyboards/keychron/q12/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q12/ansi_encoder/keyboard.json
@@ -24,6 +24,112 @@
"encoder": true,
"dip_switch": true
},
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 16], "x": 11, "y": 0, "flags": 1},
+ {"matrix": [0, 17], "x": 23, "y": 0, "flags": 1},
+ {"matrix": [5, 16], "x": 34, "y": 0, "flags": 1},
+ {"matrix": [0, 0], "x": 49, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 63, "y": 0, "flags": 1},
+ {"matrix": [0, 2], "x": 75, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 86, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 98, "y": 0, "flags": 1},
+ {"matrix": [0, 5], "x": 112, "y": 0, "flags": 1},
+ {"matrix": [0, 6], "x": 123, "y": 0, "flags": 1},
+ {"matrix": [0, 7], "x": 135, "y": 0, "flags": 1},
+ {"matrix": [0, 8], "x": 146, "y": 0, "flags": 1},
+ {"matrix": [0, 9], "x": 161, "y": 0, "flags": 1},
+ {"matrix": [0, 10], "x": 172, "y": 0, "flags": 1},
+ {"matrix": [0, 11], "x": 184, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 195, "y": 0, "flags": 1},
+ {"matrix": [0, 13], "x": 209, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 15], "x": 0, "y": 15, "flags": 8},
+ {"matrix": [1, 16], "x": 11, "y": 15, "flags": 4},
+ {"matrix": [1, 17], "x": 23, "y": 15, "flags": 4},
+ {"matrix": [5, 5], "x": 34, "y": 15, "flags": 4},
+ {"matrix": [1, 0], "x": 49, "y": 15, "flags": 4},
+ {"matrix": [1, 1], "x": 60, "y": 15, "flags": 4},
+ {"matrix": [1, 2], "x": 72, "y": 15, "flags": 4},
+ {"matrix": [1, 3], "x": 83, "y": 15, "flags": 4},
+ {"matrix": [1, 4], "x": 95, "y": 15, "flags": 4},
+ {"matrix": [1, 5], "x": 106, "y": 15, "flags": 4},
+ {"matrix": [1, 6], "x": 118, "y": 15, "flags": 4},
+ {"matrix": [1, 7], "x": 129, "y": 15, "flags": 4},
+ {"matrix": [1, 8], "x": 141, "y": 15, "flags": 4},
+ {"matrix": [1, 9], "x": 152, "y": 15, "flags": 4},
+ {"matrix": [1, 10], "x": 164, "y": 15, "flags": 4},
+ {"matrix": [1, 11], "x": 175, "y": 15, "flags": 4},
+ {"matrix": [1, 12], "x": 186, "y": 15, "flags": 4},
+ {"matrix": [1, 13], "x": 204, "y": 15, "flags": 1},
+ {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+ {"matrix": [2, 15], "x": 0, "y": 26, "flags": 4},
+ {"matrix": [2, 16], "x": 11, "y": 26, "flags": 4},
+ {"matrix": [2, 17], "x": 23, "y": 26, "flags": 4},
+ {"matrix": [5, 7], "x": 34, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 52, "y": 26, "flags": 1},
+ {"matrix": [2, 1], "x": 66, "y": 26, "flags": 4},
+ {"matrix": [2, 2], "x": 78, "y": 26, "flags": 4},
+ {"matrix": [2, 3], "x": 89, "y": 26, "flags": 4},
+ {"matrix": [2, 4], "x": 101, "y": 26, "flags": 4},
+ {"matrix": [2, 5], "x": 112, "y": 26, "flags": 4},
+ {"matrix": [2, 6], "x": 123, "y": 26, "flags": 4},
+ {"matrix": [2, 7], "x": 135, "y": 26, "flags": 4},
+ {"matrix": [2, 8], "x": 146, "y": 26, "flags": 4},
+ {"matrix": [2, 9], "x": 158, "y": 26, "flags": 4},
+ {"matrix": [2, 10], "x": 169, "y": 26, "flags": 4},
+ {"matrix": [2, 11], "x": 181, "y": 26, "flags": 4},
+ {"matrix": [2, 12], "x": 192, "y": 26, "flags": 4},
+ {"matrix": [2, 13], "x": 207, "y": 26, "flags": 4},
+ {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+ {"matrix": [3, 15], "x": 0, "y": 38, "flags": 4},
+ {"matrix": [3, 16], "x": 11, "y": 38, "flags": 4},
+ {"matrix": [3, 17], "x": 23, "y": 38, "flags": 4},
+ {"matrix": [3, 0], "x": 53, "y": 38, "flags": 8},
+ {"matrix": [3, 1], "x": 69, "y": 38, "flags": 4},
+ {"matrix": [3, 2], "x": 81, "y": 38, "flags": 4},
+ {"matrix": [3, 3], "x": 92, "y": 38, "flags": 4},
+ {"matrix": [3, 4], "x": 103, "y": 38, "flags": 4},
+ {"matrix": [3, 5], "x": 115, "y": 38, "flags": 4},
+ {"matrix": [3, 6], "x": 126, "y": 38, "flags": 4},
+ {"matrix": [3, 7], "x": 138, "y": 38, "flags": 4},
+ {"matrix": [3, 8], "x": 149, "y": 38, "flags": 4},
+ {"matrix": [3, 9], "x": 161, "y": 38, "flags": 4},
+ {"matrix": [3, 10], "x": 172, "y": 38, "flags": 4},
+ {"matrix": [3, 11], "x": 184, "y": 38, "flags": 4},
+ {"matrix": [3, 13], "x": 202, "y": 38, "flags": 1},
+ {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+ {"matrix": [4, 15], "x": 0, "y": 49, "flags": 4},
+ {"matrix": [4, 16], "x": 11, "y": 49, "flags": 4},
+ {"matrix": [4, 17], "x": 23, "y": 49, "flags": 4},
+ {"matrix": [3, 12], "x": 34, "y": 55, "flags": 4},
+ {"matrix": [4, 0], "x": 56, "y": 49, "flags": 1},
+ {"matrix": [4, 2], "x": 75, "y": 49, "flags": 4},
+ {"matrix": [4, 3], "x": 86, "y": 49, "flags": 4},
+ {"matrix": [4, 4], "x": 98, "y": 49, "flags": 4},
+ {"matrix": [4, 5], "x": 109, "y": 49, "flags": 4},
+ {"matrix": [4, 6], "x": 121, "y": 49, "flags": 4},
+ {"matrix": [4, 7], "x": 132, "y": 49, "flags": 4},
+ {"matrix": [4, 8], "x": 144, "y": 49, "flags": 4},
+ {"matrix": [4, 9], "x": 155, "y": 49, "flags": 4},
+ {"matrix": [4, 10], "x": 166, "y": 49, "flags": 4},
+ {"matrix": [4, 11], "x": 178, "y": 49, "flags": 4},
+ {"matrix": [4, 13], "x": 194, "y": 49, "flags": 1},
+ {"matrix": [4, 14], "x": 213, "y": 52, "flags": 1},
+ {"matrix": [5, 15], "x": 6, "y": 61, "flags": 4},
+ {"matrix": [5, 17], "x": 23, "y": 61, "flags": 4},
+ {"matrix": [5, 0], "x": 50, "y": 61, "flags": 1},
+ {"matrix": [5, 1], "x": 65, "y": 61, "flags": 1},
+ {"matrix": [5, 2], "x": 79, "y": 61, "flags": 1},
+ {"matrix": [5, 6], "x": 122, "y": 61, "flags": 4},
+ {"matrix": [5, 9], "x": 163, "y": 61, "flags": 1},
+ {"matrix": [5, 10], "x": 175, "y": 61, "flags": 4},
+ {"matrix": [5, 11], "x": 186, "y": 61, "flags": 1},
+ {"matrix": [5, 12], "x": 201, "y": 64, "flags": 1},
+ {"matrix": [5, 13], "x": 213, "y": 64, "flags": 1},
+ {"matrix": [5, 14], "x": 224, "y": 64, "flags": 1}
+ ]
+ },
"layouts": {
"LAYOUT_ansi_103": {
"layout": [
diff --git a/keyboards/keychron/q12/iso_encoder/iso_encoder.c b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
index f9513e7f41..058a5d2ff4 100644
--- a/keyboards/keychron/q12/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
@@ -138,36 +138,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{1, CB12_CA6, CB10_CA6, CB11_CA6}, // Down
{1, CB12_CA7, CB10_CA7, CB11_CA7}, // Right
};
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
- {
- // Key Matrix to LED Index
- { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, __, 0, 1 },
- { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 18, 19, 20 },
- { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 71, 54, 37, 38, 39 },
- { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 76, 70, 72, 55, 56, 57 },
- { 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, __, 89, 90, 73, 74, 75 },
- { 93, 94, 95, __, __, 21, 96, 40, __, 97, 98, 99, 100, 101, 102, 91, 2, 92 },
- },
- {
- // LED Index to Physical Position
- {11,0}, {23,0}, {34,0}, {49,0}, {63,0}, {75,0}, {86,0}, {98,0}, {112,0}, {123,0}, {135,0}, {146,0}, {160,0}, {172,0}, {183,0}, {194,0}, {209,0}, {224,0},
- {0,15}, {11,15}, {23,15}, {34,15}, {49,15}, {60,15}, {72,15}, {83,15}, {95,15}, {106,15}, {117,15}, {129,15}, {140,15}, {152,15}, {163,15}, {175,15}, {186,15}, {204,15}, {224,15},
- {0,26}, {11,26}, {23,26}, {34,32}, {52,26}, {66,26}, {77,26}, {89,26}, {100,26}, {112,26}, {123,26}, {135,26}, {146,26}, {158,26}, {169,26}, {180,26}, {192,26}, {224,26},
- {0,38}, {11,38}, {23,38}, {53,38}, {69,38}, {80,38}, {92,38}, {103,38}, {115,38}, {126,38}, {137,38}, {149,38}, {160,38}, {172,38}, {183,38}, {195,38}, {210,34}, {224,38},
- {0,49}, {11,49}, {23,49}, {34,55}, {50,49}, {63,49}, {75,49}, {86,49}, {97,49}, {109,49}, {120,49}, {132,49}, {143,49}, {155,49}, {166,49}, {177,49}, {193,49}, {212,52},
- {6,61}, {23,61}, {50,61}, {65,61}, {79,61}, {122,61}, {163,61}, {174,61}, {186,61}, {201,64}, {212,64}, {223,64},
- },
- {
- // RGB LED Index to Flag
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 4, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 4, 4, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1,
- }
-};
#endif
diff --git a/keyboards/keychron/q12/iso_encoder/keyboard.json b/keyboards/keychron/q12/iso_encoder/keyboard.json
index 29e24a1491..d5105ac2b3 100644
--- a/keyboards/keychron/q12/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q12/iso_encoder/keyboard.json
@@ -24,6 +24,113 @@
"encoder": true,
"dip_switch": true
},
+ "rgb_matrix": {
+ "layout": [
+ {"matrix": [0, 16], "x": 11, "y": 0, "flags": 1},
+ {"matrix": [0, 17], "x": 23, "y": 0, "flags": 1},
+ {"matrix": [5, 16], "x": 34, "y": 0, "flags": 1},
+ {"matrix": [0, 0], "x": 49, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 63, "y": 0, "flags": 1},
+ {"matrix": [0, 2], "x": 75, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 86, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 98, "y": 0, "flags": 1},
+ {"matrix": [0, 5], "x": 112, "y": 0, "flags": 1},
+ {"matrix": [0, 6], "x": 123, "y": 0, "flags": 1},
+ {"matrix": [0, 7], "x": 135, "y": 0, "flags": 1},
+ {"matrix": [0, 8], "x": 146, "y": 0, "flags": 1},
+ {"matrix": [0, 9], "x": 160, "y": 0, "flags": 1},
+ {"matrix": [0, 10], "x": 172, "y": 0, "flags": 1},
+ {"matrix": [0, 11], "x": 183, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 194, "y": 0, "flags": 1},
+ {"matrix": [0, 13], "x": 209, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 15], "x": 0, "y": 15, "flags": 8},
+ {"matrix": [1, 16], "x": 11, "y": 15, "flags": 4},
+ {"matrix": [1, 17], "x": 23, "y": 15, "flags": 4},
+ {"matrix": [5, 5], "x": 34, "y": 15, "flags": 4},
+ {"matrix": [1, 0], "x": 49, "y": 15, "flags": 4},
+ {"matrix": [1, 1], "x": 60, "y": 15, "flags": 4},
+ {"matrix": [1, 2], "x": 72, "y": 15, "flags": 4},
+ {"matrix": [1, 3], "x": 83, "y": 15, "flags": 4},
+ {"matrix": [1, 4], "x": 95, "y": 15, "flags": 4},
+ {"matrix": [1, 5], "x": 106, "y": 15, "flags": 4},
+ {"matrix": [1, 6], "x": 117, "y": 15, "flags": 4},
+ {"matrix": [1, 7], "x": 129, "y": 15, "flags": 4},
+ {"matrix": [1, 8], "x": 140, "y": 15, "flags": 4},
+ {"matrix": [1, 9], "x": 152, "y": 15, "flags": 4},
+ {"matrix": [1, 10], "x": 163, "y": 15, "flags": 4},
+ {"matrix": [1, 11], "x": 175, "y": 15, "flags": 4},
+ {"matrix": [1, 12], "x": 186, "y": 15, "flags": 4},
+ {"matrix": [1, 13], "x": 204, "y": 15, "flags": 1},
+ {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+ {"matrix": [2, 15], "x": 0, "y": 26, "flags": 4},
+ {"matrix": [2, 16], "x": 11, "y": 26, "flags": 4},
+ {"matrix": [2, 17], "x": 23, "y": 26, "flags": 4},
+ {"matrix": [5, 7], "x": 34, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 52, "y": 26, "flags": 1},
+ {"matrix": [2, 1], "x": 66, "y": 26, "flags": 4},
+ {"matrix": [2, 2], "x": 77, "y": 26, "flags": 4},
+ {"matrix": [2, 3], "x": 89, "y": 26, "flags": 4},
+ {"matrix": [2, 4], "x": 100, "y": 26, "flags": 4},
+ {"matrix": [2, 5], "x": 112, "y": 26, "flags": 4},
+ {"matrix": [2, 6], "x": 123, "y": 26, "flags": 4},
+ {"matrix": [2, 7], "x": 135, "y": 26, "flags": 4},
+ {"matrix": [2, 8], "x": 146, "y": 26, "flags": 4},
+ {"matrix": [2, 9], "x": 158, "y": 26, "flags": 4},
+ {"matrix": [2, 10], "x": 169, "y": 26, "flags": 4},
+ {"matrix": [2, 11], "x": 180, "y": 26, "flags": 4},
+ {"matrix": [2, 12], "x": 192, "y": 26, "flags": 4},
+ {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+ {"matrix": [3, 15], "x": 0, "y": 38, "flags": 4},
+ {"matrix": [3, 16], "x": 11, "y": 38, "flags": 4},
+ {"matrix": [3, 17], "x": 23, "y": 38, "flags": 4},
+ {"matrix": [3, 0], "x": 53, "y": 38, "flags": 8},
+ {"matrix": [3, 1], "x": 69, "y": 38, "flags": 4},
+ {"matrix": [3, 2], "x": 80, "y": 38, "flags": 4},
+ {"matrix": [3, 3], "x": 92, "y": 38, "flags": 4},
+ {"matrix": [3, 4], "x": 103, "y": 38, "flags": 4},
+ {"matrix": [3, 5], "x": 115, "y": 38, "flags": 4},
+ {"matrix": [3, 6], "x": 126, "y": 38, "flags": 4},
+ {"matrix": [3, 7], "x": 137, "y": 38, "flags": 4},
+ {"matrix": [3, 8], "x": 149, "y": 38, "flags": 4},
+ {"matrix": [3, 9], "x": 160, "y": 38, "flags": 4},
+ {"matrix": [3, 10], "x": 172, "y": 38, "flags": 4},
+ {"matrix": [3, 11], "x": 183, "y": 38, "flags": 4},
+ {"matrix": [3, 13], "x": 195, "y": 38, "flags": 4},
+ {"matrix": [2, 13], "x": 210, "y": 34, "flags": 1},
+ {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+ {"matrix": [4, 15], "x": 0, "y": 49, "flags": 4},
+ {"matrix": [4, 16], "x": 11, "y": 49, "flags": 4},
+ {"matrix": [4, 17], "x": 23, "y": 49, "flags": 4},
+ {"matrix": [3, 12], "x": 34, "y": 55, "flags": 4},
+ {"matrix": [4, 0], "x": 50, "y": 49, "flags": 1},
+ {"matrix": [4, 1], "x": 63, "y": 49, "flags": 4},
+ {"matrix": [4, 2], "x": 75, "y": 49, "flags": 4},
+ {"matrix": [4, 3], "x": 86, "y": 49, "flags": 4},
+ {"matrix": [4, 4], "x": 97, "y": 49, "flags": 4},
+ {"matrix": [4, 5], "x": 109, "y": 49, "flags": 4},
+ {"matrix": [4, 6], "x": 120, "y": 49, "flags": 4},
+ {"matrix": [4, 7], "x": 132, "y": 49, "flags": 4},
+ {"matrix": [4, 8], "x": 143, "y": 49, "flags": 4},
+ {"matrix": [4, 9], "x": 155, "y": 49, "flags": 4},
+ {"matrix": [4, 10], "x": 166, "y": 49, "flags": 4},
+ {"matrix": [4, 11], "x": 177, "y": 49, "flags": 4},
+ {"matrix": [4, 13], "x": 193, "y": 49, "flags": 4},
+ {"matrix": [4, 14], "x": 212, "y": 52, "flags": 1},
+ {"matrix": [5, 15], "x": 6, "y": 61, "flags": 4},
+ {"matrix": [5, 17], "x": 23, "y": 61, "flags": 4},
+ {"matrix": [5, 0], "x": 50, "y": 61, "flags": 1},
+ {"matrix": [5, 1], "x": 65, "y": 61, "flags": 1},
+ {"matrix": [5, 2], "x": 79, "y": 61, "flags": 1},
+ {"matrix": [5, 6], "x": 122, "y": 61, "flags": 4},
+ {"matrix": [5, 9], "x": 163, "y": 61, "flags": 1},
+ {"matrix": [5, 10], "x": 174, "y": 61, "flags": 4},
+ {"matrix": [5, 11], "x": 186, "y": 61, "flags": 1},
+ {"matrix": [5, 12], "x": 201, "y": 64, "flags": 1},
+ {"matrix": [5, 13], "x": 212, "y": 64, "flags": 1},
+ {"matrix": [5, 14], "x": 223, "y": 64, "flags": 1}
+ ]
+ },
"layouts": {
"LAYOUT_iso_104": {
"layout": [