From 7682b2378d2f27a40246df299b790067c2c407a6 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Mon, 27 Nov 2023 13:23:48 +0800 Subject: [PATCH] fl16: Re-enable RGB backlight Can still get into BIOS setup menu on cold and warm boot. Signed-off-by: Daniel Schaefer --- keyboards/framework/ansi/rules.mk | 2 +- keyboards/framework/macropad/rules.mk | 2 +- keyboards/framework/matrix.c | 2 +- quantum/keyboard.c | 28 +++++++++++++-------------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/keyboards/framework/ansi/rules.mk b/keyboards/framework/ansi/rules.mk index b888963aa1..68d6023391 100644 --- a/keyboards/framework/ansi/rules.mk +++ b/keyboards/framework/ansi/rules.mk @@ -1,4 +1,4 @@ # Debugging (enabled in info.json) #CONSOLE_ENABLE = yes -RGB_MATRIX_ENABLE = no +RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3743A diff --git a/keyboards/framework/macropad/rules.mk b/keyboards/framework/macropad/rules.mk index e3f5384c66..a98954a13d 100644 --- a/keyboards/framework/macropad/rules.mk +++ b/keyboards/framework/macropad/rules.mk @@ -1,2 +1,2 @@ -RGB_MATRIX_ENABLE = no +RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3743A diff --git a/keyboards/framework/matrix.c b/keyboards/framework/matrix.c index 73db62baff..4774799257 100644 --- a/keyboards/framework/matrix.c +++ b/keyboards/framework/matrix.c @@ -328,7 +328,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { //if (rgb_init_timer > 0 && TIMER_DIFF_16(timer_read(), rgb_init_timer) >= 10000) { //if (rgb_init_timer > 0 && TIMER_DIFF_16(timer_read(), rgb_init_timer) >= 100) { //if (!bios_mode || rgb_init_timer > 0 && TIMER_DIFF_16(timer_read(), rgb_init_timer) >= 10000) { - rgb_matrix_init(); + //rgb_matrix_init(); rgb_init = true; } } diff --git a/quantum/keyboard.c b/quantum/keyboard.c index 3621405035..686762c06d 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c @@ -384,20 +384,20 @@ void quantum_init(void) { backlight_init_ports(); #endif #ifdef AUDIO_ENABLE - audio_init() + audio_init(); #endif #ifdef LED_MATRIX_ENABLE - led_matrix_init() + led_matrix_init(); #endif #ifdef RGB_MATRIX_ENABLE // Here - //rgb_matrix_init(); + rgb_matrix_init(); #endif #if defined(UNICODE_COMMON_ENABLE) - unicode_input_mode_init() + unicode_input_mode_init(); #endif #ifdef HAPTIC_ENABLE - haptic_init() + haptic_init(); #endif } @@ -412,10 +412,10 @@ void keyboard_init(void) { //via_init(); #endif #ifdef SPLIT_KEYBOARD - split_pre_init() + split_pre_init(); #endif #ifdef ENCODER_ENABLE - encoder_init() + encoder_init(); #endif matrix_init(); quantum_init(); @@ -429,39 +429,39 @@ void keyboard_init(void) { st7565_init(DISPLAY_ROTATION_0); #endif #ifdef PS2_MOUSE_ENABLE - ps2_mouse_init() + ps2_mouse_init(); #endif #ifdef BACKLIGHT_ENABLE backlight_init(); #endif #ifdef RGBLIGHT_ENABLE - rgblight_init() + rgblight_init(); #endif #ifdef STENO_ENABLE_ALL - steno_init() + steno_init(); #endif #if defined(NKRO_ENABLE) && defined(FORCE_NKRO) keymap_config.nkro = 1; eeconfig_update_keymap(keymap_config.raw); #endif #ifdef DIP_SWITCH_ENABLE - dip_switch_init() + dip_switch_init(); #endif #ifdef SLEEP_LED_ENABLE - sleep_led_init() + sleep_led_init(); #endif #ifdef VIRTSER_ENABLE virtser_init(); #endif #ifdef SPLIT_KEYBOARD - split_post_init() + split_post_init(); #endif #ifdef POINTING_DEVICE_ENABLE // init after split init pointing_device_init(); #endif #ifdef BLUETOOTH_ENABLE - bluetooth_init() + bluetooth_init(); #endif #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)