piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: compiling without external module (#5426)

Browse Source 
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
Raphael Coeffic
2024-08-13 13:18:26 +02:00
committed by GitHub
co-authored by raphaelcoeffic
parent b83adc9d9c
commit b6d0bac2a0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio/radio_tools.cpp
+3 -1
View File
@@ -221,11 +221,13 @@ void RadioToolsPage::rebuild(Window* window)
}
#endif
#if defined(HARDWARE_EXTERNAL_MODULE)
auto extHwSettings = &hwSettings->modules[EXTERNAL_MODULE];
if (isPXX2ModuleOptionAvailable(extHwSettings->information.modelID,
MODULE_OPTION_SPECTRUM_ANALYSER)) {
extSpecAnalyser = true;
}
#endif
#endif // defined(PXX2)
#if defined(HARDWARE_INTERNAL_MODULE) && defined(MULTIMODULE)
@@ -234,7 +236,7 @@ void RadioToolsPage::rebuild(Window* window)
}
#endif
#if defined(PXX2) || defined(MULTIMODULE)
#if defined(HARDWARE_EXTERNAL_MODULE) && (defined(PXX2) || defined(MULTIMODULE))
if (isModuleMultimodule(EXTERNAL_MODULE)) {
extSpecAnalyser = true;
}
radio/src/gui/gui_common.cpp
+1 -1
View File
@@ -887,7 +887,7 @@ bool isExternalModuleAvailable(int moduleType)
return false;
#endif
#if defined(HARDWARE_EXTERNAL_MODULE_SIZE_SML) and !defined(EXTMODULE_USART_GPIO)
#if defined(HARDWARE_EXTERNAL_MODULE_SIZE_SML) and !defined(EXTMODULE_USART)
if (moduleType == MODULE_TYPE_XJT_LITE_PXX2 ||
moduleType == MODULE_TYPE_R9M_PXX2)
return false;