mirror of
https://github.com/opentx/opentx.git
synced 2025-07-23 16:25:16 +03:00
Option GUI=NO added
This commit is contained in:
parent
f8aa77a82d
commit
c0c9b5ae83
5 changed files with 33 additions and 7 deletions
|
@ -63,6 +63,10 @@ PCBREV =
|
||||||
# Values = STD, FRSKY, FRSKY_SPORT, JETI, NMEA, ARDUPILOT, MAVLINK, TELEMETREZ
|
# Values = STD, FRSKY, FRSKY_SPORT, JETI, NMEA, ARDUPILOT, MAVLINK, TELEMETREZ
|
||||||
EXT = STD
|
EXT = STD
|
||||||
|
|
||||||
|
# GUI enabled
|
||||||
|
# Values = YES, NO
|
||||||
|
GUI = YES
|
||||||
|
|
||||||
# FAI mode
|
# FAI mode
|
||||||
# Values = YES, NO, CHOICE
|
# Values = YES, NO, CHOICE
|
||||||
FAI = NO
|
FAI = NO
|
||||||
|
@ -81,7 +85,7 @@ HELI = NO
|
||||||
|
|
||||||
# Enable templates menu
|
# Enable templates menu
|
||||||
# Values = YES, NO
|
# Values = YES, NO
|
||||||
TEMPLATES = YES
|
TEMPLATES = $(GUI)
|
||||||
|
|
||||||
# Enable navigation with Pots / Sticks / Rotary encoders
|
# Enable navigation with Pots / Sticks / Rotary encoders
|
||||||
# Values = NO
|
# 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")
|
TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
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
|
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)
|
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)
|
||||||
|
|
||||||
|
|
|
@ -311,6 +311,7 @@ void evalFunctions()
|
||||||
case FUNC_INSTANT_TRIM:
|
case FUNC_INSTANT_TRIM:
|
||||||
newActiveFunctions |= (1 << FUNCTION_INSTANT_TRIM);
|
newActiveFunctions |= (1 << FUNCTION_INSTANT_TRIM);
|
||||||
if (!isFunctionActive(FUNCTION_INSTANT_TRIM)) {
|
if (!isFunctionActive(FUNCTION_INSTANT_TRIM)) {
|
||||||
|
#if defined(GUI)
|
||||||
if (g_menuStack[0] == menuMainView
|
if (g_menuStack[0] == menuMainView
|
||||||
#if defined(FRSKY)
|
#if defined(FRSKY)
|
||||||
|| g_menuStack[0] == menuTelemetryFrsky
|
|| g_menuStack[0] == menuTelemetryFrsky
|
||||||
|
@ -319,7 +320,9 @@ void evalFunctions()
|
||||||
|| g_menuStack[0] == menuMainViewChannelsMonitor
|
|| g_menuStack[0] == menuMainViewChannelsMonitor
|
||||||
|| g_menuStack[0] == menuChannelsView
|
|| g_menuStack[0] == menuChannelsView
|
||||||
#endif
|
#endif
|
||||||
) {
|
)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
instantTrim();
|
instantTrim();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -385,7 +385,14 @@ void displayWarning(uint8_t event);
|
||||||
extern uint8_t s_warning_info_flags;
|
extern uint8_t s_warning_info_flags;
|
||||||
#endif
|
#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 DISPLAY_WARNING (*popupFunc)
|
||||||
#define POPUP_WARNING(s) (s_warning = s, s_warning_info = 0, popupFunc = displayWarning)
|
#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)
|
#define POPUP_CONFIRMATION(s) (s_warning = s, s_warning_type = WARNING_TYPE_CONFIRM, s_warning_info = 0, popupFunc = displayWarning)
|
||||||
|
|
|
@ -125,6 +125,7 @@ void perMain()
|
||||||
if (sticks_evt) evt = sticks_evt;
|
if (sticks_evt) evt = sticks_evt;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(GUI)
|
||||||
const char *warn = s_warning;
|
const char *warn = s_warning;
|
||||||
uint8_t menu = s_menu_count;
|
uint8_t menu = s_menu_count;
|
||||||
|
|
||||||
|
@ -153,6 +154,7 @@ void perMain()
|
||||||
drawStatusLine();
|
drawStatusLine();
|
||||||
|
|
||||||
lcdRefresh();
|
lcdRefresh();
|
||||||
|
#endif
|
||||||
|
|
||||||
if (SLAVE_MODE()) {
|
if (SLAVE_MODE()) {
|
||||||
JACK_PPM_OUT();
|
JACK_PPM_OUT();
|
||||||
|
|
|
@ -143,9 +143,12 @@ void per10ms()
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(GUI)
|
||||||
if (lightOffCounter) lightOffCounter--;
|
if (lightOffCounter) lightOffCounter--;
|
||||||
if (flashCounter) flashCounter--;
|
if (flashCounter) flashCounter--;
|
||||||
if (s_noHi) s_noHi--;
|
if (s_noHi) s_noHi--;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (trimsCheckTimer) trimsCheckTimer--;
|
if (trimsCheckTimer) trimsCheckTimer--;
|
||||||
if (ppmInValid) ppmInValid--;
|
if (ppmInValid) ppmInValid--;
|
||||||
|
|
||||||
|
@ -1971,9 +1974,12 @@ void opentxStart()
|
||||||
checkAlarm();
|
checkAlarm();
|
||||||
checkAll();
|
checkAll();
|
||||||
|
|
||||||
|
#if defined(GUI)
|
||||||
if (g_eeGeneral.chkSum != evalChkSum()) {
|
if (g_eeGeneral.chkSum != evalChkSum()) {
|
||||||
chainMenu(menuFirstCalib);
|
chainMenu(menuFirstCalib);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CPUARM) || defined(CPUM2560)
|
#if defined(CPUARM) || defined(CPUM2560)
|
||||||
|
@ -2128,7 +2134,7 @@ uint8_t getSticksNavigationEvent()
|
||||||
void checkBattery()
|
void checkBattery()
|
||||||
{
|
{
|
||||||
static uint8_t counter = 0;
|
static uint8_t counter = 0;
|
||||||
#if !defined(COLORLCD)
|
#if defined(GUI) && !defined(COLORLCD)
|
||||||
// TODO not the right menu I think ...
|
// TODO not the right menu I think ...
|
||||||
if (g_menuStack[g_menuStackPtr] == menuGeneralDiagAna) {
|
if (g_menuStack[g_menuStackPtr] == menuGeneralDiagAna) {
|
||||||
g_vbat100mV = 0;
|
g_vbat100mV = 0;
|
||||||
|
@ -2670,10 +2676,12 @@ int main(void)
|
||||||
|
|
||||||
stack_paint();
|
stack_paint();
|
||||||
|
|
||||||
|
#if defined(GUI)
|
||||||
g_menuStack[0] = menuMainView;
|
g_menuStack[0] = menuMainView;
|
||||||
#if MENUS_LOCK != 2/*no menus*/
|
#if MENUS_LOCK != 2/*no menus*/
|
||||||
g_menuStack[1] = menuModelSelect;
|
g_menuStack[1] = menuModelSelect;
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined(PCBTARANIS)
|
#if !defined(PCBTARANIS)
|
||||||
lcdSetRefVolt(25);
|
lcdSetRefVolt(25);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue