From 297d39242a028a4a6bf1ea54e93ceaf1ff0ee34f Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 5 Dec 2019 10:40:25 +0100 Subject: [PATCH] Radio tools (TODO spectrum and power meter) --- radio/src/gui/colorlcd/radio_tools.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_tools.cpp b/radio/src/gui/colorlcd/radio_tools.cpp index ec900e566..25231cc58 100644 --- a/radio/src/gui/colorlcd/radio_tools.cpp +++ b/radio/src/gui/colorlcd/radio_tools.cpp @@ -187,16 +187,25 @@ void RadioToolsPage::rebuild(FormWindow * window) }, 0); grid.nextLine(); } - - if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) { - new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND, CENTERED); +#elif defined(INTERNAL_MODULE_MULTI) + new StaticText(window, grid.getLabelSlot(), "multi", BUTTON_BACKGROUND, CENTERED); + new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_INT, [=]() -> uint8_t { +// new RadioSpectrumAnalyser(INTERNAL_MODULE); + return 0; + }, 0); + grid.nextLine(); +#endif +#if defined(PXX2)|| defined(MULTIMODULE) + if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER) || isModuleMultimodule(EXTERNAL_MODULE)) { + new StaticText(window, grid.getLabelSlot(), isModuleMultimodule(EXTERNAL_MODULE) ? "multi" : "access", BUTTON_BACKGROUND, CENTERED); new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_EXT, [=]() -> uint8_t { - new RadioSpectrumAnalyser(EXTERNAL_MODULE); +// new RadioSpectrumAnalyser(EXTERNAL_MODULE); return 0; }, 0); grid.nextLine(); } - +#endif +#if defined(PXX2) if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) { new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND, CENTERED); new TextButton(window, grid.getFieldSlot(1), STR_POWER_METER_EXT, [=]() -> uint8_t {