diff --git a/keyboards/bandominedoni/bandominedoni.c b/keyboards/bandominedoni/bandominedoni.c index 76d9e6cb3b..84c0f27bcd 100644 --- a/keyboards/bandominedoni/bandominedoni.c +++ b/keyboards/bandominedoni/bandominedoni.c @@ -16,58 +16,6 @@ #include "bandominedoni.h" -#ifdef RGB_MATRIX_ENABLE - -led_config_t g_led_config = { - { - { 75, 46, 45, 44, 43, 42, NO_LED }, - { 47, 48, 49, 50, 51, 52, 53 }, - { 60, 59, 58, 57, 56, 55, 54 }, - { 61, 62, 63, 64, 65, 66, 67 }, - { 74, 73, 72, 71, 70, 69, 68 }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { 7, 6, 4, 3, 2, 1, 5}, - { 8, 9, 10, 11, 12, 13, 0 }, - { 19, 18, 17, 16, 15, 14, 41 }, - { 20, 21, 22, 23, 24, 25, 40 }, - { 30, 29, 28, 27, 26, 39, 38 }, - { 31, 32, 33, 34, 35, 36, 37 } - }, { - { 145, 6 }, { 157, 5 }, { 153, 14 }, { 149, 22 }, { 145, 32 }, { 136, 35 }, { 139, 48 }, { 134, 61 }, - { 142, 60 }, { 148, 43 }, { 154, 29 }, { 158, 20 }, { 163, 12 }, { 168, 4 }, - { 178, 5 }, { 173, 12 }, { 168, 20 }, { 163, 28 }, { 157, 40 }, { 151, 55 }, - { 160, 52 }, { 166, 39 }, { 172, 28 }, { 177, 20 }, { 182, 13 }, { 188, 7 }, - { 192, 17 }, { 186, 23 }, { 181, 30 }, { 175, 39 }, { 169, 50 }, - { 178, 51 }, { 184, 41 }, { 190, 33 }, { 196, 27 }, - { 199, 37 }, { 193, 45 }, { 187, 53 }, - { 196, 56 }, { 202, 49 }, - { 205, 61 }, - { 202, 4 }, - { 84, 18 }, { 73, 13 }, { 62, 10 }, { 51, 8 }, { 39, 11 }, { 24, 22 }, - { 34, 19 }, { 45, 16 }, { 56, 16 }, { 66, 18 }, { 77, 22 }, { 87, 28 }, - { 92, 40 }, { 81, 32 }, { 71, 27 }, { 61, 24 }, { 51, 24 }, { 41, 24 }, { 30, 28 }, - { 24, 42 }, { 34, 37 }, { 44, 35 }, { 54, 34 }, { 64, 36 }, { 74, 38 }, { 84, 44 }, - { 87, 54 }, { 77, 49 }, { 67, 47 }, { 57, 45 }, { 47, 45 }, { 37, 48 }, { 27, 52 }, { 19, 56 }, - }, { - 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, - 4, 4, 4, 4, 4, 4, 4, 4 - } -}; -#endif - #if defined(SPLIT_HAND_MATRIX_GRID) static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) { gpio_set_pin_input_high(in_pin); diff --git a/keyboards/bandominedoni/keyboard.json b/keyboards/bandominedoni/keyboard.json index f6ea0f43c3..7184e2e90c 100644 --- a/keyboards/bandominedoni/keyboard.json +++ b/keyboards/bandominedoni/keyboard.json @@ -20,6 +20,84 @@ }, "rgb_matrix": { "driver": "ws2812", + "layout": [ + {"matrix": [7, 6], "x": 145, "y": 6, "flags": 4}, + {"matrix": [6, 5], "x": 157, "y": 5, "flags": 4}, + {"matrix": [6, 4], "x": 153, "y": 14, "flags": 4}, + {"matrix": [6, 3], "x": 149, "y": 22, "flags": 4}, + {"matrix": [6, 2], "x": 145, "y": 32, "flags": 4}, + {"matrix": [6, 6], "x": 136, "y": 35, "flags": 4}, + {"matrix": [6, 1], "x": 139, "y": 48, "flags": 4}, + {"matrix": [6, 0], "x": 134, "y": 61, "flags": 4}, + {"matrix": [7, 0], "x": 142, "y": 60, "flags": 4}, + {"matrix": [7, 1], "x": 148, "y": 43, "flags": 4}, + {"matrix": [7, 2], "x": 154, "y": 29, "flags": 4}, + {"matrix": [7, 3], "x": 158, "y": 20, "flags": 4}, + {"matrix": [7, 4], "x": 163, "y": 12, "flags": 4}, + {"matrix": [7, 5], "x": 168, "y": 4, "flags": 4}, + {"matrix": [8, 5], "x": 178, "y": 5, "flags": 4}, + {"matrix": [8, 4], "x": 173, "y": 12, "flags": 4}, + {"matrix": [8, 3], "x": 168, "y": 20, "flags": 4}, + {"matrix": [8, 2], "x": 163, "y": 28, "flags": 4}, + {"matrix": [8, 1], "x": 157, "y": 40, "flags": 4}, + {"matrix": [8, 0], "x": 151, "y": 55, "flags": 4}, + {"matrix": [9, 0], "x": 160, "y": 52, "flags": 4}, + {"matrix": [9, 1], "x": 166, "y": 39, "flags": 4}, + {"matrix": [9, 2], "x": 172, "y": 28, "flags": 4}, + {"matrix": [9, 3], "x": 177, "y": 20, "flags": 4}, + {"matrix": [9, 4], "x": 182, "y": 13, "flags": 4}, + {"matrix": [9, 5], "x": 188, "y": 7, "flags": 4}, + {"matrix": [10, 4], "x": 192, "y": 17, "flags": 4}, + {"matrix": [10, 3], "x": 186, "y": 23, "flags": 4}, + {"matrix": [10, 2], "x": 181, "y": 30, "flags": 4}, + {"matrix": [10, 1], "x": 175, "y": 39, "flags": 4}, + {"matrix": [10, 0], "x": 169, "y": 50, "flags": 4}, + {"matrix": [11, 0], "x": 178, "y": 51, "flags": 4}, + {"matrix": [11, 1], "x": 184, "y": 41, "flags": 4}, + {"matrix": [11, 2], "x": 190, "y": 33, "flags": 4}, + {"matrix": [11, 3], "x": 196, "y": 27, "flags": 4}, + {"matrix": [11, 4], "x": 199, "y": 37, "flags": 4}, + {"matrix": [11, 5], "x": 193, "y": 45, "flags": 4}, + {"matrix": [11, 6], "x": 187, "y": 53, "flags": 4}, + {"matrix": [10, 6], "x": 196, "y": 56, "flags": 4}, + {"matrix": [10, 5], "x": 202, "y": 49, "flags": 4}, + {"matrix": [9, 6], "x": 205, "y": 61, "flags": 4}, + {"matrix": [8, 6], "x": 202, "y": 4, "flags": 4}, + {"matrix": [0, 5], "x": 84, "y": 18, "flags": 4}, + {"matrix": [0, 4], "x": 73, "y": 13, "flags": 4}, + {"matrix": [0, 3], "x": 62, "y": 10, "flags": 4}, + {"matrix": [0, 2], "x": 51, "y": 8, "flags": 4}, + {"matrix": [0, 1], "x": 39, "y": 11, "flags": 4}, + {"matrix": [1, 0], "x": 24, "y": 22, "flags": 4}, + {"matrix": [1, 1], "x": 34, "y": 19, "flags": 4}, + {"matrix": [1, 2], "x": 45, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 66, "y": 18, "flags": 4}, + {"matrix": [1, 5], "x": 77, "y": 22, "flags": 4}, + {"matrix": [1, 6], "x": 87, "y": 28, "flags": 4}, + {"matrix": [2, 6], "x": 92, "y": 40, "flags": 4}, + {"matrix": [2, 5], "x": 81, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 71, "y": 27, "flags": 4}, + {"matrix": [2, 3], "x": 61, "y": 24, "flags": 4}, + {"matrix": [2, 2], "x": 51, "y": 24, "flags": 4}, + {"matrix": [2, 1], "x": 41, "y": 24, "flags": 4}, + {"matrix": [2, 0], "x": 30, "y": 28, "flags": 4}, + {"matrix": [3, 0], "x": 24, "y": 42, "flags": 4}, + {"matrix": [3, 1], "x": 34, "y": 37, "flags": 4}, + {"matrix": [3, 2], "x": 44, "y": 35, "flags": 4}, + {"matrix": [3, 3], "x": 54, "y": 34, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 36, "flags": 4}, + {"matrix": [3, 5], "x": 74, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 84, "y": 44, "flags": 4}, + {"matrix": [4, 6], "x": 87, "y": 54, "flags": 4}, + {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4}, + {"matrix": [4, 4], "x": 67, "y": 47, "flags": 4}, + {"matrix": [4, 3], "x": 57, "y": 45, "flags": 4}, + {"matrix": [4, 2], "x": 47, "y": 45, "flags": 4}, + {"matrix": [4, 1], "x": 37, "y": 48, "flags": 4}, + {"matrix": [4, 0], "x": 27, "y": 52, "flags": 4}, + {"matrix": [0, 0], "x": 19, "y": 56, "flags": 4} + ], "max_brightness": 50, "sleep": true }, diff --git a/keyboards/blockboy/ac980mini/ac980mini.c b/keyboards/blockboy/ac980mini/ac980mini.c deleted file mode 100644 index b6a29f94ea..0000000000 --- a/keyboards/blockboy/ac980mini/ac980mini.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2022 rooski15 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE -// LED location configuration -led_config_t g_led_config = { { - - { 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80 }, - { 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, NO_LED }, - { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED, 41, 42, 43, 44, 45 }, - { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, NO_LED, 24, 25, 26, 27, 28, NO_LED }, - { 0, 1, 2, NO_LED, NO_LED, 3, NO_LED, NO_LED, NO_LED, 4, 5, 6, 7, 8, 9, 10, 11, 12 } - -},{ - - // Physical X,Y coordinates of each LED, starting with LED 0 above. - { 1 , 64 }, { 16 , 64 }, { 31 , 64 }, { 75 , 64 }, { 123 , 64 }, { 132 , 64 }, { 144 , 64 }, { 159 , 64 }, { 171 , 64 }, { 183 , 64 }, { 198 , 64 }, { 210 , 64 }, { 224 , 64 }, - { 7 , 48 }, { 27 , 48 }, { 39 , 48 }, { 51 , 48 }, { 63 , 48 }, { 75 , 48 }, { 87 , 48 }, { 99 , 48 }, { 111 , 48 }, { 123 , 48 }, { 135 , 48 }, { 151 , 48 }, { 171 , 48 }, { 186 , 48 }, { 198 , 48 }, { 210 , 48 }, - { 4 , 36 }, { 20 , 36 }, { 32 , 36 }, { 44 , 36 }, { 56 , 36 }, { 68 , 36 }, { 80 , 36 }, { 92 , 36 }, { 104 , 36 }, { 116 , 36 }, { 128 , 36 }, { 140 , 36 }, { 160 , 36 }, { 186 , 36 }, { 198 , 36 }, { 210 , 36 }, { 224 , 36 }, - { 3 , 16 }, { 18 , 16 }, { 30 , 16 }, { 42 , 16 }, { 54 , 16 }, { 66 , 16 }, { 78 , 16 }, { 90 , 16 }, { 102 , 16 }, { 114 , 16 }, { 126 , 16 }, { 138 , 16 }, { 150 , 16 }, { 165 , 16 }, { 186 , 16 }, { 198 , 16 }, { 210 , 16 }, - { 0 , 0 }, { 12 , 0 }, { 24 , 0 }, { 36 , 0 }, { 48 , 0 }, { 60 , 0 }, { 72 , 0 }, { 84 , 0 }, { 96 , 0 }, { 108 , 0 }, { 120 , 0 }, { 132 , 0 }, { 144 , 0 }, { 162 , 0 }, { 186 , 0 }, { 198 , 0 }, { 210 , 0 }, { 224 , 0 }, - -},{ - // "Flag Assignment" of each key - // 4 = Alpha - // 1 = Mod - // See https://docs.qmk.fm/#/feature_rgb_matrix?id=flags - // No Caps / Num indicators - 1,1,1, 1, 1,1,1, 1,1,1, 4,4,1, - 1,4,4,4,4,4,4,4,4,4,4,1, 1, 4,4,4, - 1,4,4,4,4,4,4,4,4,4,4,4,1, 4,4,4,1, - 1,4,4,4,4,4,4,4,4,4,4,4,4,4, 4,4,4, - 1,4,4,4,4,4,4,4,4,4,4,4,4,1, 1,1,1,1 - -} }; -/* - -*/ -#endif \ No newline at end of file diff --git a/keyboards/blockboy/ac980mini/keyboard.json b/keyboards/blockboy/ac980mini/keyboard.json index ce261639e2..8df9c03dcc 100644 --- a/keyboards/blockboy/ac980mini/keyboard.json +++ b/keyboards/blockboy/ac980mini/keyboard.json @@ -74,6 +74,89 @@ "solid_multisplash": true }, "driver": "ws2812", + "layout": [ + {"matrix": [4, 0], "x": 1, "y": 64, "flags": 1}, + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 1}, + {"matrix": [4, 2], "x": 31, "y": 64, "flags": 1}, + {"matrix": [4, 5], "x": 75, "y": 64, "flags": 1}, + {"matrix": [4, 9], "x": 123, "y": 64, "flags": 1}, + {"matrix": [4, 10], "x": 132, "y": 64, "flags": 1}, + {"matrix": [4, 11], "x": 144, "y": 64, "flags": 1}, + {"matrix": [4, 12], "x": 159, "y": 64, "flags": 1}, + {"matrix": [4, 13], "x": 171, "y": 64, "flags": 1}, + {"matrix": [4, 14], "x": 183, "y": 64, "flags": 1}, + {"matrix": [4, 15], "x": 198, "y": 64, "flags": 4}, + {"matrix": [4, 16], "x": 210, "y": 64, "flags": 4}, + {"matrix": [4, 17], "x": 224, "y": 64, "flags": 1}, + {"matrix": [3, 0], "x": 7, "y": 48, "flags": 1}, + {"matrix": [3, 1], "x": 27, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 39, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 51, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 63, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 75, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 87, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 99, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 111, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 123, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 135, "y": 48, "flags": 4}, + {"matrix": [3, 12], "x": 151, "y": 48, "flags": 1}, + {"matrix": [3, 13], "x": 171, "y": 48, "flags": 1}, + {"matrix": [3, 14], "x": 186, "y": 48, "flags": 4}, + {"matrix": [3, 15], "x": 198, "y": 48, "flags": 4}, + {"matrix": [3, 16], "x": 210, "y": 48, "flags": 4}, + {"matrix": [2, 0], "x": 4, "y": 36, "flags": 1}, + {"matrix": [2, 1], "x": 20, "y": 36, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 36, "flags": 4}, + {"matrix": [2, 3], "x": 44, "y": 36, "flags": 4}, + {"matrix": [2, 4], "x": 56, "y": 36, "flags": 4}, + {"matrix": [2, 5], "x": 68, "y": 36, "flags": 4}, + {"matrix": [2, 6], "x": 80, "y": 36, "flags": 4}, + {"matrix": [2, 7], "x": 92, "y": 36, "flags": 4}, + {"matrix": [2, 8], "x": 104, "y": 36, "flags": 4}, + {"matrix": [2, 9], "x": 116, "y": 36, "flags": 4}, + {"matrix": [2, 10], "x": 128, "y": 36, "flags": 4}, + {"matrix": [2, 11], "x": 140, "y": 36, "flags": 4}, + {"matrix": [2, 13], "x": 160, "y": 36, "flags": 1}, + {"matrix": [2, 14], "x": 186, "y": 36, "flags": 4}, + {"matrix": [2, 15], "x": 198, "y": 36, "flags": 4}, + {"matrix": [2, 16], "x": 210, "y": 36, "flags": 4}, + {"matrix": [2, 17], "x": 224, "y": 36, "flags": 1}, + {"matrix": [1, 0], "x": 3, "y": 16, "flags": 1}, + {"matrix": [1, 1], "x": 18, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 30, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 54, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 66, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 78, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 90, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 102, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 114, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 126, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 138, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 150, "y": 16, "flags": 4}, + {"matrix": [1, 13], "x": 165, "y": 16, "flags": 4}, + {"matrix": [1, 14], "x": 186, "y": 16, "flags": 4}, + {"matrix": [1, 15], "x": 198, "y": 16, "flags": 4}, + {"matrix": [1, 16], "x": 210, "y": 16, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 12, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 24, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 36, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 60, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 72, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 84, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 108, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 120, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 132, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 162, "y": 0, "flags": 1}, + {"matrix": [0, 14], "x": 186, "y": 0, "flags": 1}, + {"matrix": [0, 15], "x": 198, "y": 0, "flags": 1}, + {"matrix": [0, 16], "x": 210, "y": 0, "flags": 1}, + {"matrix": [0, 17], "x": 224, "y": 0, "flags": 1} + ], "sat_steps": 8, "val_steps": 8, "max_brightness": 150, diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c index 1097c58de2..87ce108bc3 100644 --- a/keyboards/boston_meetup/2019/2019.c +++ b/keyboards/boston_meetup/2019/2019.c @@ -15,21 +15,6 @@ */ #include "quantum.h" -#ifdef RGB_MATRIX_ENABLE -#include "rgb_matrix.h" - -led_config_t g_led_config = { { - { 5, NO_LED, NO_LED, 0 }, - { NO_LED, NO_LED, NO_LED, NO_LED }, - { 4, NO_LED, NO_LED, 1 }, - { 3, NO_LED, NO_LED, 2 } -}, { - { 188, 16 }, { 187, 48 }, { 149, 64 }, { 112, 64 }, { 37, 48 }, { 38, 16 } -}, { - 4, 4, 4, 4, 4, 4 -} }; -#endif - #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_180; } diff --git a/keyboards/boston_meetup/2019/keyboard.json b/keyboards/boston_meetup/2019/keyboard.json index 4f07e0c631..c56a8f6c06 100644 --- a/keyboards/boston_meetup/2019/keyboard.json +++ b/keyboards/boston_meetup/2019/keyboard.json @@ -20,7 +20,15 @@ "driver": "drv2605l" }, "rgb_matrix": { - "driver": "ws2812" + "driver": "ws2812", + "layout": [ + {"matrix": [0, 3], "x": 188, "y": 16, "flags": 4}, + {"matrix": [2, 3], "x": 187, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 149, "y": 64, "flags": 4}, + {"matrix": [3, 0], "x": 112, "y": 64, "flags": 4}, + {"matrix": [2, 0], "x": 37, "y": 48, "flags": 4}, + {"matrix": [0, 0], "x": 38, "y": 16, "flags": 4} + ] }, "matrix_pins": { "cols": ["A7", "A8", "B2", "B10"], diff --git a/keyboards/canary/canary60rgb/v1/keyboard.json b/keyboards/canary/canary60rgb/v1/keyboard.json index a1247769e6..de2daaf00d 100644 --- a/keyboards/canary/canary60rgb/v1/keyboard.json +++ b/keyboards/canary/canary60rgb/v1/keyboard.json @@ -73,6 +73,71 @@ "pixel_rain": true }, "driver": "is31fl3733", + "layout": [ + {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1}, + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [1, 13], "x": 220, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4}, + {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1}, + {"matrix": [2, 13], "x": 214, "y": 32, "flags": 1}, + {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4}, + {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1}, + {"matrix": [3, 13], "x": 224, "y": 48, "flags": 1}, + {"matrix": [3, 11], "x": 208, "y": 48, "flags": 1}, + {"matrix": [3, 10], "x": 186, "y": 48, "flags": 1}, + {"matrix": [3, 9], "x": 164, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 148, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 132, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 116, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 100, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 84, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 68, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 52, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 36, "y": 48, "flags": 4}, + {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1}, + {"matrix": [4, 13], "x": 224, "y": 64, "flags": 1}, + {"matrix": [4, 11], "x": 208, "y": 64, "flags": 1}, + {"matrix": [4, 10], "x": 192, "y": 64, "flags": 1}, + {"matrix": [4, 9], "x": 176, "y": 64, "flags": 1}, + {"matrix": [4, 8], "x": 160, "y": 64, "flags": 1}, + {"matrix": [4, 5], "x": 102, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1}, + {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1}, + {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1} + ], "sleep": true }, "matrix_pins": { diff --git a/keyboards/canary/canary60rgb/v1/v1.c b/keyboards/canary/canary60rgb/v1/v1.c index b14878ff22..a6e9dea796 100644 --- a/keyboards/canary/canary60rgb/v1/v1.c +++ b/keyboards/canary/canary60rgb/v1/v1.c @@ -86,28 +86,6 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { { 0, SW10_CS16, SW11_CS16, SW12_CS16 } }; -led_config_t g_led_config = { - { - { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, - { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, - { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, NO_LED, 41 }, - { 62, 61, 60, NO_LED, NO_LED, 59, NO_LED, NO_LED, 58, 57, 56, 55, NO_LED, 54 } - }, { - { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 }, - { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 }, - { 214, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, - { 224, 48 }, { 208, 48 }, { 186, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 36, 48 }, { 9, 48 }, - { 224, 64 }, { 208, 64 }, { 192, 64 }, { 176, 64 }, { 160, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 } - }, { - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 1, 1, 4, 1, 1, 1 - } -}; - bool rgb_matrix_indicators_kb(void) { if (!rgb_matrix_indicators_user()) { return false; diff --git a/keyboards/capsunlocked/cu80/v2/ansi/ansi.c b/keyboards/capsunlocked/cu80/v2/ansi/ansi.c deleted file mode 100644 index 2d4055d984..0000000000 --- a/keyboards/capsunlocked/cu80/v2/ansi/ansi.c +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2021 CapsUnlocked -// SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { - { - {0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, - {32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16}, - {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49}, - {62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, NO_LED, NO_LED, NO_LED, NO_LED}, - {63, NO_LED, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, NO_LED, NO_LED, 75, NO_LED}, - {86, 85, 84, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, 82, 81, 80, 79, 78, NO_LED, 77, 76} - }, { - {0, 0}, {28, 0}, {42, 0}, {56, 0}, {71, 0}, {85, 0}, {99, 0}, {113, 0}, {127, 0}, {141, 0}, {155, 0}, {169, 0}, {184, 0}, {198, 0}, {212, 0}, {226, 0}, {226, 13}, {212, 13}, {198, 13}, {184, 13}, {169, 13}, {155, 13}, {141, 13}, {127, 13}, {113, 13}, {99, 13}, {85, 13}, {71, 13}, {56, 13}, {42, 13}, {28, 13}, {14, 13}, {0, 13}, {0, 26}, {14, 26}, {28, 26}, {42, 26}, {56, 26}, {71, 26}, {85, 26}, {99, 26}, {113, 26}, {127, 26}, {141, 26}, {155, 26}, {169, 26}, {184, 26}, {198, 26}, {212, 26}, {226, 26}, {169, 38}, {155, 38}, {141, 38}, {127, 38}, {113, 38}, {99, 38}, {85, 38}, {71, 38}, {56, 38}, {42, 38}, {28, 38}, {14, 38}, {0, 38}, {0, 51}, {28, 51}, {42, 51}, {56, 51}, {71, 51}, {85, 51}, {99, 51}, {113, 51}, {127, 51}, {141, 51}, {155, 51}, {169, 51}, {212, 51}, {226, 64}, {212, 64}, {184, 64}, {169, 64}, {155, 64}, {141, 64}, {127, 64}, {71, 64}, {28, 64}, {14, 64}, {0, 64} - }, { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 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, 8, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1 - } -}; -#endif diff --git a/keyboards/capsunlocked/cu80/v2/ansi/keyboard.json b/keyboards/capsunlocked/cu80/v2/ansi/keyboard.json index 9dc24b5e40..fe38c3dff8 100644 --- a/keyboards/capsunlocked/cu80/v2/ansi/keyboard.json +++ b/keyboards/capsunlocked/cu80/v2/ansi/keyboard.json @@ -2,5 +2,96 @@ "keyboard_name": "CU80 v2 ANSI", "usb": { "pid": "0x0081" + }, + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 28, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 42, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 56, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 71, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 85, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 99, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 113, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 127, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 141, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 155, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 184, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 212, "y": 0, "flags": 8}, + {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 16], "x": 224, "y": 13, "flags": 4}, + {"matrix": [1, 15], "x": 212, "y": 13, "flags": 4}, + {"matrix": [1, 14], "x": 198, "y": 13, "flags": 4}, + {"matrix": [1, 13], "x": 184, "y": 13, "flags": 4}, + {"matrix": [1, 12], "x": 169, "y": 13, "flags": 4}, + {"matrix": [1, 11], "x": 155, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 141, "y": 13, "flags": 4}, + {"matrix": [1, 9], "x": 127, "y": 13, "flags": 4}, + {"matrix": [1, 8], "x": 113, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 99, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 85, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 71, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 28, "y": 13, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 13, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 14, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 28, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 56, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 71, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 85, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 99, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 113, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 127, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 141, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 155, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 169, "y": 26, "flags": 4}, + {"matrix": [2, 13], "x": 184, "y": 26, "flags": 4}, + {"matrix": [2, 14], "x": 198, "y": 26, "flags": 4}, + {"matrix": [2, 15], "x": 212, "y": 26, "flags": 4}, + {"matrix": [2, 16], "x": 224, "y": 26, "flags": 4}, + {"matrix": [3, 12], "x": 169, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 155, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 141, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 127, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 113, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 99, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 85, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 71, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 56, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 28, "y": 38, "flags": 4}, + {"matrix": [3, 1], "x": 14, "y": 38, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 8}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1}, + {"matrix": [4, 2], "x": 28, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 42, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 56, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 71, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 85, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 99, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 113, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 127, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 141, "y": 51, "flags": 4}, + {"matrix": [4, 11], "x": 155, "y": 51, "flags": 4}, + {"matrix": [4, 12], "x": 169, "y": 51, "flags": 1}, + {"matrix": [4, 15], "x": 212, "y": 51, "flags": 4}, + {"matrix": [5, 16], "x": 224, "y": 64, "flags": 4}, + {"matrix": [5, 15], "x": 212, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 184, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 169, "y": 64, "flags": 1}, + {"matrix": [5, 11], "x": 155, "y": 64, "flags": 1}, + {"matrix": [5, 10], "x": 141, "y": 64, "flags": 1}, + {"matrix": [5, 9], "x": 127, "y": 64, "flags": 1}, + {"matrix": [5, 5], "x": 71, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 28, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 14, "y": 64, "flags": 1}, + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 1} + ] } } diff --git a/keyboards/capsunlocked/cu80/v2/iso/iso.c b/keyboards/capsunlocked/cu80/v2/iso/iso.c deleted file mode 100644 index 0e8e26e5dd..0000000000 --- a/keyboards/capsunlocked/cu80/v2/iso/iso.c +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2021 CapsUnlocked -// SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { - { - {0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, - {32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16}, - {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49}, - {62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, NO_LED, NO_LED, NO_LED, NO_LED}, - {63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, NO_LED, NO_LED, 76, NO_LED}, - {87, 86, 85, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 83, 82, 81, 80, 79, NO_LED, 78, 77} - }, { - {0, 0}, {28, 0}, {42, 0}, {56, 0}, {71, 0}, {85, 0}, {99, 0}, {113, 0}, {127, 0}, {141, 0}, {155, 0}, {169, 0}, {184, 0}, {198, 0}, {212, 0}, {226, 0}, {226, 26}, {212, 26}, {198, 26}, {184, 26}, {169, 26}, {155, 26}, {141, 26}, {127, 26}, {113, 26}, {99, 26}, {85, 26}, {71, 26}, {56, 26}, {42, 26}, {28, 26}, {14, 26}, {0, 26}, {0, 26}, {14, 26}, {28, 26}, {42, 26}, {56, 26}, {71, 26}, {85, 26}, {99, 26}, {113, 26}, {127, 26}, {141, 26}, {155, 26}, {169, 26}, {184, 26}, {198, 26}, {212, 26}, {226, 26}, {169, 38}, {155, 38}, {141, 38}, {127, 38}, {113, 38}, {99, 38}, {85, 38}, {71, 38}, {56, 38}, {42, 38}, {28, 38}, {14, 38}, {0, 38}, {0, 51}, {14, 51}, {28, 51}, {42, 51}, {56, 51}, {71, 51}, {85, 51}, {99, 51}, {113, 51}, {127, 51}, {141, 51}, {155, 51}, {169, 51}, {212, 51}, {226, 64}, {212, 64}, {184, 64}, {169, 64}, {155, 64}, {141, 64}, {127, 64}, {71, 64}, {28, 64}, {14, 64}, {0, 64} - }, { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 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, 8, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1 - } -}; -#endif diff --git a/keyboards/capsunlocked/cu80/v2/iso/keyboard.json b/keyboards/capsunlocked/cu80/v2/iso/keyboard.json index 33d49db64a..b78b8af41e 100644 --- a/keyboards/capsunlocked/cu80/v2/iso/keyboard.json +++ b/keyboards/capsunlocked/cu80/v2/iso/keyboard.json @@ -2,5 +2,97 @@ "keyboard_name": "CU80 v2 ISO", "usb": { "pid": "0x0083" + }, + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 28, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 42, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 56, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 71, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 85, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 99, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 113, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 127, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 141, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 155, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 184, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 212, "y": 0, "flags": 8}, + {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 16], "x": 224, "y": 26, "flags": 4}, + {"matrix": [1, 15], "x": 212, "y": 26, "flags": 4}, + {"matrix": [1, 14], "x": 198, "y": 26, "flags": 4}, + {"matrix": [1, 13], "x": 184, "y": 26, "flags": 4}, + {"matrix": [1, 12], "x": 169, "y": 26, "flags": 4}, + {"matrix": [1, 11], "x": 155, "y": 26, "flags": 4}, + {"matrix": [1, 10], "x": 141, "y": 26, "flags": 4}, + {"matrix": [1, 9], "x": 127, "y": 26, "flags": 4}, + {"matrix": [1, 8], "x": 113, "y": 26, "flags": 4}, + {"matrix": [1, 7], "x": 99, "y": 26, "flags": 4}, + {"matrix": [1, 6], "x": 85, "y": 26, "flags": 4}, + {"matrix": [1, 5], "x": 71, "y": 26, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 26, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 26, "flags": 4}, + {"matrix": [1, 2], "x": 28, "y": 26, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 26, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 14, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 28, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 56, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 71, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 85, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 99, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 113, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 127, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 141, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 155, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 169, "y": 26, "flags": 4}, + {"matrix": [2, 13], "x": 184, "y": 26, "flags": 4}, + {"matrix": [2, 14], "x": 198, "y": 26, "flags": 4}, + {"matrix": [2, 15], "x": 212, "y": 26, "flags": 4}, + {"matrix": [2, 16], "x": 224, "y": 26, "flags": 4}, + {"matrix": [3, 12], "x": 169, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 155, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 141, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 127, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 113, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 99, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 85, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 71, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 56, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 28, "y": 38, "flags": 4}, + {"matrix": [3, 1], "x": 14, "y": 38, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 8}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1}, + {"matrix": [4, 1], "x": 14, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 28, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 42, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 56, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 71, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 85, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 99, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 113, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 127, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 141, "y": 51, "flags": 4}, + {"matrix": [4, 11], "x": 155, "y": 51, "flags": 4}, + {"matrix": [4, 12], "x": 169, "y": 51, "flags": 1}, + {"matrix": [4, 15], "x": 212, "y": 51, "flags": 4}, + {"matrix": [5, 16], "x": 224, "y": 64, "flags": 4}, + {"matrix": [5, 15], "x": 212, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 184, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 169, "y": 64, "flags": 1}, + {"matrix": [5, 11], "x": 155, "y": 64, "flags": 1}, + {"matrix": [5, 10], "x": 141, "y": 64, "flags": 1}, + {"matrix": [5, 9], "x": 127, "y": 64, "flags": 1}, + {"matrix": [5, 5], "x": 71, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 28, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 14, "y": 64, "flags": 1}, + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 1} + ] } } diff --git a/keyboards/checkerboards/quark_lp/keyboard.json b/keyboards/checkerboards/quark_lp/keyboard.json index 7634a71d3e..59666f8d69 100644 --- a/keyboards/checkerboards/quark_lp/keyboard.json +++ b/keyboards/checkerboards/quark_lp/keyboard.json @@ -32,6 +32,59 @@ "pixel_flow": true }, "driver": "ws2812", + "layout": [ + {"matrix": [3, 11], "x": 224, "y": 64, "flags": 1}, + {"matrix": [3, 10], "x": 204, "y": 64, "flags": 1}, + {"matrix": [3, 9], "x": 183, "y": 64, "flags": 1}, + {"matrix": [3, 8], "x": 163, "y": 64, "flags": 1}, + {"x": 153, "y": 64, "flags": 1}, + {"matrix": [3, 7], "x": 143, "y": 64, "flags": 1}, + {"x": 133, "y": 64, "flags": 1}, + {"matrix": [3, 6], "x": 123, "y": 64, "flags": 1}, + {"x": 113, "y": 64, "flags": 1}, + {"matrix": [3, 5], "x": 102, "y": 64, "flags": 1}, + {"matrix": [3, 4], "x": 82, "y": 64, "flags": 1}, + {"matrix": [3, 3], "x": 61, "y": 64, "flags": 1}, + {"matrix": [3, 2], "x": 41, "y": 64, "flags": 1}, + {"matrix": [3, 1], "x": 21, "y": 64, "flags": 1}, + {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1}, + {"matrix": [2, 0], "x": 0, "y": 43, "flags": 1}, + {"matrix": [2, 1], "x": 21, "y": 43, "flags": 4}, + {"matrix": [2, 2], "x": 41, "y": 43, "flags": 4}, + {"matrix": [2, 3], "x": 61, "y": 43, "flags": 4}, + {"matrix": [2, 4], "x": 82, "y": 43, "flags": 4}, + {"matrix": [2, 5], "x": 102, "y": 43, "flags": 4}, + {"matrix": [2, 6], "x": 123, "y": 43, "flags": 4}, + {"matrix": [2, 7], "x": 143, "y": 43, "flags": 4}, + {"matrix": [2, 8], "x": 163, "y": 43, "flags": 4}, + {"matrix": [2, 9], "x": 183, "y": 43, "flags": 4}, + {"matrix": [2, 10], "x": 204, "y": 43, "flags": 4}, + {"matrix": [2, 11], "x": 224, "y": 43, "flags": 1}, + {"matrix": [1, 11], "x": 224, "y": 21, "flags": 1}, + {"matrix": [1, 10], "x": 204, "y": 21, "flags": 4}, + {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4}, + {"matrix": [1, 8], "x": 163, "y": 21, "flags": 4}, + {"matrix": [1, 7], "x": 143, "y": 21, "flags": 4}, + {"matrix": [1, 6], "x": 123, "y": 21, "flags": 4}, + {"matrix": [1, 5], "x": 102, "y": 21, "flags": 4}, + {"matrix": [1, 4], "x": 82, "y": 21, "flags": 4}, + {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4}, + {"matrix": [1, 2], "x": 41, "y": 21, "flags": 4}, + {"matrix": [1, 1], "x": 21, "y": 21, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 21, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 82, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 102, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 123, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 143, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 163, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 204, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 224, "y": 0, "flags": 1} + ], "max_brightness": 125, "sat_steps": 8, "val_steps": 8, diff --git a/keyboards/checkerboards/quark_lp/quark_lp.c b/keyboards/checkerboards/quark_lp/quark_lp.c deleted file mode 100644 index 89c685f2b5..0000000000 --- a/keyboards/checkerboards/quark_lp/quark_lp.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { { - // Key Matrix to LED Index - { 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50 }, - { 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }, - { 14, 13, 12, 11, 10, 9, 7, 5, 3, 2, 1, 0 } -}, { - // LED Index to Physical Position - { 244, 0 }, { 224, 0 }, { 203, 0 }, { 183, 0 }, { 173, 0 }, { 163, 0 }, { 153, 0 }, { 143, 0 }, { 133, 0 }, { 122, 0 }, { 102, 0 }, { 81, 0 }, { 61, 0 }, { 41, 0 }, { 20, 0 }, - { 20, 21 }, { 41, 21 }, { 61, 21 }, { 81, 21 }, { 102, 21 }, { 122, 21 }, { 143, 21 }, { 163, 21 }, { 183, 21 }, { 203, 21 }, { 224, 21 }, { 244, 21 }, - { 244, 43 }, { 224, 43 }, { 203, 43 }, { 183, 43 }, { 163, 43 }, { 143, 43 }, { 122, 43 }, { 102, 43 }, { 81, 43 }, { 61, 43 }, { 41, 43 }, { 20, 43 }, - { 20, 64 }, { 41, 64 }, { 61, 64 }, { 81, 64 }, { 102, 64 }, { 112, 64 }, { 122, 64 }, { 132, 64 }, { 143, 64 }, { 153, 64 }, { 163, 64 }, { 183, 64 } -}, { - // LED Index to Flag - 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, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1 -} }; -#endif diff --git a/keyboards/cherrybstudio/cb87rgb/cb87rgb.c b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c index 5c2480f3fb..40ef6d6506 100644 --- a/keyboards/cherrybstudio/cb87rgb/cb87rgb.c +++ b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c @@ -13,41 +13,7 @@ along with this program. If not, see . #include "quantum.h" -//x = 224 / (NUMBER_OF_COLS - 1) * COL_POSITION -//y = 64 / (NUMBER_OF_ROWS - 1) * ROW_POSITION - #ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, - { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }, - { 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, 88, 89 }, - { 90, 91, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } -}, { - // LED Index to Physical Position - { 0, 0 }, { 13, 0 }, { 26, 0 }, { 39, 0 }, { 52, 0 }, { 65, 0 }, { 78, 0 }, { 91, 0 }, { 104, 0 }, { 117, 0 }, { 130, 0 }, { 143, 0 }, { 156, 0 }, { 195, 0 }, { 208, 0 }, { 224, 0 }, - { 0, 12 }, { 13, 12 }, { 26, 12 }, { 39, 12 }, { 52, 12 }, { 65, 12 }, { 78, 12 }, { 91, 12 }, { 104, 12 }, { 117, 12 }, { 130, 12 }, { 143, 12 }, { 156, 12 }, { 169, 12 }, { 182, 24 }, { 195, 12 }, { 208, 12 }, { 224, 12 }, - { 0, 24 }, { 13, 24 }, { 26, 24 }, { 39, 24 }, { 52, 24 }, { 65, 24 }, { 78, 24 }, { 91, 24 }, { 104, 24 }, { 117, 24 }, { 130, 24 }, { 143, 24 }, { 156, 24 }, { 169, 24 }, { 195, 24 }, { 208, 24 }, { 224, 24 }, - { 0, 36 }, { 13, 36 }, { 26, 36 }, { 39, 36 }, { 52, 36 }, { 65, 36 }, { 78, 36 }, { 91, 36 }, { 104, 36 }, { 117, 36 }, { 130, 36 }, { 143, 36 }, { 156, 36 }, { 169, 36 }, - { 0, 48 }, { 13, 48 }, { 26, 48 }, { 39, 48 }, { 52, 48 }, { 65, 48 }, { 78, 48 }, { 91, 48 }, { 104, 48 }, { 117, 48 }, { 130, 48 }, { 143, 48 }, { 156, 48 }, { 169, 48 }, { 208, 48 }, - { 0, 64 }, { 13, 64 }, { 26, 64 }, { 78, 64 }, { 130, 64 }, { 143, 64 }, { 156, 64 }, { 169, 64 }, { 195, 64 }, { 208, 64 }, { 224, 64 }, { 182, 0 } -}, { - // LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 - -} }; - bool rgb_matrix_indicators_kb(void) { if (!rgb_matrix_indicators_user()) { return false; diff --git a/keyboards/cherrybstudio/cb87rgb/keyboard.json b/keyboards/cherrybstudio/cb87rgb/keyboard.json index 1ce2fab78f..710bc2ab50 100644 --- a/keyboards/cherrybstudio/cb87rgb/keyboard.json +++ b/keyboards/cherrybstudio/cb87rgb/keyboard.json @@ -53,6 +53,100 @@ "solid_multisplash": true }, "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 13, "y": 0, "flags": 1}, + {"matrix": [0, 2], "x": 26, "y": 0, "flags": 1}, + {"matrix": [0, 3], "x": 39, "y": 0, "flags": 1}, + {"matrix": [0, 4], "x": 52, "y": 0, "flags": 1}, + {"matrix": [0, 5], "x": 65, "y": 0, "flags": 1}, + {"matrix": [0, 6], "x": 78, "y": 0, "flags": 1}, + {"matrix": [0, 7], "x": 91, "y": 0, "flags": 1}, + {"matrix": [0, 8], "x": 104, "y": 0, "flags": 1}, + {"matrix": [0, 9], "x": 117, "y": 0, "flags": 1}, + {"matrix": [1, 0], "x": 130, "y": 0, "flags": 1}, + {"matrix": [1, 1], "x": 143, "y": 0, "flags": 1}, + {"matrix": [1, 2], "x": 156, "y": 0, "flags": 1}, + {"matrix": [1, 3], "x": 195, "y": 0, "flags": 1}, + {"matrix": [1, 4], "x": 208, "y": 0, "flags": 1}, + {"matrix": [1, 5], "x": 224, "y": 0, "flags": 1}, + {"matrix": [1, 6], "x": 0, "y": 12, "flags": 1}, + {"matrix": [1, 7], "x": 13, "y": 12, "flags": 1}, + {"matrix": [1, 8], "x": 26, "y": 12, "flags": 1}, + {"matrix": [1, 9], "x": 39, "y": 12, "flags": 1}, + {"matrix": [2, 0], "x": 52, "y": 12, "flags": 1}, + {"matrix": [2, 1], "x": 65, "y": 12, "flags": 1}, + {"matrix": [2, 2], "x": 78, "y": 12, "flags": 1}, + {"matrix": [2, 3], "x": 91, "y": 12, "flags": 1}, + {"matrix": [2, 4], "x": 104, "y": 12, "flags": 1}, + {"matrix": [2, 5], "x": 117, "y": 12, "flags": 1}, + {"matrix": [2, 6], "x": 130, "y": 12, "flags": 1}, + {"matrix": [2, 7], "x": 143, "y": 12, "flags": 1}, + {"matrix": [2, 8], "x": 156, "y": 12, "flags": 1}, + {"matrix": [2, 9], "x": 169, "y": 12, "flags": 1}, + {"matrix": [3, 0], "x": 182, "y": 24, "flags": 1}, + {"matrix": [3, 1], "x": 195, "y": 12, "flags": 1}, + {"matrix": [3, 2], "x": 208, "y": 12, "flags": 1}, + {"matrix": [3, 3], "x": 224, "y": 12, "flags": 1}, + {"matrix": [3, 4], "x": 0, "y": 24, "flags": 1}, + {"matrix": [3, 5], "x": 13, "y": 24, "flags": 1}, + {"matrix": [3, 6], "x": 26, "y": 24, "flags": 1}, + {"matrix": [3, 7], "x": 39, "y": 24, "flags": 1}, + {"matrix": [3, 8], "x": 52, "y": 24, "flags": 1}, + {"matrix": [3, 9], "x": 65, "y": 24, "flags": 1}, + {"matrix": [4, 0], "x": 78, "y": 24, "flags": 1}, + {"matrix": [4, 1], "x": 91, "y": 24, "flags": 1}, + {"matrix": [4, 2], "x": 104, "y": 24, "flags": 1}, + {"matrix": [4, 3], "x": 117, "y": 24, "flags": 1}, + {"matrix": [4, 4], "x": 130, "y": 24, "flags": 1}, + {"matrix": [4, 5], "x": 143, "y": 24, "flags": 1}, + {"matrix": [4, 6], "x": 156, "y": 24, "flags": 1}, + {"matrix": [4, 7], "x": 169, "y": 24, "flags": 1}, + {"matrix": [4, 8], "x": 195, "y": 24, "flags": 1}, + {"matrix": [4, 9], "x": 208, "y": 24, "flags": 1}, + {"matrix": [5, 0], "x": 224, "y": 24, "flags": 1}, + {"matrix": [5, 1], "x": 0, "y": 36, "flags": 1}, + {"matrix": [5, 2], "x": 13, "y": 36, "flags": 1}, + {"matrix": [5, 3], "x": 26, "y": 36, "flags": 1}, + {"matrix": [5, 4], "x": 39, "y": 36, "flags": 1}, + {"matrix": [5, 5], "x": 52, "y": 36, "flags": 1}, + {"matrix": [5, 6], "x": 65, "y": 36, "flags": 1}, + {"matrix": [5, 7], "x": 78, "y": 36, "flags": 1}, + {"matrix": [5, 8], "x": 91, "y": 36, "flags": 1}, + {"matrix": [5, 9], "x": 104, "y": 36, "flags": 1}, + {"matrix": [6, 0], "x": 117, "y": 36, "flags": 1}, + {"matrix": [6, 1], "x": 130, "y": 36, "flags": 1}, + {"matrix": [6, 2], "x": 143, "y": 36, "flags": 1}, + {"matrix": [6, 3], "x": 156, "y": 36, "flags": 1}, + {"matrix": [6, 4], "x": 169, "y": 36, "flags": 1}, + {"matrix": [6, 5], "x": 0, "y": 48, "flags": 1}, + {"matrix": [6, 6], "x": 13, "y": 48, "flags": 1}, + {"matrix": [6, 7], "x": 26, "y": 48, "flags": 1}, + {"matrix": [6, 8], "x": 39, "y": 48, "flags": 1}, + {"matrix": [6, 9], "x": 52, "y": 48, "flags": 1}, + {"matrix": [7, 0], "x": 65, "y": 48, "flags": 1}, + {"matrix": [7, 1], "x": 78, "y": 48, "flags": 1}, + {"matrix": [7, 2], "x": 91, "y": 48, "flags": 1}, + {"matrix": [7, 3], "x": 104, "y": 48, "flags": 1}, + {"matrix": [7, 4], "x": 117, "y": 48, "flags": 1}, + {"matrix": [7, 5], "x": 130, "y": 48, "flags": 1}, + {"matrix": [7, 6], "x": 143, "y": 48, "flags": 1}, + {"matrix": [7, 7], "x": 156, "y": 48, "flags": 1}, + {"matrix": [7, 8], "x": 169, "y": 48, "flags": 1}, + {"matrix": [7, 9], "x": 208, "y": 48, "flags": 1}, + {"matrix": [8, 0], "x": 0, "y": 64, "flags": 1}, + {"matrix": [8, 1], "x": 13, "y": 64, "flags": 1}, + {"matrix": [8, 2], "x": 26, "y": 64, "flags": 1}, + {"matrix": [8, 3], "x": 78, "y": 64, "flags": 1}, + {"matrix": [8, 4], "x": 130, "y": 64, "flags": 1}, + {"matrix": [8, 5], "x": 143, "y": 64, "flags": 1}, + {"matrix": [8, 6], "x": 156, "y": 64, "flags": 1}, + {"matrix": [8, 7], "x": 169, "y": 64, "flags": 1}, + {"matrix": [8, 8], "x": 195, "y": 64, "flags": 1}, + {"matrix": [8, 9], "x": 208, "y": 64, "flags": 1}, + {"matrix": [9, 0], "x": 224, "y": 64, "flags": 1}, + {"matrix": [9, 1], "x": 182, "y": 0, "flags": 1} + ], "max_brightness": 200, "sleep": true }, diff --git a/keyboards/concreteflowers/cor_tkl/cor_tkl.c b/keyboards/concreteflowers/cor_tkl/cor_tkl.c index d4f0ec0082..a90931439b 100644 --- a/keyboards/concreteflowers/cor_tkl/cor_tkl.c +++ b/keyboards/concreteflowers/cor_tkl/cor_tkl.c @@ -16,22 +16,6 @@ #include "quantum.h" -led_config_t g_led_config = {{ - // Key Matrix to LED Index - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 1, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { 0, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } -}, { - // LED Index to Physical Position - { 5, 40 }, { 211, 0 } -}, { - // LED Index to Flag - LED_FLAG_INDICATOR, LED_FLAG_INDICATOR -}}; - bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; diff --git a/keyboards/concreteflowers/cor_tkl/keyboard.json b/keyboards/concreteflowers/cor_tkl/keyboard.json index d5a293eaa3..ccdd0935fa 100644 --- a/keyboards/concreteflowers/cor_tkl/keyboard.json +++ b/keyboards/concreteflowers/cor_tkl/keyboard.json @@ -32,7 +32,11 @@ "rows": ["GP0", "GP1", "GP2", "GP21", "GP3", "GP4"] }, "rgb_matrix": { - "driver": "ws2812" + "driver": "ws2812", + "layout": [ + {"matrix": [3, 0], "x": 5, "y": 40, "flags": 8}, + {"matrix": [0, 15], "x": 211, "y": 0, "flags": 8} + ] }, "ws2812": { "pin": "GP19",