mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-16 12:51:47 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
da066c78a7
@ -393,7 +393,6 @@ bool shutdown_kb(bool jump_to_bootloader) {
|
|||||||
rgblight_setrgb(RGB_RED);
|
rgblight_setrgb(RGB_RED);
|
||||||
#endif // RGBLIGHT_ENABLE
|
#endif // RGBLIGHT_ENABLE
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
void rgb_matrix_update_pwm_buffers(void);
|
|
||||||
rgb_matrix_set_color_all(RGB_RED);
|
rgb_matrix_set_color_all(RGB_RED);
|
||||||
rgb_matrix_update_pwm_buffers();
|
rgb_matrix_update_pwm_buffers();
|
||||||
#endif // RGB_MATRIX_ENABLE
|
#endif // RGB_MATRIX_ENABLE
|
||||||
|
@ -354,7 +354,6 @@ bool shutdown_kb(bool jump_to_bootloader) {
|
|||||||
rgblight_setrgb(RGB_RED);
|
rgblight_setrgb(RGB_RED);
|
||||||
#endif // RGBLIGHT_ENABLE
|
#endif // RGBLIGHT_ENABLE
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
void rgb_matrix_update_pwm_buffers(void);
|
|
||||||
rgb_matrix_set_color_all(RGB_RED);
|
rgb_matrix_set_color_all(RGB_RED);
|
||||||
rgb_matrix_update_pwm_buffers();
|
rgb_matrix_update_pwm_buffers();
|
||||||
#endif // RGB_MATRIX_ENABLE
|
#endif // RGB_MATRIX_ENABLE
|
||||||
|
@ -165,7 +165,6 @@ uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) {
|
|||||||
wait_ms(50);
|
wait_ms(50);
|
||||||
eeconfig_init();
|
eeconfig_init();
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
extern void rgb_matrix_update_pwm_buffers(void);
|
|
||||||
for(int i = 0; i < 5; i++) {
|
for(int i = 0; i < 5; i++) {
|
||||||
rgb_matrix_set_color_all(RGB_WHITE);
|
rgb_matrix_set_color_all(RGB_WHITE);
|
||||||
rgb_matrix_update_pwm_buffers();
|
rgb_matrix_update_pwm_buffers();
|
||||||
|
@ -212,6 +212,7 @@ void rgb_matrix_decrease_speed_noeeprom(void);
|
|||||||
led_flags_t rgb_matrix_get_flags(void);
|
led_flags_t rgb_matrix_get_flags(void);
|
||||||
void rgb_matrix_set_flags(led_flags_t flags);
|
void rgb_matrix_set_flags(led_flags_t flags);
|
||||||
void rgb_matrix_set_flags_noeeprom(led_flags_t flags);
|
void rgb_matrix_set_flags_noeeprom(led_flags_t flags);
|
||||||
|
void rgb_matrix_update_pwm_buffers(void);
|
||||||
|
|
||||||
#ifndef RGBLIGHT_ENABLE
|
#ifndef RGBLIGHT_ENABLE
|
||||||
# define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix
|
# define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix
|
||||||
|
Loading…
Reference in New Issue
Block a user