From e0d15e6182a331ed27535f81539f2d7243d02bc0 Mon Sep 17 00:00:00 2001 From: yulei Date: Sat, 7 Mar 2020 21:19:06 +0800 Subject: fixed #8259 (#8333) --- keyboards/matrix/noah/noah.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'keyboards/matrix/noah/noah.c') diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c index 64069148e5..cf33404434 100644 --- a/keyboards/matrix/noah/noah.c +++ b/keyboards/matrix/noah/noah.c @@ -50,29 +50,20 @@ void rgblight_set(void) { } #endif -void matrix_scan_kb(void) { matrix_scan_user(); } +void matrix_init_kb(void) { matrix_init_user(); } -void matrix_init_kb(void) { - matrix_init_user(); -} __attribute__((weak)) -void matrix_init_user(void) { -#ifdef RGBLIGHT_ENABLE - rgblight_enable(); -#endif +void matrix_init_user(void) { } -#ifdef RGB_MATRIX_ENABLE - rgb_matrix_disable(); -#endif -} - -__attribute__((weak)) -void matrix_scan_user(void) { +void matrix_scan_kb(void) { #ifdef RGBLIGHT_ENABLE - rgblight_task(); + rgblight_task(); #endif + matrix_scan_user(); } +__attribute__((weak)) +void matrix_scan_user(void) { } #ifdef RGB_MATRIX_ENABLE const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { @@ -184,9 +175,9 @@ led_config_t g_led_config = { { 20, 16},{ 42, 32}, { 45, 16},{ 50, 16},{ 65, 16},{ 80, 16},{ 95, 16},{ 70, 32},{ 84, 32},{ 98, 32}, - { 14, 32},{ 56, 32},{ 50, 48},{ 80, 48},{110, 48},{ 95, 48},{100, 64},{112, 64}, + { 14, 32},{ 56, 32},{ 65, 48},{ 80, 48},{110, 48},{ 95, 48},{112, 64},{100, 64}, { 42, 32},{ 38, 64}, - { 0, 32},{ 10, 48},{ 0, 48},{ 20, 48},{ 35, 48},{ 65, 48},{ 0, 64},{ 19, 64}, + { 0, 32},{ 10, 48},{ 0, 48},{ 20, 48},{ 35, 48},{ 50, 48},{ 0, 64},{ 19, 64}, {105, 0},{120, 0},{135, 0},{150, 0},{165, 0},{180, 0},{202, 0},{224, 0}, {110, 16},{224, 16}, -- cgit v1.2.3