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

separated radio_tools and radio_version pages according to reusableBuffer

Browse Source
This commit is contained in:
wimalopaan
2022-07-27 10:45:26 +10:00
committed by Peter Feerick
parent 4084497c70
commit f55080e9e9
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_tools.h
+2 -1
View File
@@ -31,7 +31,8 @@ class RadioToolsPage : public PageTab
void checkEvents() override;
protected:
static void rebuild(FormWindow* window);
void rebuild(FormWindow* window);
FormWindow* window = nullptr;
uint8_t waiting = 0;
uint8_t linesCount = 0;
};
radio/src/gui/common/stdlcd/radio_tools.cpp
+4 -4
View File
@@ -113,10 +113,10 @@ void menuRadioTools(event_t event)
#endif
#if defined(INTERNAL_MODULE_PXX2)
if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER))
if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER))
addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_INT, menuRadioSpectrumAnalyser, INTERNAL_MODULE);
if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
addRadioModuleTool(index++, STR_POWER_METER_INT, menuRadioPowerMeter, INTERNAL_MODULE);
#endif
#if defined(HARDWARE_INTERNAL_MODULE) && defined(MULTIMODULE)
@@ -124,11 +124,11 @@ void menuRadioTools(event_t event)
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))
if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER) || isModuleMultimodule(EXTERNAL_MODULE))
addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_EXT, menuRadioSpectrumAnalyser, EXTERNAL_MODULE);
#endif
#if defined(PXX2)
if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
if (isPXX2ModuleOptionAvailable(reusableBuffer.radioTools.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER))
addRadioModuleTool(index++, STR_POWER_METER_EXT, menuRadioPowerMeter, EXTERNAL_MODULE);
#endif
radio/src/opentx.h
+4 -3
View File
@@ -970,13 +970,14 @@ union ReusableBuffer
char id[27];
} version;
// moduleOptions, receiverOptions, radioVersion
PXX2HardwareAndSettings hardwareAndSettings;
PXX2HardwareAndSettings hardwareAndSettings; // radio_version
struct {
ModuleInformation modules[NUM_MODULES];
uint8_t linesCount;
char msg[64];
#if !defined(COLORLCD)
uint8_t linesCount;
#endif
} radioTools;
struct {
radio/src/pulses/pxx2.h
+1
View File
@@ -418,6 +418,7 @@ struct PXX2HardwareAndSettings {
ReceiverSettings receiverSettings; // when dealing with receiver settings, we
// also need module settings
char msg[64];
uint8_t linesCount;
};
PXX2ModuleSetup& getPXX2ModuleSetupBuffer();