From d04180c0dfbb3ee7ca339e8259cff3477524b3a3 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Tue, 21 Dec 2021 09:15:50 +0100 Subject: [PATCH] Rename brightness_timer into display_timenr --- openrtx/src/ui/ui.c | 14 +++++++------- openrtx/src/ui/ui_menu.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index 808a9ec0..1e89b828 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -647,13 +647,13 @@ void _ui_changeContrast(int variation) void _ui_changeTimer(int variation) { - if ((state.settings.brightness_timer == TIMER_OFF && variation < 0) || - (state.settings.brightness_timer == TIMER_1H && variation > 0)) + if ((state.settings.display_timer == TIMER_OFF && variation < 0) || + (state.settings.display_timer == TIMER_1H && variation > 0)) { return; } - state.settings.brightness_timer += variation; + state.settings.display_timer += variation; } bool _ui_checkStandby(long long time_since_last_event) @@ -663,7 +663,7 @@ bool _ui_checkStandby(long long time_since_last_event) return false; } - switch (state.settings.brightness_timer) + switch (state.settings.display_timer) { case TIMER_OFF: return false; @@ -674,19 +674,19 @@ bool _ui_checkStandby(long long time_since_last_event) case TIMER_25S: case TIMER_30S: return time_since_last_event >= - (5000 * state.settings.brightness_timer); + (5000 * state.settings.display_timer); case TIMER_1M: case TIMER_2M: case TIMER_3M: case TIMER_4M: case TIMER_5M: return time_since_last_event >= - (60000 * (state.settings.brightness_timer - (TIMER_1M - 1))); + (60000 * (state.settings.display_timer - (TIMER_1M - 1))); case TIMER_15M: case TIMER_30M: case TIMER_45M: return time_since_last_event >= - (60000 * 15 * (state.settings.brightness_timer - (TIMER_15M - 1))); + (60000 * 15 * (state.settings.display_timer - (TIMER_15M - 1))); case TIMER_1H: return time_since_last_event >= 60 * 60 * 1000; } diff --git a/openrtx/src/ui/ui_menu.c b/openrtx/src/ui/ui_menu.c index 169d3014..eb4c72b2 100644 --- a/openrtx/src/ui/ui_menu.c +++ b/openrtx/src/ui/ui_menu.c @@ -160,7 +160,7 @@ int _ui_getDisplayValueName(char *buf, uint8_t max_len, uint8_t index) #endif case D_TIMER: snprintf(buf, max_len, "%s", - display_timer_values[last_state.settings.brightness_timer]); + display_timer_values[last_state.settings.display_timer]); return 0; } snprintf(buf, max_len, "%d", value);