From a336c2c5005251e4cb0f3a62ccabdb4cfccad915 Mon Sep 17 00:00:00 2001 From: lokher Date: Tue, 6 Dec 2022 17:10:48 +0800 Subject: Merge upstream master to 2022 Q4 breaking change --- quantum/led_matrix/led_matrix.c | 2 +- quantum/led_matrix/led_matrix.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'quantum/led_matrix') 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 -- cgit v1.2.3