diff --git a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp index 1d8ce43d5..bcb702f24 100644 --- a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp @@ -23,9 +23,9 @@ extern uint8_t g_moduleIdx; enum SpektrumFields { - SPEKTRUM_FREQUENCY, - SPEKTRUM_SPAN, - SPEKTRUM_FIELDS_MAX + SPECTRUM_FREQUENCY, + SPECTRUM_SPAN, + SPECTRUM_FIELDS_MAX }; void menuRadioSpectrumAnalyser(event_t event) @@ -62,11 +62,11 @@ void menuRadioSpectrumAnalyser(event_t event) moduleSettings[g_moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER; } - for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS); switch (i) { - case SPEKTRUM_FREQUENCY: { + case SPECTRUM_FREQUENCY: { uint16_t frequency = reusableBuffer.spectrumAnalyser.freq / 1000000; lcdDrawText(1, 10, "F:", 0); lcdDrawNumber(lcdLastRightPos + 2, 10, frequency, ((menuHorizontalPosition == 0 && s_editMode) ? blink : 0)); @@ -77,7 +77,7 @@ void menuRadioSpectrumAnalyser(event_t event) break; } - case SPEKTRUM_SPAN: + case SPECTRUM_SPAN: uint8_t span = reusableBuffer.spectrumAnalyser.span / 1000000; lcdDrawText(lcdLastRightPos + 5, 10, "S:", 0); lcdDrawNumber(lcdLastRightPos + 2, 10, reusableBuffer.spectrumAnalyser.span/1000000, (menuHorizontalPosition==1 ? blink : 0)); diff --git a/radio/src/gui/common/stdlcd/radio_tools.cpp b/radio/src/gui/common/stdlcd/radio_tools.cpp index b134da3ff..9c7a62049 100644 --- a/radio/src/gui/common/stdlcd/radio_tools.cpp +++ b/radio/src/gui/common/stdlcd/radio_tools.cpp @@ -38,7 +38,7 @@ void addRadioTool(uint8_t index, const char * label, void (* tool)(event_t), uin void menuRadioTools(event_t event) { - uint8_t spektrum_modules = 0, power_modules = 0; + uint8_t spectrum_modules = 0, power_modules = 0; if (event == EVT_ENTRY || event == EVT_ENTRY_UP) { memclear(&reusableBuffer.hardwareAndSettings, sizeof(reusableBuffer.hardwareAndSettings)); @@ -54,26 +54,26 @@ void menuRadioTools(event_t event) } for (uint8_t module = 0; module < NUM_MODULES; module++) { - if (isModuleOptionAvailable(module, MODULE_OPTION_SPEKTRUM_ANALYSER)) { - spektrum_modules++; + if (isModuleOptionAvailable(module, MODULE_OPTION_SPECTRUM_ANALYSER)) { + spectrum_modules++; } if (isModuleOptionAvailable(module, MODULE_OPTION_POWER_METER)) { power_modules++; } } - SIMPLE_MENU("TOOLS", menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + spektrum_modules + power_modules); + SIMPLE_MENU("TOOLS", menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + spectrum_modules + power_modules); #if defined(PXX2) uint8_t menu_index = 0; - if (isModuleOptionAvailable(INTERNAL_MODULE, MODULE_OPTION_SPEKTRUM_ANALYSER)) + if (isModuleOptionAvailable(INTERNAL_MODULE, MODULE_OPTION_SPECTRUM_ANALYSER)) addRadioTool(menu_index++, "Spectrum (INT)", menuRadioSpectrumAnalyser, INTERNAL_MODULE); if (isModuleOptionAvailable(INTERNAL_MODULE, MODULE_OPTION_POWER_METER)) addRadioTool(menu_index++, "Power Meter (INT)", menuRadioPowerMeter, INTERNAL_MODULE); - if (isModuleOptionAvailable(EXTERNAL_MODULE, MODULE_OPTION_SPEKTRUM_ANALYSER)) + if (isModuleOptionAvailable(EXTERNAL_MODULE, MODULE_OPTION_SPECTRUM_ANALYSER)) addRadioTool(menu_index++, "Spectrum (EXT)", menuRadioSpectrumAnalyser, EXTERNAL_MODULE); if (isModuleOptionAvailable(EXTERNAL_MODULE, MODULE_OPTION_POWER_METER)) diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h index 573cefb6e..25542d7b9 100644 --- a/radio/src/pulses/modules.h +++ b/radio/src/pulses/modules.h @@ -236,7 +236,7 @@ enum { MODULE_OPTION_RF_PROTOCOL, MODULE_OPTION_EXTERNAL_ANTENNA, MODULE_OPTION_POWER, - MODULE_OPTION_SPEKTRUM_ANALYSER, + MODULE_OPTION_SPECTRUM_ANALYSER, MODULE_OPTION_POWER_METER, };