mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update QSO frequency 

* Update QSO frequency field even when the waterfall is in PAUSE mode
  * Clean up WFdisp::sig_data
pull/2/head
Stelios Bounanos 2010-04-08 12:56:01 -05:00 zatwierdzone przez David Freese
rodzic 3754c63d80
commit 4f80565784
1 zmienionych plików z 14 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
src/waterfall/waterfall.cxx
Wyświetl plik

@ -544,27 +544,29 @@ void WFdisp::redrawCursor()
// cursormoved = true;
}
void WFdisp::sig_data( double *sig, int len, int sr ) {
void WFdisp::sig_data( double *sig, int len, int sr )
{
if (wfspeed == PAUSE)
return;
goto update_freq;
//if sound card sampling rate changed reset the waterfall buffer
// if sound card sampling rate changed reset the waterfall buffer
if (srate != sr) {
srate = sr;
memset (circbuff, 0, FFT_LEN * 2 * sizeof(double));
ptrCB = 0;
}
overload = false;
double overval, peak = 0.0;
for (int i = 0; i < len; i++) {
overval = fabs(circbuff[ptrCB] = sig[i]);
ptrCB = (ptrCB + 1) % (FFT_LEN *2);
if (overval > peak) peak = overval;
{
overload = false;
double overval, peak = 0.0;
for (int i = 0; i < len; i++) {
overval = fabs(circbuff[ptrCB] = sig[i]);
ptrCB = (ptrCB + 1) % (FFT_LEN *2);
if (overval > peak) peak = overval;
}
peakaudio = 0.1 * peak + 0.9 * peakaudio;
}
peakaudio = 0.1 * peak + 0.9 * peakaudio;
if (mode == SCOPE)
process_analog(circbuff, FFT_LEN * 2);
else
@ -572,10 +574,8 @@ void WFdisp::sig_data( double *sig, int len, int sr ) {
put_WARNstatus(peakaudio);
update_freq:
static char szFrequency[14];
// if (usebands)
// rfc = (long long)(atof(cboBand->value()) * 1000.0);
if (rfc != 0) { // use a boolean for the waterfall
if (usb)
dfreq = rfc + active_modem->get_txfreq();
@ -586,11 +586,7 @@ void WFdisp::sig_data( double *sig, int len, int sr ) {
dfreq = active_modem->get_txfreq();
snprintf(szFrequency, sizeof(szFrequency), "%-.0f", dfreq);
}
FL_LOCK_D();
inpFreq->value(szFrequency);
FL_UNLOCK_D();
return;
}