separated radio_tools and radio_version pages according to reusableBuffer
This commit is contained in:
committed by
Peter Feerick
parent
4084497c70
commit
f55080e9e9
@@ -31,7 +31,8 @@ class RadioToolsPage : public PageTab
|
|||||||
void checkEvents() override;
|
void checkEvents() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static void rebuild(FormWindow* window);
|
void rebuild(FormWindow* window);
|
||||||
FormWindow* window = nullptr;
|
FormWindow* window = nullptr;
|
||||||
uint8_t waiting = 0;
|
uint8_t waiting = 0;
|
||||||
|
uint8_t linesCount = 0;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -113,10 +113,10 @@ void menuRadioTools(event_t event)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(INTERNAL_MODULE_PXX2)
|
#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);
|
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);
|
addRadioModuleTool(index++, STR_POWER_METER_INT, menuRadioPowerMeter, INTERNAL_MODULE);
|
||||||
#endif
|
#endif
|
||||||
#if defined(HARDWARE_INTERNAL_MODULE) && defined(MULTIMODULE)
|
#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);
|
addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_INT, menuRadioSpectrumAnalyser, INTERNAL_MODULE);
|
||||||
#endif
|
#endif
|
||||||
#if defined(PXX2) || defined(MULTIMODULE)
|
#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);
|
addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_EXT, menuRadioSpectrumAnalyser, EXTERNAL_MODULE);
|
||||||
#endif
|
#endif
|
||||||
#if defined(PXX2)
|
#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);
|
addRadioModuleTool(index++, STR_POWER_METER_EXT, menuRadioPowerMeter, EXTERNAL_MODULE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+4
-3
@@ -970,13 +970,14 @@ union ReusableBuffer
|
|||||||
char id[27];
|
char id[27];
|
||||||
} version;
|
} version;
|
||||||
|
|
||||||
// moduleOptions, receiverOptions, radioVersion
|
PXX2HardwareAndSettings hardwareAndSettings; // radio_version
|
||||||
PXX2HardwareAndSettings hardwareAndSettings;
|
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
ModuleInformation modules[NUM_MODULES];
|
ModuleInformation modules[NUM_MODULES];
|
||||||
uint8_t linesCount;
|
|
||||||
char msg[64];
|
char msg[64];
|
||||||
|
#if !defined(COLORLCD)
|
||||||
|
uint8_t linesCount;
|
||||||
|
#endif
|
||||||
} radioTools;
|
} radioTools;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
|||||||
@@ -418,6 +418,7 @@ struct PXX2HardwareAndSettings {
|
|||||||
ReceiverSettings receiverSettings; // when dealing with receiver settings, we
|
ReceiverSettings receiverSettings; // when dealing with receiver settings, we
|
||||||
// also need module settings
|
// also need module settings
|
||||||
char msg[64];
|
char msg[64];
|
||||||
|
uint8_t linesCount;
|
||||||
};
|
};
|
||||||
|
|
||||||
PXX2ModuleSetup& getPXX2ModuleSetupBuffer();
|
PXX2ModuleSetup& getPXX2ModuleSetupBuffer();
|
||||||
|
|||||||
Reference in New Issue
Block a user