Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

Popup level option (only levels 1 and 3 are used today) (#6562)

Browse source
This commit is contained in:
Bertrand Songis 2019-07-13 12:01:41 +02:00 • committed by GitHub
parent 13a3160560
commit cbf0e6630d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/CMakeLists.txt
View file

@ -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(DEFAULT_MODE "" CACHE STRING "Default sticks mode")
set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") set(FONT "STD" CACHE STRING "Choose font : STD or SQT5")
set_property(CACHE FONT PROPERTY STRINGS SQT5) set_property(CACHE FONT PROPERTY STRINGS SQT5)
set(POPUP_LEVEL 3 CACHE INT "Popup level")
option(HELI "Heli menu" ON) option(HELI "Heli menu" ON)
option(FLIGHT_MODES "Flight Modes" ON) option(FLIGHT_MODES "Flight Modes" ON)
@ -316,6 +317,8 @@ if(FRSKY_RELEASE)
add_definitions(-DFRSKY_RELEASE) add_definitions(-DFRSKY_RELEASE)
endif() endif()
add_definitions(-DPOPUP_LEVEL=${POPUP_LEVEL})
set(SRC set(SRC
${SRC} ${SRC}
opentx.cpp opentx.cpp

2
radio/src/gui/128x64/model_setup.cpp
View file

@ -909,6 +909,7 @@ void menuModelSetup(event_t event)
POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1); POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1);
SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); 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) { else if (g_model.moduleData[EXTERNAL_MODULE].subType == MODULE_SUBTYPE_R9M_EU) {
POPUP_WARNING(STR_R9M_PROTO_EU_WARN_LINE1); POPUP_WARNING(STR_R9M_PROTO_EU_WARN_LINE1);
SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); 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); POPUP_WARNING(STR_R9M_PROTO_FCC_WARN_LINE1);
SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
} }
#endif
} }
} }
} }