From cbf0e6630d01b2344bdd907f08dc5331c8fd57f4 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 13 Jul 2019 12:01:41 +0200 Subject: [PATCH] Popup level option (only levels 1 and 3 are used today) (#6562) --- radio/src/CMakeLists.txt | 3 +++ radio/src/gui/128x64/model_setup.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 756f58b20..11c90840b 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -16,6 +16,7 @@ set_property(CACHE PPM_UNIT PROPERTY STRINGS US PERCENT_PREC1 PERCENT_PREC0) set(DEFAULT_MODE "" CACHE STRING "Default sticks mode") set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") set_property(CACHE FONT PROPERTY STRINGS SQT5) +set(POPUP_LEVEL 3 CACHE INT "Popup level") option(HELI "Heli menu" ON) option(FLIGHT_MODES "Flight Modes" ON) @@ -316,6 +317,8 @@ if(FRSKY_RELEASE) add_definitions(-DFRSKY_RELEASE) endif() +add_definitions(-DPOPUP_LEVEL=${POPUP_LEVEL}) + set(SRC ${SRC} opentx.cpp diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 4f79bf201..b28833283 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -909,6 +909,7 @@ void menuModelSetup(event_t event) POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); } +#if POPUP_LEVEL >= 3 else if (g_model.moduleData[EXTERNAL_MODULE].subType == MODULE_SUBTYPE_R9M_EU) { POPUP_WARNING(STR_R9M_PROTO_EU_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); @@ -917,6 +918,7 @@ void menuModelSetup(event_t event) POPUP_WARNING(STR_R9M_PROTO_FCC_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); } +#endif } } }