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

Compilation fix

Browse source
This commit is contained in:
Bertrand Songis 2019-04-29 07:33:03 +02:00
parent 9f1238ca38
commit 51fa2458c7
7 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/gui/128x64/menus.h
View file

@ -83,7 +83,9 @@ enum MenuRadioIndexes
{ {
MENU_RADIO_SETUP, MENU_RADIO_SETUP,
CASE_SDCARD(MENU_RADIO_SD_MANAGER) CASE_SDCARD(MENU_RADIO_SD_MANAGER)
#if defined(PXX2)
MENU_RADIO_TOOLS, MENU_RADIO_TOOLS,
#endif
MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_SPECIAL_FUNCTIONS,
MENU_RADIO_TRAINER, MENU_RADIO_TRAINER,
MENU_RADIO_HARDWARE, MENU_RADIO_HARDWARE,
@ -107,7 +109,9 @@ void menuRadioCalibration(event_t event);
static const MenuHandlerFunc menuTabGeneral[] = { static const MenuHandlerFunc menuTabGeneral[] = {
menuRadioSetup, menuRadioSetup,
CASE_SDCARD(menuRadioSdManager) CASE_SDCARD(menuRadioSdManager)
#if defined(PXX2)
menuRadioTools, menuRadioTools,
#endif
menuRadioSpecialFunctions, menuRadioSpecialFunctions,
menuRadioTrainer, menuRadioTrainer,
menuRadioHardware, menuRadioHardware,

2
radio/src/gui/212x64/menu_radio.cpp
View file

@ -23,7 +23,9 @@
const MenuHandlerFunc menuTabGeneral[] = { const MenuHandlerFunc menuTabGeneral[] = {
menuRadioSetup, menuRadioSetup,
menuRadioSdManager, menuRadioSdManager,
#if defined(PXX2)
menuRadioTools, menuRadioTools,
#endif
menuRadioSpecialFunctions, menuRadioSpecialFunctions,
menuRadioTrainer, menuRadioTrainer,
menuRadioHardware, menuRadioHardware,

2
radio/src/gui/212x64/menus.h
View file

@ -73,7 +73,9 @@ void menuTraceBuffer(event_t event);
enum MenuRadioIndexes { enum MenuRadioIndexes {
MENU_RADIO_SETUP, MENU_RADIO_SETUP,
MENU_RADIO_SD_MANAGER, MENU_RADIO_SD_MANAGER,
#if defined(PXX2)
MENU_RADIO_TOOLS, MENU_RADIO_TOOLS,
#endif
MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_SPECIAL_FUNCTIONS,
MENU_RADIO_TRAINER, MENU_RADIO_TRAINER,
MENU_RADIO_HARDWARE, MENU_RADIO_HARDWARE,

2
radio/src/gui/480x272/menu_radio.cpp
View file

@ -23,7 +23,9 @@
const MenuHandlerFunc menuTabGeneral[] = { const MenuHandlerFunc menuTabGeneral[] = {
menuRadioSetup, menuRadioSetup,
menuRadioSdManager, menuRadioSdManager,
#if defined(PXX2)
menuRadioTools, menuRadioTools,
#endif
menuRadioSpecialFunctions, menuRadioSpecialFunctions,
menuRadioTrainer, menuRadioTrainer,
menuRadioHardware, menuRadioHardware,

2
radio/src/gui/480x272/menus.h
View file

@ -197,7 +197,9 @@ extern const MenuHandlerFunc menuTabModel[MENU_MODEL_PAGES_COUNT];
enum EnumTabRadio { enum EnumTabRadio {
MENU_RADIO_SETUP, MENU_RADIO_SETUP,
MENU_RADIO_SD_MANAGER, MENU_RADIO_SD_MANAGER,
#if defined(PXX2)
MENU_RADIO_TOOLS, MENU_RADIO_TOOLS,
#endif
MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_SPECIAL_FUNCTIONS,
MENU_RADIO_TRAINER, MENU_RADIO_TRAINER,
MENU_RADIO_HARDWARE, MENU_RADIO_HARDWARE,

2
radio/src/gui/common/stdlcd/CMakeLists.txt
View file

@ -28,13 +28,13 @@ if(SDCARD)
set(GUI_SRC set(GUI_SRC
${GUI_SRC} ${GUI_SRC}
../common/stdlcd/radio_sdmanager.cpp ../common/stdlcd/radio_sdmanager.cpp
../common/stdlcd/radio_tools.cpp
) )
endif() endif()
if(PXX2) if(PXX2)
set(GUI_SRC set(GUI_SRC
${GUI_SRC} ${GUI_SRC}
../common/stdlcd/radio_tools.cpp
../common/stdlcd/radio_spectrum_analyser.cpp ../common/stdlcd/radio_spectrum_analyser.cpp
../common/stdlcd/radio_power_meter.cpp ../common/stdlcd/radio_power_meter.cpp
) )

2
radio/src/gui/common/stdlcd/radio_tools.cpp
View file

@ -62,9 +62,9 @@ void menuRadioTools(event_t event)
SIMPLE_MENU(STR_MENUTOOLS, menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + spectrum_modules + power_modules); SIMPLE_MENU(STR_MENUTOOLS, menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + spectrum_modules + power_modules);
#if defined(PXX2)
uint8_t index = 0; uint8_t index = 0;
#if defined(PXX2)
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER))
addRadioTool(index++, "Spectrum (INT)", menuRadioSpectrumAnalyser, INTERNAL_MODULE); addRadioTool(index++, "Spectrum (INT)", menuRadioSpectrumAnalyser, INTERNAL_MODULE);