Fix compile issues due to LED changes (#13821)

master
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

View File

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

View File

@ -18,8 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */

View File

@ -15,7 +15,7 @@
*/ */
#include "ranger.h" #include "ranger.h"
#ifdef RGB_MATRIX_ENABLE #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_3, C2_3, C1_3}, // L01
{0, C3_4, C2_4, C1_4}, // L02 {0, C3_4, C2_4, C1_4}, // L02
@ -81,7 +81,7 @@
{1, C3_15, C2_15, C1_15}, // L61 {1, C3_15, C2_15, C1_15}, // L61
{1, C3_16, C2_16, C1_16}, // L62 {1, C3_16, C2_16, C1_16}, // L62
{2, C3_14, C2_14, C1_14}, // L63 {2, C3_14, C2_14, C1_14}, // L63
{2, C6_2, C5_2, C4_2 }, // L30 {2, C6_2, C5_2, C4_2}, // L30
{0, C6_9, C5_9, C4_9}, // L64 {0, C6_9, C5_9, C4_9}, // L64
{0, C6_10, C5_10, C4_10}, // L65 {0, C6_10, C5_10, C4_10}, // L65
@ -95,7 +95,7 @@
{1, C6_15, C5_15, C4_15}, // L73 {1, C6_15, C5_15, C4_15}, // L73
{1, C6_16, C5_16, C4_16}, // L74 {1, C6_16, C5_16, C4_16}, // L74
{2, C3_15, C2_15, C1_15}, // L75 {2, C3_15, C2_15, C1_15}, // L75
{2, C9_2, C8_2, C7_2 }, // L47 {2, C9_2, C8_2, C7_2}, // L47
{2, C9_14, C8_14, C7_14}, // L76 {2, C9_14, C8_14, C7_14}, // L76
{0, C9_9, C8_9, C7_9}, // L77 {0, C9_9, C8_9, C7_9}, // L77
@ -108,11 +108,11 @@
{2, C9_10, C8_10, C7_10}, // L84 {2, C9_10, C8_10, C7_10}, // L84
{2, C9_11, C8_11, C7_11}, // L85 {2, C9_11, C8_11, C7_11}, // L85
{2, C9_12, C8_12, C7_12}, // L86 {2, C9_12, C8_12, C7_12}, // L86
{2, C9_13, C8_13, C7_13}, // L87 {2, C9_13, C8_13, C7_13}, // L87n
};
}; // clang-format off
led_config_t g_led_config = { {
led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 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 }, { 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 }, { 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 },
@ -133,10 +133,11 @@
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 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
__attribute__((weak)) void rgb_matrix_indicators_user(void) {
__attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
if (host_keyboard_led_state().caps_lock) { if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(48, 0xFF, 0xFF, 0xFF); rgb_matrix_set_color(48, 0xFF, 0xFF, 0xFF);
} }