w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-04 06:07:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP toward processing Echo-mode data read from disk.

Browse Source
This commit is contained in:
Joe Taylor 2022-07-28 08:55:19 -04:00
parent 3fb362ac28
commit d4ed6785fb
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/avecho.f90
View File

@ -1,5 +1,5 @@
subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err, & subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err, &
dfreq,width) dfreq,width,bDiskData)
integer TXLENGTH integer TXLENGTH
parameter (TXLENGTH=27648) !27*1024 parameter (TXLENGTH=27648) !27*1024
@ -15,6 +15,7 @@ subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err, &
real x(NFFT) real x(NFFT)
integer ipkv(1) integer ipkv(1)
logical ex logical ex
logical*1 bDiskData
complex c(0:NH) complex c(0:NH)
equivalence (x,c),(ipk,ipkv) equivalence (x,c),(ipk,ipkv)
common/echocom/nclearave,nsum,blue(NZ),red(NZ) common/echocom/nclearave,nsum,blue(NZ),red(NZ)
@ -22,6 +23,7 @@ subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err, &
save dop0,sa,sb save dop0,sa,sb
fspread=fspread_dx !### Use the predicted Doppler spread ### fspread=fspread_dx !### Use the predicted Doppler spread ###
if(bDiskData) fspread=width
if(nauto.eq.1) fspread=fspread_self if(nauto.eq.1) fspread=fspread_self
inquire(file='fspread.txt',exist=ex) inquire(file='fspread.txt',exist=ex)
if(ex) then if(ex) then

7
widgets/mainwindow.cpp
View File

@ -157,7 +157,7 @@ extern "C" {
void avecho_( short id2[], int* dop, int* nfrit, int* nauto, int* nqual, float* f1, void avecho_( short id2[], int* dop, int* nfrit, int* nauto, int* nqual, float* f1,
float* level, float* sigdb, float* snr, float* dfreq, float* level, float* sigdb, float* snr, float* dfreq,
float* width); float* width, bool* bDiskData);
void fast_decode_(short id2[], int narg[], double * trperiod, void fast_decode_(short id2[], int narg[], double * trperiod,
char msg[], char mycall[], char hiscall[], char msg[], char mycall[], char hiscall[],
@ -1605,10 +1605,11 @@ void MainWindow::dataSink(qint64 frames)
if(m_diskData) { if(m_diskData) {
int idir=-1; int idir=-1;
save_echo_params_(&nDop,&nfrit,&f1,&m_fSpread,dec_data.d2,&idir); save_echo_params_(&nDop,&nfrit,&f1,&m_fSpread,dec_data.d2,&idir);
width=m_fSpread;
} }
qDebug() << "bb" << m_s6 << f1 << nfrit << nDop;
avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb, avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb,
&dBerr,&dfreq,&width); &dBerr,&dfreq,&width,&m_diskData);
qDebug() << "bb" << m_s6 << f1 << nfrit << nDop << width;
QString t; QString t;
t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7.1f %3d",echocom_.nsum,xlevel,sigdb, t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7.1f %3d",echocom_.nsum,xlevel,sigdb,
dBerr,dfreq,width,nqual); dBerr,dfreq,width,nqual);