diff --git a/radio/src/Makefile b/radio/src/Makefile index ff25c54f0..5d36bb5c7 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -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) diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp index d73796b47..ca54edeb5 100644 --- a/radio/src/functions.cpp +++ b/radio/src/functions.cpp @@ -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(); } } diff --git a/radio/src/gui/9X/menus.h b/radio/src/gui/9X/menus.h index d9cfe1779..7c783871d 100755 --- a/radio/src/gui/9X/menus.h +++ b/radio/src/gui/9X/menus.h @@ -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) diff --git a/radio/src/main_avr.cpp b/radio/src/main_avr.cpp index 27f48fd03..ac8f0385c 100644 --- a/radio/src/main_avr.cpp +++ b/radio/src/main_avr.cpp @@ -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(); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 72d21f001..95a4b91a8 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -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)