From 67fc2c911325e3a8dedc97dc2fcbc67b48c65874 Mon Sep 17 00:00:00 2001 From: Fernando Birra Date: Sun, 19 Nov 2023 01:00:56 +0000 Subject: [PATCH] Moved Led coords and flags into info.json --- keyboards/royal_kludge/rk61_rgb/config.h | 1 - keyboards/royal_kludge/rk61_rgb/config_led.c | 26 -------------------- keyboards/royal_kludge/rk61_rgb/info.json | 8 +++--- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/keyboards/royal_kludge/rk61_rgb/config.h b/keyboards/royal_kludge/rk61_rgb/config.h index 4612e79c223a..dd8e28ec19b1 100644 --- a/keyboards/royal_kludge/rk61_rgb/config.h +++ b/keyboards/royal_kludge/rk61_rgb/config.h @@ -18,7 +18,6 @@ /* RGB matrix configuration can't be fully expressed in JSON as of now */ #define RGB_MATRIX_LED_COUNT 61 -//#define SN32_RGB_MATRIX_ROW_PINS { C5, C4, C6, C8, C7, C9, C11, C10, C12, C14, C13, B13, B15, D3, B14 } #define SN32_RGB_MATRIX_ROW_PINS { C5, C6, C4, C8, C9, C7, C11, C12, C10, C14, B13, C13, B15, B14, D3 } /* Enable additional RGB effects */ diff --git a/keyboards/royal_kludge/rk61_rgb/config_led.c b/keyboards/royal_kludge/rk61_rgb/config_led.c index d4b6016d9e16..041c5c5e8b71 100644 --- a/keyboards/royal_kludge/rk61_rgb/config_led.c +++ b/keyboards/royal_kludge/rk61_rgb/config_led.c @@ -22,32 +22,6 @@ along with this program. If not, see . # include "rgb_matrix.h" # include "config_led.h" -led_config_t g_led_config = { - { - {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,}, - {14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,}, - {28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, NO_LED, 40,}, - {41, NO_LED, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NO_LED,}, - {53, 54, 55, NO_LED, NO_LED, NO_LED, 56, NO_LED, NO_LED, 57, 58, 59, NO_LED, 60,} - }, - { - {8, 0}, {24, 0}, {39, 0}, {55, 0}, {70, 0}, {86, 0}, {101, 0}, {117, 0}, {132, 0}, {148, 0}, {164, 0}, {180, 0}, {195, 0}, {218, 0}, - {11, 16}, {31, 16}, {47, 16}, {62, 16}, {78, 16}, {93, 16}, {109, 16}, {124, 16}, {140, 16}, {155, 16}, {171, 16}, {186, 16}, {202, 16}, {221, 16}, - {13, 32}, {34, 32}, {50, 32}, {65, 32}, {81, 32}, {96, 32}, {112, 32}, {128, 32}, {143, 32}, {159, 32}, {174, 32}, {190, 32}, {215, 32}, - {17, 48}, {42, 48}, {57, 48}, {73, 48}, {88, 48}, {104, 48}, {119, 48}, {135, 48}, {150, 48}, {166, 48}, {182, 48}, {211, 48}, - {10, 64}, {29, 64}, {49, 64}, {107, 64}, {165, 64}, {185, 64}, {204, 64}, {224, 64}, - }, - { - 4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4,4,4,4, - 4, - } -}; - bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { if (host_keyboard_led_state().caps_lock) { // Set capslock key to orange (capslock is led number 28) diff --git a/keyboards/royal_kludge/rk61_rgb/info.json b/keyboards/royal_kludge/rk61_rgb/info.json index cf94d40f7f6b..e872c88d8f01 100644 --- a/keyboards/royal_kludge/rk61_rgb/info.json +++ b/keyboards/royal_kludge/rk61_rgb/info.json @@ -104,15 +104,15 @@ { "matrix":[3, 9], "flags":4, "x":148, "y":48 }, { "matrix":[3, 10], "flags":4, "x":164, "y":48 }, { "matrix":[3, 11], "flags":4, "x":180, "y":48 }, - { "matrix":[3, 13], "flags":4, "x":196, "y":48 }, + { "matrix":[3, 12], "flags":4, "x":196, "y":48 }, { "matrix":[4, 0], "flags":4, "x":2, "y":64 }, { "matrix":[4, 1], "flags":4, "x":22, "y":64 }, { "matrix":[4, 2], "flags":4, "x":42, "y":64 }, { "matrix":[4, 6], "flags":4, "x":102, "y":64 }, - { "matrix":[4, 10], "flags":4, "x":162, "y":64 }, - { "matrix":[4, 11], "flags":4, "x":182, "y":64 }, - { "matrix":[4, 12], "flags":4, "x":202, "y":64 }, + { "matrix":[4, 9], "flags":4, "x":162, "y":64 }, + { "matrix":[4, 10], "flags":4, "x":182, "y":64 }, + { "matrix":[4, 11], "flags":4, "x":202, "y":64 }, { "matrix":[4, 13], "flags":4, "x":222, "y":64 } ] },