diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-29 13:36:47 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-29 13:36:47 +1000 |
commit | 39bc8163d013b5c7e148b7e95b3883dc0adb95ba (patch) | |
tree | c58437419875641985bbbf8f1434b3a0d58ecde6 /quantum | |
parent | d8167779cdfb243cb140782210d2cc6a7cb9b123 (diff) | |
download | qmk_firmware-39bc8163d013b5c7e148b7e95b3883dc0adb95ba.tar.gz qmk_firmware-39bc8163d013b5c7e148b7e95b3883dc0adb95ba.zip |
[CI] Format code according to conventions (#12731)
Co-authored-by: QMK Bot <hello@qmk.fm>
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/led_matrix.c | 9 | ||||
-rw-r--r-- | quantum/rgb_matrix.c | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c index 5dd37dff1..3674c9b97 100644 --- a/quantum/led_matrix.c +++ b/quantum/led_matrix.c | |||
@@ -75,7 +75,7 @@ last_hit_t g_last_hit_tracker; | |||
75 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED | 75 | #endif // LED_MATRIX_KEYREACTIVE_ENABLED |
76 | 76 | ||
77 | // internals | 77 | // internals |
78 | static bool suspend_state = false; | 78 | static bool suspend_state = false; |
79 | static uint8_t led_last_enable = UINT8_MAX; | 79 | static uint8_t led_last_enable = UINT8_MAX; |
80 | static uint8_t led_last_effect = UINT8_MAX; | 80 | static uint8_t led_last_effect = UINT8_MAX; |
81 | static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false}; | 81 | static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false}; |
@@ -324,12 +324,11 @@ void led_matrix_task(void) { | |||
324 | 324 | ||
325 | // Ideally we would also stop sending zeros to the LED driver PWM buffers | 325 | // Ideally we would also stop sending zeros to the LED driver PWM buffers |
326 | // while suspended and just do a software shutdown. This is a cheap hack for now. | 326 | // while suspended and just do a software shutdown. This is a cheap hack for now. |
327 | bool suspend_backlight = | 327 | bool suspend_backlight = suspend_state || |
328 | suspend_state || | ||
329 | #if LED_DISABLE_TIMEOUT > 0 | 328 | #if LED_DISABLE_TIMEOUT > 0 |
330 | (led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) || | 329 | (led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) || |
331 | #endif // LED_DISABLE_TIMEOUT > 0 | 330 | #endif // LED_DISABLE_TIMEOUT > 0 |
332 | false; | 331 | false; |
333 | 332 | ||
334 | uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode; | 333 | uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode; |
335 | 334 | ||
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c index 1f7604943..097c5302d 100644 --- a/quantum/rgb_matrix.c +++ b/quantum/rgb_matrix.c | |||
@@ -128,7 +128,7 @@ last_hit_t g_last_hit_tracker; | |||
128 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED | 128 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED |
129 | 129 | ||
130 | // internals | 130 | // internals |
131 | static bool suspend_state = false; | 131 | static bool suspend_state = false; |
132 | static uint8_t rgb_last_enable = UINT8_MAX; | 132 | static uint8_t rgb_last_enable = UINT8_MAX; |
133 | static uint8_t rgb_last_effect = UINT8_MAX; | 133 | static uint8_t rgb_last_effect = UINT8_MAX; |
134 | static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false}; | 134 | static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false}; |
@@ -409,12 +409,11 @@ void rgb_matrix_task(void) { | |||
409 | 409 | ||
410 | // Ideally we would also stop sending zeros to the LED driver PWM buffers | 410 | // Ideally we would also stop sending zeros to the LED driver PWM buffers |
411 | // while suspended and just do a software shutdown. This is a cheap hack for now. | 411 | // while suspended and just do a software shutdown. This is a cheap hack for now. |
412 | bool suspend_backlight = | 412 | bool suspend_backlight = suspend_state || |
413 | suspend_state || | ||
414 | #if RGB_DISABLE_TIMEOUT > 0 | 413 | #if RGB_DISABLE_TIMEOUT > 0 |
415 | (rgb_anykey_timer > (uint32_t)RGB_DISABLE_TIMEOUT) || | 414 | (rgb_anykey_timer > (uint32_t)RGB_DISABLE_TIMEOUT) || |
416 | #endif // RGB_DISABLE_TIMEOUT > 0 | 415 | #endif // RGB_DISABLE_TIMEOUT > 0 |
417 | false; | 416 | false; |
418 | 417 | ||
419 | uint8_t effect = suspend_backlight || !rgb_matrix_config.enable ? 0 : rgb_matrix_config.mode; | 418 | uint8_t effect = suspend_backlight || !rgb_matrix_config.enable ? 0 : rgb_matrix_config.mode; |
420 | 419 | ||