diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:10:48 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-07 15:50:49 +0800 |
| commit | a336c2c5005251e4cb0f3a62ccabdb4cfccad915 (patch) | |
| tree | 3c948b631a5e3b6f940dabe02fad3c7487e6f350 /quantum | |
| parent | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (diff) | |
Merge upstream master to 2022 Q4 breaking change
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/led_matrix/led_matrix.c | 2 | ||||
| -rw-r--r-- | quantum/led_matrix/led_matrix.h | 4 | ||||
| -rw-r--r-- | quantum/rgb_matrix/rgb_matrix.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c index 59bfbdf0db..82cfd8626e 100644 --- a/quantum/led_matrix/led_matrix.c +++ b/quantum/led_matrix/led_matrix.c @@ -105,7 +105,7 @@ static uint8_t led_last_enable = UINT8_MAX; static uint8_t led_last_effect = UINT8_MAX; static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false}; static led_task_states led_task_state = SYNCING; -#if led_matrix_timeout > 0 +#if LED_MATRIX_TIMEOUT > 0 static uint32_t led_anykey_timer; static uint32_t led_matrix_timeout = LED_MATRIX_TIMEOUT; #endif // LED_MATRIX_TIMEOUT > 0 diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h index 5f3088514c..208486a9df 100644 --- a/quantum/led_matrix/led_matrix.h +++ b/quantum/led_matrix/led_matrix.h @@ -168,8 +168,8 @@ led_flags_t led_matrix_get_flags(void); void led_matrix_set_flags(led_flags_t flags); void led_matrix_set_flags_noeeprom(led_flags_t flags); -#ifdef LED_DISABLE_TIMEOUT -# if LED_DISABLE_TIMEOUT > 0 +#ifdef LED_MATRIX_TIMEOUT +# if LED_MATRIX_TIMEOUT > 0 void led_matrix_disable_timeout_set(uint32_t timeout); void led_matrix_disable_time_reset(void); # endif diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h index 8c6875bf54..000d171353 100644 --- a/quantum/rgb_matrix/rgb_matrix.h +++ b/quantum/rgb_matrix/rgb_matrix.h @@ -88,7 +88,7 @@ #define RGB_MATRIX_TEST_LED_FLAGS() \ if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) continue -#define RGB_MATRIX_TIMEOUT_INFINITE (UINT32_MAX) +#define RGB_MATRIX_TIMEOUT_INFINITE (UINT32_MAX) enum rgb_matrix_effects { RGB_MATRIX_NONE = 0, |