From c73057ad541fac11e67af197dd778ebdebff2290 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 6 Mar 2022 11:40:12 +1000 Subject: [PATCH] fix: Make showing int MPM spectrum analyser entry runtime determined (#1648) Showing of the "(int) Spectrum Analyser" determined at build time, dependent on the default internal module, which is wrong post #1117 Fixes #1647 --- radio/src/gui/colorlcd/radio_tools.cpp | 3 ++- radio/src/gui/common/stdlcd/radio_tools.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_tools.cpp b/radio/src/gui/colorlcd/radio_tools.cpp index 98ca2340e..452806fb4 100644 --- a/radio/src/gui/colorlcd/radio_tools.cpp +++ b/radio/src/gui/colorlcd/radio_tools.cpp @@ -271,7 +271,8 @@ void RadioToolsPage::rebuild(FormWindow * window) grid.nextLine(); } #endif -#if defined(INTERNAL_MODULE_MULTI) +#if defined(HARDWARE_INTERNAL_MODULE) + if (g_eeGeneral.internalModule == MODULE_TYPE_MULTIMODULE) { auto txt = new StaticText(window, grid.getLabelSlot(), "multi", BUTTON_BACKGROUND, diff --git a/radio/src/gui/common/stdlcd/radio_tools.cpp b/radio/src/gui/common/stdlcd/radio_tools.cpp index 6540da2b7..d08742c8d 100644 --- a/radio/src/gui/common/stdlcd/radio_tools.cpp +++ b/radio/src/gui/common/stdlcd/radio_tools.cpp @@ -118,8 +118,10 @@ void menuRadioTools(event_t event) if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) addRadioModuleTool(index++, STR_POWER_METER_INT, menuRadioPowerMeter, INTERNAL_MODULE); -#elif defined(INTERNAL_MODULE_MULTI) - addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_INT, menuRadioSpectrumAnalyser, INTERNAL_MODULE); +#endif +#if defined(HARDWARE_INTERNAL_MODULE) + if (g_eeGeneral.internalModule == MODULE_TYPE_MULTIMODULE) + addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_INT, menuRadioSpectrumAnalyser, INTERNAL_MODULE); #endif #if defined(PXX2)|| defined(MULTIMODULE) if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER) || isModuleMultimodule(EXTERNAL_MODULE))