diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index 5959df6b5..ccd3d472e 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -83,7 +83,9 @@ enum MenuRadioIndexes { MENU_RADIO_SETUP, CASE_SDCARD(MENU_RADIO_SD_MANAGER) +#if defined(PXX2) MENU_RADIO_TOOLS, +#endif MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_HARDWARE, @@ -107,7 +109,9 @@ void menuRadioCalibration(event_t event); static const MenuHandlerFunc menuTabGeneral[] = { menuRadioSetup, CASE_SDCARD(menuRadioSdManager) +#if defined(PXX2) menuRadioTools, +#endif menuRadioSpecialFunctions, menuRadioTrainer, menuRadioHardware, diff --git a/radio/src/gui/212x64/menu_radio.cpp b/radio/src/gui/212x64/menu_radio.cpp index 127b8deac..2b8ce874f 100644 --- a/radio/src/gui/212x64/menu_radio.cpp +++ b/radio/src/gui/212x64/menu_radio.cpp @@ -23,7 +23,9 @@ const MenuHandlerFunc menuTabGeneral[] = { menuRadioSetup, menuRadioSdManager, +#if defined(PXX2) menuRadioTools, +#endif menuRadioSpecialFunctions, menuRadioTrainer, menuRadioHardware, diff --git a/radio/src/gui/212x64/menus.h b/radio/src/gui/212x64/menus.h index c39a9faf4..4f83c59e5 100644 --- a/radio/src/gui/212x64/menus.h +++ b/radio/src/gui/212x64/menus.h @@ -73,7 +73,9 @@ void menuTraceBuffer(event_t event); enum MenuRadioIndexes { MENU_RADIO_SETUP, MENU_RADIO_SD_MANAGER, +#if defined(PXX2) MENU_RADIO_TOOLS, +#endif MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_HARDWARE, diff --git a/radio/src/gui/480x272/menu_radio.cpp b/radio/src/gui/480x272/menu_radio.cpp index a86fc0935..b793c0fe7 100644 --- a/radio/src/gui/480x272/menu_radio.cpp +++ b/radio/src/gui/480x272/menu_radio.cpp @@ -23,7 +23,9 @@ const MenuHandlerFunc menuTabGeneral[] = { menuRadioSetup, menuRadioSdManager, +#if defined(PXX2) menuRadioTools, +#endif menuRadioSpecialFunctions, menuRadioTrainer, menuRadioHardware, diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h index bf1ef32a3..1899430d6 100644 --- a/radio/src/gui/480x272/menus.h +++ b/radio/src/gui/480x272/menus.h @@ -197,7 +197,9 @@ extern const MenuHandlerFunc menuTabModel[MENU_MODEL_PAGES_COUNT]; enum EnumTabRadio { MENU_RADIO_SETUP, MENU_RADIO_SD_MANAGER, +#if defined(PXX2) MENU_RADIO_TOOLS, +#endif MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_HARDWARE, diff --git a/radio/src/gui/common/stdlcd/CMakeLists.txt b/radio/src/gui/common/stdlcd/CMakeLists.txt index 26e29bbda..fbda7a3c5 100644 --- a/radio/src/gui/common/stdlcd/CMakeLists.txt +++ b/radio/src/gui/common/stdlcd/CMakeLists.txt @@ -28,13 +28,13 @@ if(SDCARD) set(GUI_SRC ${GUI_SRC} ../common/stdlcd/radio_sdmanager.cpp - ../common/stdlcd/radio_tools.cpp ) endif() if(PXX2) set(GUI_SRC ${GUI_SRC} + ../common/stdlcd/radio_tools.cpp ../common/stdlcd/radio_spectrum_analyser.cpp ../common/stdlcd/radio_power_meter.cpp ) diff --git a/radio/src/gui/common/stdlcd/radio_tools.cpp b/radio/src/gui/common/stdlcd/radio_tools.cpp index e753bfaf8..89e72f05a 100644 --- a/radio/src/gui/common/stdlcd/radio_tools.cpp +++ b/radio/src/gui/common/stdlcd/radio_tools.cpp @@ -62,9 +62,9 @@ void menuRadioTools(event_t event) SIMPLE_MENU(STR_MENUTOOLS, menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + spectrum_modules + power_modules); -#if defined(PXX2) uint8_t index = 0; +#if defined(PXX2) if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) addRadioTool(index++, "Spectrum (INT)", menuRadioSpectrumAnalyser, INTERNAL_MODULE);