diff --git a/lib/avecho.f90 b/lib/avecho.f90 index 6db53f100..00b1994c7 100644 --- a/lib/avecho.f90 +++ b/lib/avecho.f90 @@ -1,4 +1,4 @@ -subroutine avecho(id2,ndop,nfrit,nauto,navg,nqual,f1,xlevel,snrdb,snrdb0, & +subroutine avecho(id2,ndop,nfrit,nauto,navg,nqual,f1,xlevel,snrdb, & db_err,dfreq,width,bDiskData) integer TXLENGTH @@ -10,8 +10,6 @@ subroutine avecho(id2,ndop,nfrit,nauto,navg,nqual,f1,xlevel,snrdb,snrdb0, & real sb(NZ) !Avg spectrum with Dither and changing Doppler removed real, dimension (:,:), allocatable :: sax real, dimension (:,:), allocatable :: sbx - real red0(NZ) - real blue0(NZ) integer nsum !Number of integrations real dop0 !Doppler shift for initial integration (Hz) real dop !Doppler shift for current integration (Hz) @@ -89,8 +87,6 @@ subroutine avecho(id2,ndop,nfrit,nauto,navg,nqual,f1,xlevel,snrdb,snrdb0, & sb(i)=sum(sbx(1:navg,i)) enddo - call echo_snr(s(ia-2047),s(ib-2047),fspread,blue0,red0,snrdb0, & - db_err,dfreq,snr_detect) call echo_snr(sa,sb,fspread,blue,red,snrdb,db_err,dfreq,snr_detect) nqual=snr_detect-2 if(nqual.lt.0) nqual=0 diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index d55547ca0..5ccdf9812 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -156,7 +156,7 @@ extern "C" { void save_echo_params_(int* ndoptotal, int* ndop, int* nfrit, float* f1, float* fspread, short id2[], int* idir); void avecho_( short id2[], int* dop, int* nfrit, int* nauto, int* navg, int* nqual, float* f1, - float* level, float* sigdb, float* sigdb0, float* snr, float* dfreq, + float* level, float* sigdb, float* snr, float* dfreq, float* width, bool* bDiskData); void fast_decode_(short id2[], int narg[], double * trperiod, @@ -1604,7 +1604,6 @@ void MainWindow::dataSink(qint64 frames) float f1=1500.0 + m_fDither; float xlevel=0.0; float sigdb=0.0; - float sigdb0=0.0; float dfreq=0.0; float width=m_fSpread; echocom_.nclearave=m_nclearave; @@ -1616,7 +1615,7 @@ void MainWindow::dataSink(qint64 frames) save_echo_params_(&nDopTotal,&nDop,&nfrit,&f1,&width,dec_data.d2,&idir); } avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&navg,&nqual,&f1,&xlevel,&sigdb, - &sigdb0,&dBerr,&dfreq,&width,&m_diskData); + &dBerr,&dfreq,&width,&m_diskData); //Don't restart Monitor after an Echo transmission if(m_bEchoTxed and !m_auto) { monitor(false); @@ -1643,8 +1642,8 @@ void MainWindow::dataSink(qint64 frames) float hour=n/10000 + ((n/100)%100)/60.0 + (n%100)/3600.0; m_echoRunning=true; QString t; - t = t.asprintf("%9.6f %5.2f %7d %7.1f %7d %7d %7d %7.1f %7.1f %7.1f",hour,xlevel, - nDopTotal,width,echocom_.nsum,nqual,qRound(dfreq),sigdb0,sigdb,dBerr); + t = t.asprintf("%9.6f %5.2f %7d %7.1f %7d %7d %7d %7.1f %7.1f",hour,xlevel, + nDopTotal,width,echocom_.nsum,nqual,qRound(dfreq),sigdb,dBerr); t = t0 + t; if (ui) ui->decodedTextBrowser->appendText(t); t=t1+t; @@ -7135,7 +7134,7 @@ void MainWindow::on_actionEcho_triggered() m_bFastMode=false; m_bFast9=false; WSPR_config(true); - ui->lh_decodes_headings_label->setText(" UTC Hour Level Doppler Width N Q DF SNR SNRavg dBerr"); + ui->lh_decodes_headings_label->setText(" UTC Hour Level Doppler Width N Q DF SNR dBerr"); // 01234567890123456789012345678901234567 displayWidgets(nWidgets("00000000000000000010001000000000000000")); fast_config(false);