From 841305c9ba9b6e956c19ac92699673498597d7be Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 5 Jul 2019 17:33:36 +0200 Subject: [PATCH] No tools on radio which have no ACCESS and no LUA --- radio/src/gui/128x64/menus.h | 4 ++++ radio/src/gui/common/stdlcd/CMakeLists.txt | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index 6d9a51ff6..94f21a27c 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -52,7 +52,9 @@ enum MenuRadioIndexes { MENU_RADIO_SETUP, CASE_SDCARD(MENU_RADIO_SD_MANAGER) +#if defined(LUA) || defined(PXX2) MENU_RADIO_TOOLS, +#endif MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_HARDWARE, @@ -76,7 +78,9 @@ void menuRadioCalibration(event_t event); static const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT] = { menuRadioSetup, CASE_SDCARD(menuRadioSdManager) +#if defined(LUA) || defined(PXX2) menuRadioTools, +#endif menuRadioSpecialFunctions, menuRadioTrainer, menuRadioHardware, diff --git a/radio/src/gui/common/stdlcd/CMakeLists.txt b/radio/src/gui/common/stdlcd/CMakeLists.txt index fddacafed..57aad2a20 100644 --- a/radio/src/gui/common/stdlcd/CMakeLists.txt +++ b/radio/src/gui/common/stdlcd/CMakeLists.txt @@ -12,13 +12,16 @@ set(GUI_SRC ../common/stdlcd/model_receiver_options.cpp ../common/stdlcd/model_notes.cpp ../common/stdlcd/model_curves.cpp - ../common/stdlcd/radio_tools.cpp ../common/stdlcd/radio_hardware.cpp ../common/stdlcd/radio_version.cpp ../common/stdlcd/radio_trainer.cpp model_curve_edit.cpp ) +if(PXX2 OR LUA) + set(GUI_SRC ${GUI_SRC} ../common/stdlcd/radio_tools.cpp) +endif() + if(HELI) set(GUI_SRC ${GUI_SRC} ../common/stdlcd/model_heli.cpp) endif()