Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Spectrum analyser working

Browse source
This commit is contained in:
Bertrand Songis 2019-02-07 11:09:19 +01:00
parent 2fc96cf14d
commit 485472f7c9
7 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/128x64/gui.h
View file

@ -167,7 +167,7 @@ void check_submenu_simple(event_t event, uint8_t maxrow);
void title(const char * s); void title(const char * s);
#define TITLE(str) title(str) #define TITLE(str) title(str)
#define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__ #define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__
#if defined(PCBX7) #if defined(PCBX7)
#define MENU_CHECK(tab, menu, lines_count) \ #define MENU_CHECK(tab, menu, lines_count) \

7
radio/src/gui/128x64/radio_spectrum.cpp
View file

@ -24,9 +24,12 @@ void menuRadioSpectrum(event_t event)
{ {
MENU("SPECTRUM", menuTabGeneral, MENU_RADIO_SPECTRUM, HEADER_LINE, { HEADER_LINE_COLUMNS }); MENU("SPECTRUM", menuTabGeneral, MENU_RADIO_SPECTRUM, HEADER_LINE, { HEADER_LINE_COLUMNS });
if (event == EVT_ENTRY) { if (menuEvent) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL;
}
else if (event == EVT_ENTRY) {
memclear(reusableBuffer.spectrum.bars, sizeof(reusableBuffer.spectrum.bars)); memclear(reusableBuffer.spectrum.bars, sizeof(reusableBuffer.spectrum.bars));
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_SPECTRUM; moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_SPECTRUM_ANALYSER;
} }
for (uint8_t i=0; i<LCD_W; i++) { for (uint8_t i=0; i<LCD_W; i++) {

1
radio/src/gui/navigation/navigation_xlite.cpp
View file

@ -373,7 +373,6 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t
menuCalibrationState = 0; menuCalibrationState = 0;
drawScreenIndex(curr, menuTabSize, attr); drawScreenIndex(curr, menuTabSize, attr);
} }
DISPLAY_PROGRESS_BAR(menuTab ? lcdLastRightPos-2*FW-((curr+1)/10*FWNUM)-2 : 20*FW+1); DISPLAY_PROGRESS_BAR(menuTab ? lcdLastRightPos-2*FW-((curr+1)/10*FWNUM)-2 : 20*FW+1);

2
radio/src/pulses/pulses.cpp
View file

@ -293,7 +293,7 @@ void sendPulses(uint8_t port, uint8_t protocol)
case PROTOCOL_CHANNELS_PXX2: case PROTOCOL_CHANNELS_PXX2:
setupPulsesPXX2(port); setupPulsesPXX2(port);
scheduleNextMixerCalculation(port, moduleSettings[port].mode == MODULE_MODE_SPECTRUM ? 1 : PXX2_PERIOD); scheduleNextMixerCalculation(port, moduleSettings[port].mode == MODULE_MODE_SPECTRUM_ANALYSER ? 1 : PXX2_PERIOD);
break; break;
#if defined(MULTIMODULE) #if defined(MULTIMODULE)

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

@ -74,7 +74,7 @@ enum ModuleSettingsMode
MODULE_MODE_RANGECHECK, MODULE_MODE_RANGECHECK,
MODULE_MODE_BIND, MODULE_MODE_BIND,
MODULE_MODE_REGISTER, MODULE_MODE_REGISTER,
MODULE_MODE_SPECTRUM, MODULE_MODE_SPECTRUM_ANALYSER,
}; };
PACK(struct ModuleSettings { PACK(struct ModuleSettings {

2
radio/src/pulses/pxx2.cpp
View file

@ -136,7 +136,7 @@ bool Pxx2Pulses::setupFrame(uint8_t module)
result = setupRegisterFrame(module); result = setupRegisterFrame(module);
else if (mode == MODULE_MODE_BIND) else if (mode == MODULE_MODE_BIND)
result = setupBindFrame(module); result = setupBindFrame(module);
else if (mode == MODULE_MODE_SPECTRUM) else if (mode == MODULE_MODE_SPECTRUM_ANALYSER)
result = setupSpectrumAnalyser(module); result = setupSpectrumAnalyser(module);
else else
setupChannelsFrame(module); setupChannelsFrame(module);

2
radio/src/telemetry/telemetry.cpp
View file

@ -132,7 +132,7 @@ void processBindFrame(uint8_t module, uint8_t * frame)
void processSpectrumFrame(uint8_t module, uint8_t * frame) void processSpectrumFrame(uint8_t module, uint8_t * frame)
{ {
if (moduleSettings[module].mode != MODULE_MODE_SPECTRUM) { if (moduleSettings[module].mode != MODULE_MODE_SPECTRUM_ANALYSER) {
return; return;
} }