mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-12-24 02:05:01 +06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile issues due to LED changes (#13821)

Browse Source
This commit is contained in:
Drashna Jaelre 2021-07-31 09:30:13 -07:00 committed by GitHub
parent 70fb3e1aaf
commit 7bcbeffc2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 135 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/matrix/m20add/rgb_ring.c
View File

@ -21,7 +21,7 @@
#include <string.h>
#include "quantum.h"
#include "rgblight.h"
#include "issi/is31fl3731.h"
#include "drivers/led/issi/is31fl3731.h"
#include "i2c_master.h"

39
keyboards/melgeek/mojo68/rev1/rev1.c
View File

@ -18,17 +18,16 @@
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
{0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
{0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
{0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
{0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
{0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
{0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
{0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
{0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
{0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
{0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
{0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
{0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
{0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
{0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
@ -36,10 +35,10 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
{0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
{0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
{0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
{0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
{0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
{0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
@ -66,7 +65,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
{0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
{0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
{0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
{0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
{0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
@ -101,14 +100,14 @@ led_config_t g_led_config = {
}, {
{0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, {224, 0},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, {224, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 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, 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,
}
};

229
keyboards/xbows/ranger/ranger.c
View File

@ -15,128 +15,129 @@
*/
#include "ranger.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C3_3, C2_3, C1_3}, // L01
{0, C3_4, C2_4, C1_4}, // L02
{0, C3_5, C2_5, C1_5}, // L03
{0, C3_6, C2_6, C1_6}, // L04
{0, C3_7, C2_7, C1_7}, // L05
{0, C3_8, C2_8, C1_8}, // L06
{1, C3_3, C2_3, C1_3}, // L07
{1, C3_4, C2_4, C1_4}, // L08
{1, C3_5, C2_5, C1_5}, // L09
{1, C3_6, C2_6, C1_6}, // L10
{1, C3_7, C2_7, C1_7}, // L11
{1, C3_8, C2_8, C1_8}, // L12
{2, C3_4, C2_4, C1_4}, // L13
{2, C3_5, C2_5, C1_5}, // L14
{2, C3_6, C2_6, C1_6}, // L15
{2, C3_7, C2_7, C1_7}, // L16
{0, C3_3, C2_3, C1_3}, // L01
{0, C3_4, C2_4, C1_4}, // L02
{0, C3_5, C2_5, C1_5}, // L03
{0, C3_6, C2_6, C1_6}, // L04
{0, C3_7, C2_7, C1_7}, // L05
{0, C3_8, C2_8, C1_8}, // L06
{1, C3_3, C2_3, C1_3}, // L07
{1, C3_4, C2_4, C1_4}, // L08
{1, C3_5, C2_5, C1_5}, // L09
{1, C3_6, C2_6, C1_6}, // L10
{1, C3_7, C2_7, C1_7}, // L11
{1, C3_8, C2_8, C1_8}, // L12
{2, C3_4, C2_4, C1_4}, // L13
{2, C3_5, C2_5, C1_5}, // L14
{2, C3_6, C2_6, C1_6}, // L15
{2, C3_7, C2_7, C1_7}, // L16
{0, C6_1, C5_1, C4_1}, // L17
{0, C6_2, C5_2, C4_2}, // L18
{0, C6_3, C5_3, C4_3}, // L19
{0, C6_6, C5_6, C4_6}, // L20
{0, C6_7, C5_7, C4_7}, // L21
{0, C6_8, C5_8, C4_8}, // L22
{1, C6_1, C5_1, C4_1}, // L23
{1, C6_2, C5_2, C4_2}, // L24
{1, C6_3, C5_3, C4_3}, // L25
{1, C6_6, C5_6, C4_6}, // L26
{1, C6_7, C5_7, C4_7}, // L27
{1, C6_8, C5_8, C4_8}, // L28
{2, C6_1, C5_1, C4_1}, // L29
{2, C6_3, C5_3, C4_3}, // L31
{2, C6_6, C5_6, C4_6}, // L32
{2, C6_7, C5_7, C4_7}, // L33
{0, C6_1, C5_1, C4_1}, // L17
{0, C6_2, C5_2, C4_2}, // L18
{0, C6_3, C5_3, C4_3}, // L19
{0, C6_6, C5_6, C4_6}, // L20
{0, C6_7, C5_7, C4_7}, // L21
{0, C6_8, C5_8, C4_8}, // L22
{1, C6_1, C5_1, C4_1}, // L23
{1, C6_2, C5_2, C4_2}, // L24
{1, C6_3, C5_3, C4_3}, // L25
{1, C6_6, C5_6, C4_6}, // L26
{1, C6_7, C5_7, C4_7}, // L27
{1, C6_8, C5_8, C4_8}, // L28
{2, C6_1, C5_1, C4_1}, // L29
{2, C6_3, C5_3, C4_3}, // L31
{2, C6_6, C5_6, C4_6}, // L32
{2, C6_7, C5_7, C4_7}, // L33
{0, C9_1, C8_1, C7_1}, // L34
{0, C9_2, C8_2, C7_2}, // L35
{0, C9_3, C8_3, C7_3}, // L36
{0, C9_4, C8_4, C7_4}, // L37
{0, C9_5, C8_5, C7_5}, // L38
{0, C9_6, C8_6, C7_6}, // L39
{1, C9_1, C8_1, C7_1}, // L40
{1, C9_2, C8_2, C7_2}, // L41
{1, C9_3, C8_3, C7_3}, // L42
{1, C9_4, C8_4, C7_4}, // L43
{1, C9_5, C8_5, C7_5}, // L44
{1, C9_6, C8_6, C7_6}, // L45
{2, C9_1, C8_1, C7_1}, // L46
{2, C9_3, C8_3, C7_3}, // L48
{2, C9_4, C8_4, C7_4}, // L49
{2, C9_6, C8_6, C7_6}, // L50
{0, C9_1, C8_1, C7_1}, // L34
{0, C9_2, C8_2, C7_2}, // L35
{0, C9_3, C8_3, C7_3}, // L36
{0, C9_4, C8_4, C7_4}, // L37
{0, C9_5, C8_5, C7_5}, // L38
{0, C9_6, C8_6, C7_6}, // L39
{1, C9_1, C8_1, C7_1}, // L40
{1, C9_2, C8_2, C7_2}, // L41
{1, C9_3, C8_3, C7_3}, // L42
{1, C9_4, C8_4, C7_4}, // L43
{1, C9_5, C8_5, C7_5}, // L44
{1, C9_6, C8_6, C7_6}, // L45
{2, C9_1, C8_1, C7_1}, // L46
{2, C9_3, C8_3, C7_3}, // L48
{2, C9_4, C8_4, C7_4}, // L49
{2, C9_6, C8_6, C7_6}, // L50
{0, C3_11, C2_11, C1_11}, // L51
{0, C3_12, C2_12, C1_12}, // L52
{0, C3_13, C2_13, C1_13}, // L53
{0, C3_14, C2_14, C1_14}, // L54
{0, C3_15, C2_15, C1_15}, // L55
{0, C3_16, C2_16, C1_16}, // L56
{1, C3_11, C2_11, C1_11}, // L57
{1, C3_12, C2_12, C1_12}, // L58
{1, C3_13, C2_13, C1_13}, // L59
{1, C3_14, C2_14, C1_14}, // L60
{1, C3_15, C2_15, C1_15}, // L61
{1, C3_16, C2_16, C1_16}, // L62
{2, C3_14, C2_14, C1_14}, // L63
{2, C6_2, C5_2, C4_2 }, // L30
{0, C3_11, C2_11, C1_11}, // L51
{0, C3_12, C2_12, C1_12}, // L52
{0, C3_13, C2_13, C1_13}, // L53
{0, C3_14, C2_14, C1_14}, // L54
{0, C3_15, C2_15, C1_15}, // L55
{0, C3_16, C2_16, C1_16}, // L56
{1, C3_11, C2_11, C1_11}, // L57
{1, C3_12, C2_12, C1_12}, // L58
{1, C3_13, C2_13, C1_13}, // L59
{1, C3_14, C2_14, C1_14}, // L60
{1, C3_15, C2_15, C1_15}, // L61
{1, C3_16, C2_16, C1_16}, // L62
{2, C3_14, C2_14, C1_14}, // L63
{2, C6_2, C5_2, C4_2}, // L30
{0, C6_9, C5_9, C4_9}, // L64
{0, C6_10, C5_10, C4_10}, // L65
{0, C6_11, C5_11, C4_11}, // L66
{0, C6_14, C5_14, C4_14}, // L67
{0, C6_15, C5_15, C4_15}, // L68
{0, C6_16, C5_16, C4_16}, // L69
{1, C6_10, C5_10, C4_10}, // L70
{1, C6_11, C5_11, C4_11}, // L71
{1, C6_14, C5_14, C4_14}, // L72
{1, C6_15, C5_15, C4_15}, // L73
{1, C6_16, C5_16, C4_16}, // L74
{2, C3_15, C2_15, C1_15}, // L75
{2, C9_2, C8_2, C7_2 }, // L47
{2, C9_14, C8_14, C7_14}, // L76
{0, C6_9, C5_9, C4_9}, // L64
{0, C6_10, C5_10, C4_10}, // L65
{0, C6_11, C5_11, C4_11}, // L66
{0, C6_14, C5_14, C4_14}, // L67
{0, C6_15, C5_15, C4_15}, // L68
{0, C6_16, C5_16, C4_16}, // L69
{1, C6_10, C5_10, C4_10}, // L70
{1, C6_11, C5_11, C4_11}, // L71
{1, C6_14, C5_14, C4_14}, // L72
{1, C6_15, C5_15, C4_15}, // L73
{1, C6_16, C5_16, C4_16}, // L74
{2, C3_15, C2_15, C1_15}, // L75
{2, C9_2, C8_2, C7_2}, // L47
{2, C9_14, C8_14, C7_14}, // L76
{0, C9_9, C8_9, C7_9}, // L77
{0, C9_10, C8_10, C7_10}, // L78
{0, C9_11, C8_11, C7_11}, // L79
{1, C6_9, C5_9, C4_9}, // L80
{1, C9_13, C8_13, C7_13}, // L81
{1, C9_14, C8_14, C7_14}, // L82
{2, C9_9, C8_9, C7_9}, // L83
{2, C9_10, C8_10, C7_10}, // L84
{2, C9_11, C8_11, C7_11}, // L85
{2, C9_12, C8_12, C7_12}, // L86
{2, C9_13, C8_13, C7_13}, // L87
{0, C9_9, C8_9, C7_9}, // L77
{0, C9_10, C8_10, C7_10}, // L78
{0, C9_11, C8_11, C7_11}, // L79
{1, C6_9, C5_9, C4_9}, // L80
{1, C9_13, C8_13, C7_13}, // L81
{1, C9_14, C8_14, C7_14}, // L82
{2, C9_9, C8_9, C7_9}, // L83
{2, C9_10, C8_10, C7_10}, // L84
{2, C9_11, C8_11, C7_11}, // L85
{2, C9_12, C8_12, C7_12}, // L86
{2, C9_13, C8_13, C7_13}, // L87n
};
};
// clang-format off
led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 },
{ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 },
{ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, NO_LED, NO_LED },
{ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, NO_LED, 73, 74, 75, NO_LED },
{ 76, 77, 78, NO_LED, NO_LED, 79, NO_LED, NO_LED, NO_LED, 80, 81, 82, 83, 84, 85, 86 }
}, {
{0,0}, {24,0}, {36,0}, {48,0}, {60,0}, {78,0}, {90,0}, {102,0}, {114,0}, {132,0}, {144,0}, {156,0}, {168,0}, {182,0}, {194,0}, {206,0},
{0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {84,15}, {96,15}, {108,15}, {120,15}, {132,15}, {144,15}, {182,15}, {194,15},{206,15},
{3,27}, {18,27}, {30,27}, {42,27}, {54,27}, {66,27}, {78,27}, {90,27}, {102,27}, {114,27}, {126,27}, {138,27}, {150,27}, {182,27}, {194,27},{206,27},
{4,39}, {20,39}, {32,39}, {44,39}, {56,39}, {68,39}, {80,39}, {92,39}, {104,39}, {116,39}, {128,39}, {140,39}, {162,39}, {162,15},
{6,51}, {26,51}, {38,51}, {50,51}, {62,51}, {74,51}, {86,51}, {98,51}, {110,51}, {122,51}, {134,51}, {155,51}, {165,27}, {210,51},
{1,63}, {16,63}, {31,63}, {64,63}, {121,63},{136,63}, {151,63}, {166,63},{182,63}, {194,63}, {206,63}
}, {
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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
}
};
// clang-format on
led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 },
{ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 },
{ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, NO_LED, NO_LED },
{ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, NO_LED, 73, 74, 75, NO_LED },
{ 76, 77, 78, NO_LED, NO_LED, 79, NO_LED, NO_LED, NO_LED, 80, 81, 82, 83, 84, 85, 86 }
}, {
{0,0}, {24,0}, {36,0}, {48,0}, {60,0}, {78,0}, {90,0}, {102,0}, {114,0}, {132,0}, {144,0}, {156,0}, {168,0}, {182,0}, {194,0}, {206,0},
{0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {84,15}, {96,15}, {108,15}, {120,15}, {132,15}, {144,15}, {182,15}, {194,15},{206,15},
{3,27}, {18,27}, {30,27}, {42,27}, {54,27}, {66,27}, {78,27}, {90,27}, {102,27}, {114,27}, {126,27}, {138,27}, {150,27}, {182,27}, {194,27},{206,27},
{4,39}, {20,39}, {32,39}, {44,39}, {56,39}, {68,39}, {80,39}, {92,39}, {104,39}, {116,39}, {128,39}, {140,39}, {162,39}, {162,15},
{6,51}, {26,51}, {38,51}, {50,51}, {62,51}, {74,51}, {86,51}, {98,51}, {110,51}, {122,51}, {134,51}, {155,51}, {165,27}, {210,51},
{1,63}, {16,63}, {31,63}, {64,63}, {121,63},{136,63}, {151,63}, {166,63},{182,63}, {194,63}, {206,63}
}, {
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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
} };
__attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
__attribute__((weak)) void rgb_matrix_indicators_user(void) {
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(48, 0xFF, 0xFF, 0xFF);
}