Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-23 16:25:12 +03:00
Code Activity

Cosmetics

Browse source
This commit is contained in:
3djc 2019-04-09 16:53:36 +02:00
parent e198152e30
commit b6e74044a0
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
View file

@ -23,9 +23,9 @@
extern uint8_t g_moduleIdx; extern uint8_t g_moduleIdx;
enum SpektrumFields { enum SpektrumFields {
SPEKTRUM_FREQUENCY, SPECTRUM_FREQUENCY,
SPEKTRUM_SPAN, SPECTRUM_SPAN,
SPEKTRUM_FIELDS_MAX SPECTRUM_FIELDS_MAX
}; };
void menuRadioSpectrumAnalyser(event_t event) void menuRadioSpectrumAnalyser(event_t event)
@ -62,11 +62,11 @@ void menuRadioSpectrumAnalyser(event_t event)
moduleSettings[g_moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER; moduleSettings[g_moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER;
} }
for (uint8_t i=0; i<SPEKTRUM_FIELDS_MAX+1; i++) { for (uint8_t i=0; i<SPECTRUM_FIELDS_MAX+1; i++) {
uint8_t blink = ((s_editMode>0) ? BLINK|INVERS : INVERS); uint8_t blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
switch (i) { switch (i) {
case SPEKTRUM_FREQUENCY: { case SPECTRUM_FREQUENCY: {
uint16_t frequency = reusableBuffer.spectrumAnalyser.freq / 1000000; uint16_t frequency = reusableBuffer.spectrumAnalyser.freq / 1000000;
lcdDrawText(1, 10, "F:", 0); lcdDrawText(1, 10, "F:", 0);
lcdDrawNumber(lcdLastRightPos + 2, 10, frequency, ((menuHorizontalPosition == 0 && s_editMode) ? blink : 0)); lcdDrawNumber(lcdLastRightPos + 2, 10, frequency, ((menuHorizontalPosition == 0 && s_editMode) ? blink : 0));
@ -77,7 +77,7 @@ void menuRadioSpectrumAnalyser(event_t event)
break; break;
} }
case SPEKTRUM_SPAN: case SPECTRUM_SPAN:
uint8_t span = reusableBuffer.spectrumAnalyser.span / 1000000; uint8_t span = reusableBuffer.spectrumAnalyser.span / 1000000;
lcdDrawText(lcdLastRightPos + 5, 10, "S:", 0); lcdDrawText(lcdLastRightPos + 5, 10, "S:", 0);
lcdDrawNumber(lcdLastRightPos + 2, 10, reusableBuffer.spectrumAnalyser.span/1000000, (menuHorizontalPosition==1 ? blink : 0)); lcdDrawNumber(lcdLastRightPos + 2, 10, reusableBuffer.spectrumAnalyser.span/1000000, (menuHorizontalPosition==1 ? blink : 0));

12
radio/src/gui/common/stdlcd/radio_tools.cpp
View file

@ -38,7 +38,7 @@ void addRadioTool(uint8_t index, const char * label, void (* tool)(event_t), uin
void menuRadioTools(event_t event) 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) { if (event == EVT_ENTRY || event == EVT_ENTRY_UP) {
memclear(&reusableBuffer.hardwareAndSettings, sizeof(reusableBuffer.hardwareAndSettings)); memclear(&reusableBuffer.hardwareAndSettings, sizeof(reusableBuffer.hardwareAndSettings));
@ -54,26 +54,26 @@ void menuRadioTools(event_t event)
} }
for (uint8_t module = 0; module < NUM_MODULES; module++) { for (uint8_t module = 0; module < NUM_MODULES; module++) {
if (isModuleOptionAvailable(module, MODULE_OPTION_SPEKTRUM_ANALYSER)) { if (isModuleOptionAvailable(module, MODULE_OPTION_SPECTRUM_ANALYSER)) {
spektrum_modules++; spectrum_modules++;
} }
if (isModuleOptionAvailable(module, MODULE_OPTION_POWER_METER)) { if (isModuleOptionAvailable(module, MODULE_OPTION_POWER_METER)) {
power_modules++; 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) #if defined(PXX2)
uint8_t menu_index = 0; 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); addRadioTool(menu_index++, "Spectrum (INT)", menuRadioSpectrumAnalyser, INTERNAL_MODULE);
if (isModuleOptionAvailable(INTERNAL_MODULE, MODULE_OPTION_POWER_METER)) if (isModuleOptionAvailable(INTERNAL_MODULE, MODULE_OPTION_POWER_METER))
addRadioTool(menu_index++, "Power Meter (INT)", menuRadioPowerMeter, INTERNAL_MODULE); 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); addRadioTool(menu_index++, "Spectrum (EXT)", menuRadioSpectrumAnalyser, EXTERNAL_MODULE);
if (isModuleOptionAvailable(EXTERNAL_MODULE, MODULE_OPTION_POWER_METER)) if (isModuleOptionAvailable(EXTERNAL_MODULE, MODULE_OPTION_POWER_METER))

2
radio/src/pulses/modules.h
View file

@ -236,7 +236,7 @@ enum {
MODULE_OPTION_RF_PROTOCOL, MODULE_OPTION_RF_PROTOCOL,
MODULE_OPTION_EXTERNAL_ANTENNA, MODULE_OPTION_EXTERNAL_ANTENNA,
MODULE_OPTION_POWER, MODULE_OPTION_POWER,
MODULE_OPTION_SPEKTRUM_ANALYSER, MODULE_OPTION_SPECTRUM_ANALYSER,
MODULE_OPTION_POWER_METER, MODULE_OPTION_POWER_METER,
}; };