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

Improve spectrum

Browse source
This commit is contained in:
3djc 2019-02-07 13:39:27 +01:00
parent f528de89c2
commit 5eda7dc6dd
3 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,8 +32,24 @@ void menuRadioSpectrum(event_t event)
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_SPECTRUM_ANALYSER; moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_SPECTRUM_ANALYSER;
} }
uint8_t peak=1;
uint32_t peak_x=0;
for (uint8_t i=0; i<LCD_W; i++) { for (uint8_t i=0; i<LCD_W; i++) {
uint8_t h = reusableBuffer.spectrum.bars[i] >> 2; uint8_t h = reusableBuffer.spectrum.bars[i];
if(h > peak) {
peak_x = i;
peak=h;
}
lcdDrawSolidVerticalLine(i, LCD_H - h, h); lcdDrawSolidVerticalLine(i, LCD_H - h, h);
} }
lcdDrawText(1,10, "F:", 0);
lcdDrawNumber(lcdLastRightPos, 10, reusableBuffer.spectrum.fq/10000000,PREC2);
lcdDrawText(lcdLastRightPos, 10, "GHz");
lcdDrawText(1,10+FH, "S:", 0);
lcdDrawNumber(lcdLastRightPos, 10+FH, reusableBuffer.spectrum.span/1000000,0);
lcdDrawText(lcdLastRightPos, 10+FH, "MHz");
lcdDrawText(80,10, "P:", 0);
lcdDrawNumber(lcdLastRightPos, 10, ((reusableBuffer.spectrum.fq - reusableBuffer.spectrum.span/2) + peak_x * (reusableBuffer.spectrum.span / 128)) / 10000000,PREC2);
lcdDrawText(lcdLastRightPos, 10, "GHz");
} }

3
radio/src/opentx.h
View file

@ -1161,6 +1161,9 @@ union ReusableBuffer
struct struct
{ {
uint8_t bars[128]; uint8_t bars[128];
uint32_t fq;
uint32_t span;
uint32_t step;
} spectrum; } spectrum;
#if defined(STM32) #if defined(STM32)

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

@ -104,23 +104,23 @@ bool Pxx2Pulses::setupSpectrumAnalyser(uint8_t module)
addFrameType(PXX2_TYPE_C_POWER_METER, PXX2_TYPE_ID_SPECTRUM); addFrameType(PXX2_TYPE_C_POWER_METER, PXX2_TYPE_ID_SPECTRUM);
Pxx2Transport::addByte(0x00); Pxx2Transport::addByte(0x00);
uint32_t fq = 2440000000; // 2440MHz reusableBuffer.spectrum.fq = 2440000000; // 2440MHz
Pxx2Transport::addByte(fq); Pxx2Transport::addByte(reusableBuffer.spectrum.fq);
Pxx2Transport::addByte(fq >> 8); Pxx2Transport::addByte(reusableBuffer.spectrum.fq >> 8);
Pxx2Transport::addByte(fq >> 16); Pxx2Transport::addByte(reusableBuffer.spectrum.fq >> 16);
Pxx2Transport::addByte(fq >> 24); Pxx2Transport::addByte(reusableBuffer.spectrum.fq >> 24);
uint32_t span = 40000000; // 40MHz reusableBuffer.spectrum.span = 40000000; // 40MHz
Pxx2Transport::addByte(span); Pxx2Transport::addByte(reusableBuffer.spectrum.span);
Pxx2Transport::addByte(span >> 8); Pxx2Transport::addByte(reusableBuffer.spectrum.span >> 8);
Pxx2Transport::addByte(span >> 16); Pxx2Transport::addByte(reusableBuffer.spectrum.span >> 16);
Pxx2Transport::addByte(span >> 24); Pxx2Transport::addByte(reusableBuffer.spectrum.span >> 24);
uint32_t step = 100000; // 100KHz reusableBuffer.spectrum.step = 100000; // 100KHz
Pxx2Transport::addByte(step); Pxx2Transport::addByte(reusableBuffer.spectrum.step);
Pxx2Transport::addByte(step >> 8); Pxx2Transport::addByte(reusableBuffer.spectrum.step >> 8);
Pxx2Transport::addByte(step >> 16); Pxx2Transport::addByte(reusableBuffer.spectrum.step >> 16);
Pxx2Transport::addByte(step >> 24); Pxx2Transport::addByte(reusableBuffer.spectrum.step >> 24);
return true; return true;
} }