From adde1160b432490751d5bcf2a1b9ff39810b8fd6 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 27 Jun 2021 12:28:42 +0200 Subject: [PATCH] [color] enable insta trim on all views (#347) * [color] enable insta trim on all views Resolves #342 * Removed warning for colorlcd --- radio/src/functions.cpp | 3 --- radio/src/gui/gui_common.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp index a3dc0882c..981b7a8b0 100644 --- a/radio/src/functions.cpp +++ b/radio/src/functions.cpp @@ -178,9 +178,6 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext case FUNC_INSTANT_TRIM: newActiveFunctions |= (1u << FUNCTION_INSTANT_TRIM); if (!isFunctionActive(FUNCTION_INSTANT_TRIM)) { -#if defined(COLORLCD) - #warning IS_INSTANT_TRIM_ALLOWED() is always false -#endif if (IS_INSTANT_TRIM_ALLOWED()) { instantTrim(); } diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h index dfc9d5bac..46efa21d0 100644 --- a/radio/src/gui/gui_common.h +++ b/radio/src/gui/gui_common.h @@ -123,7 +123,7 @@ bool isSwitch2POSWarningStateAvailable(int state); #endif #if defined(LIBOPENUI) -#define IS_INSTANT_TRIM_ALLOWED() false +#define IS_INSTANT_TRIM_ALLOWED() true #elif defined(GUI) #define IS_INSTANT_TRIM_ALLOWED() (IS_MAIN_VIEW_DISPLAYED() || IS_TELEMETRY_VIEW_DISPLAYED() || IS_OTHER_VIEW_DISPLAYED()) #else