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

Option GUI=NO added

Browse source
This commit is contained in:
bsongis 2015-01-21 22:41:43 +01:00
parent f8aa77a82d
commit c0c9b5ae83
5 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/Makefile
View file

@ -63,6 +63,10 @@ PCBREV =
# Values = STD, FRSKY, FRSKY_SPORT, JETI, NMEA, ARDUPILOT, MAVLINK, TELEMETREZ
EXT = STD
# GUI enabled
# Values = YES, NO
GUI = YES
# FAI mode
# Values = YES, NO, CHOICE
FAI = NO
@ -81,7 +85,7 @@ HELI = NO
# Enable templates menu
# Values = YES, NO
TEMPLATES = YES
TEMPLATES = $(GUI)
# Enable navigation with Pots / Sticks / Rotary encoders
# Values = NO
@ -942,7 +946,9 @@ else
TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi")
endif
GUISRC = gui/$(GUIDIRECTORY)/helpers.cpp gui/$(GUIDIRECTORY)/navigation.cpp gui/$(GUIDIRECTORY)/popups.cpp gui/$(GUIDIRECTORY)/widgets.cpp gui/$(GUIDIRECTORY)/menus.cpp $(GUIMODELSRC) $(GUIGENERALSRC) gui/$(GUIDIRECTORY)/view_main.cpp gui/$(GUIDIRECTORY)/view_statistics.cpp
ifeq ($(GUI), YES)
GUISRC = gui/$(GUIDIRECTORY)/helpers.cpp gui/$(GUIDIRECTORY)/navigation.cpp gui/$(GUIDIRECTORY)/popups.cpp gui/$(GUIDIRECTORY)/widgets.cpp gui/$(GUIDIRECTORY)/menus.cpp $(GUIMODELSRC) $(GUIGENERALSRC) gui/$(GUIDIRECTORY)/view_main.cpp gui/$(GUIDIRECTORY)/view_statistics.cpp
endif
CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC) gui/$(GUIDIRECTORY)/lcd.cpp gui/$(GUIDIRECTORY)/splash.cpp keys.cpp maths.cpp translations.cpp gui/$(GUIDIRECTORY)/fonts.cpp $(TTS_SRC)

5
radio/src/functions.cpp
View file

@ -311,6 +311,7 @@ void evalFunctions()
case FUNC_INSTANT_TRIM:
newActiveFunctions |= (1 << FUNCTION_INSTANT_TRIM);
if (!isFunctionActive(FUNCTION_INSTANT_TRIM)) {
#if defined(GUI)
if (g_menuStack[0] == menuMainView
#if defined(FRSKY)
|| g_menuStack[0] == menuTelemetryFrsky
@ -319,7 +320,9 @@ void evalFunctions()
|| g_menuStack[0] == menuMainViewChannelsMonitor
|| g_menuStack[0] == menuChannelsView
#endif
) {
)
#endif
{
instantTrim();
}
}

9
radio/src/gui/9X/menus.h
View file

@ -385,7 +385,14 @@ void displayWarning(uint8_t event);
extern uint8_t s_warning_info_flags;
#endif
#if defined(CPUARM)
#if !defined(GUI)
#define DISPLAY_WARNING(...)
#define POPUP_WARNING(...)
#define POPUP_CONFIRMATION(...)
#define POPUP_INPUT(...)
#define WARNING_INFO_FLAGS 0
#define SET_WARNING_INFO(...)
#elif defined(CPUARM)
#define DISPLAY_WARNING (*popupFunc)
#define POPUP_WARNING(s) (s_warning = s, s_warning_info = 0, popupFunc = displayWarning)
#define POPUP_CONFIRMATION(s) (s_warning = s, s_warning_type = WARNING_TYPE_CONFIRM, s_warning_info = 0, popupFunc = displayWarning)

2
radio/src/main_avr.cpp
View file

@ -125,6 +125,7 @@ void perMain()
if (sticks_evt) evt = sticks_evt;
#endif
#if defined(GUI)
const char *warn = s_warning;
uint8_t menu = s_menu_count;
@ -153,6 +154,7 @@ void perMain()
drawStatusLine();
lcdRefresh();
#endif
if (SLAVE_MODE()) {
JACK_PPM_OUT();

14
radio/src/opentx.cpp
View file

@ -143,9 +143,12 @@ void per10ms()
}
#endif
#if defined(GUI)
if (lightOffCounter) lightOffCounter--;
if (flashCounter) flashCounter--;
if (s_noHi) s_noHi--;
#endif
if (trimsCheckTimer) trimsCheckTimer--;
if (ppmInValid) ppmInValid--;
@ -1971,9 +1974,12 @@ void opentxStart()
checkAlarm();
checkAll();
#if defined(GUI)
if (g_eeGeneral.chkSum != evalChkSum()) {
chainMenu(menuFirstCalib);
}
#endif
}
#if defined(CPUARM) || defined(CPUM2560)
@ -2128,7 +2134,7 @@ uint8_t getSticksNavigationEvent()
void checkBattery()
{
static uint8_t counter = 0;
#if !defined(COLORLCD)
#if defined(GUI) && !defined(COLORLCD)
// TODO not the right menu I think ...
if (g_menuStack[g_menuStackPtr] == menuGeneralDiagAna) {
g_vbat100mV = 0;
@ -2670,9 +2676,11 @@ int main(void)
stack_paint();
#if defined(GUI)
g_menuStack[0] = menuMainView;
#if MENUS_LOCK != 2/*no menus*/
g_menuStack[1] = menuModelSelect;
#if MENUS_LOCK != 2/*no menus*/
g_menuStack[1] = menuModelSelect;
#endif
#endif
#if !defined(PCBTARANIS)