Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[CI] Format code according to conventions (#12731)

Browse source 
Co-authored-by: QMK Bot <hello@qmk.fm>
This commit is contained in:
github-actions[bot] 2021-04-29 13:36:47 +10:00 committed by GitHub
parent d8167779cd
commit 39bc8163d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
quantum/led_matrix.c
View file

@ -75,7 +75,7 @@ last_hit_t g_last_hit_tracker;
#endif // LED_MATRIX_KEYREACTIVE_ENABLED #endif // LED_MATRIX_KEYREACTIVE_ENABLED
// internals // internals
static bool suspend_state = false; static bool suspend_state = false;
static uint8_t led_last_enable = UINT8_MAX; static uint8_t led_last_enable = UINT8_MAX;
static uint8_t led_last_effect = UINT8_MAX; static uint8_t led_last_effect = UINT8_MAX;
static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false}; static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false};
@ -324,12 +324,11 @@ void led_matrix_task(void) {
// Ideally we would also stop sending zeros to the LED driver PWM buffers // Ideally we would also stop sending zeros to the LED driver PWM buffers
// while suspended and just do a software shutdown. This is a cheap hack for now. // while suspended and just do a software shutdown. This is a cheap hack for now.
bool suspend_backlight = bool suspend_backlight = suspend_state ||
suspend_state ||
#if LED_DISABLE_TIMEOUT > 0 #if LED_DISABLE_TIMEOUT > 0
(led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) || (led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) ||
#endif // LED_DISABLE_TIMEOUT > 0 #endif // LED_DISABLE_TIMEOUT > 0
false; false;
uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode; uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode;

9
quantum/rgb_matrix.c
View file

@ -128,7 +128,7 @@ last_hit_t g_last_hit_tracker;
#endif // RGB_MATRIX_KEYREACTIVE_ENABLED #endif // RGB_MATRIX_KEYREACTIVE_ENABLED
// internals // internals
static bool suspend_state = false; static bool suspend_state = false;
static uint8_t rgb_last_enable = UINT8_MAX; static uint8_t rgb_last_enable = UINT8_MAX;
static uint8_t rgb_last_effect = UINT8_MAX; static uint8_t rgb_last_effect = UINT8_MAX;
static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false}; static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false};
@ -409,12 +409,11 @@ void rgb_matrix_task(void) {
// Ideally we would also stop sending zeros to the LED driver PWM buffers // Ideally we would also stop sending zeros to the LED driver PWM buffers
// while suspended and just do a software shutdown. This is a cheap hack for now. // while suspended and just do a software shutdown. This is a cheap hack for now.
bool suspend_backlight = bool suspend_backlight = suspend_state ||
suspend_state ||
#if RGB_DISABLE_TIMEOUT > 0 #if RGB_DISABLE_TIMEOUT > 0
(rgb_anykey_timer > (uint32_t)RGB_DISABLE_TIMEOUT) || (rgb_anykey_timer > (uint32_t)RGB_DISABLE_TIMEOUT) ||
#endif // RGB_DISABLE_TIMEOUT > 0 #endif // RGB_DISABLE_TIMEOUT > 0
false; false;
uint8_t effect = suspend_backlight || !rgb_matrix_config.enable ? 0 : rgb_matrix_config.mode; uint8_t effect = suspend_backlight || !rgb_matrix_config.enable ? 0 : rgb_matrix_config.mode;

4
tmk_core/common/avr/suspend.c
View file

@ -218,9 +218,9 @@ void suspend_wakeup_init(void) {
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
rgblight_wakeup(); rgblight_wakeup();
#endif #endif
# if defined(RGB_MATRIX_ENABLE) #if defined(RGB_MATRIX_ENABLE)
rgb_matrix_set_suspend_state(false); rgb_matrix_set_suspend_state(false);
# endif #endif
suspend_wakeup_init_kb(); suspend_wakeup_init_kb();
} }

8
tmk_core/common/chibios/suspend.c
View file

@ -83,9 +83,9 @@ void suspend_power_down(void) {
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
rgblight_suspend(); rgblight_suspend();
#endif #endif
# if defined(RGB_MATRIX_ENABLE) #if defined(RGB_MATRIX_ENABLE)
rgb_matrix_set_suspend_state(true); rgb_matrix_set_suspend_state(true);
# endif #endif
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
#endif /* AUDIO_ENABLE */ #endif /* AUDIO_ENABLE */
@ -154,8 +154,8 @@ void suspend_wakeup_init(void) {
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
rgblight_wakeup(); rgblight_wakeup();
#endif #endif
# if defined(RGB_MATRIX_ENABLE) #if defined(RGB_MATRIX_ENABLE)
rgb_matrix_set_suspend_state(false); rgb_matrix_set_suspend_state(false);
# endif #endif
suspend_wakeup_init_kb(); suspend_wakeup_init_kb();
} }