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

Clear up some cases where there's no need to call QMAP decoder.

Browse Source
This commit is contained in:
Joe Taylor 2024-01-01 13:26:26 -05:00
parent ac0055b303
commit 5cc82189e6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qmap/libqmap/q65c.f90
View File

@ -23,7 +23,7 @@ subroutine q65c(itimer)
common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, & common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, &
ndepth,ndiskdat,ntx60,newdat,nn1,nn2,nfcal,nfshift, & ndepth,ndiskdat,ntx60,newdat,nn1,nn2,nfcal,nfshift, &
ntx30a,ntx30b,ntol,nxant,nCFOM,nfsample,nxpol,nmode, & ntx30a,ntx30b,ntol,nxant,nCFOM,nfsample,nxpol,nmode, &
ndop00,nsave,nn3,nn4,max_nhsym,mycall,mygrid,hiscall,hisgrid, & ndop00,nsave,nn3,nn4,nhsym,mycall,mygrid,hiscall,hisgrid, &
datetime,junk1,junk2,bAlso30 datetime,junk1,junk2,bAlso30
equivalence (nparams,fcenter) equivalence (nparams,fcenter)
data first/.true./ data first/.true./
@ -38,13 +38,14 @@ subroutine q65c(itimer)
return return
endif endif
print*,'A',max_nhsym,ntx30a,ntx30b,ntx60,junk1,junk2,bAlso30
npatience=1 npatience=1
newdat=1 !Always on ?? newdat=1 !Always on ??
! call chkstat(dd,max_nhsym,ntx30a,ntx30b,ntx60,bSkip) call chkstat(dd,nhsym,bSkip)
call chkstat(dd,max_nhsym,bSkip) if(bSkip .and. nagain.eq.0) then
if(bSkip .and. nagain.eq.0) return print*,'A',nhsym,ntx30a,ntx30b,ntx60,junk1,junk2,bAlso30
return
endif
call timer('decode0 ',0) call timer('decode0 ',0)
call decode0(dd,ss,savg) call decode0(dd,ss,savg)

7
qmap/mainwindow.cpp
View File

@ -788,6 +788,11 @@ void MainWindow::decode() //decode()
{ {
if(m_decoderBusy) return; //Don't attempt decode if decoder already busy if(m_decoderBusy) return; //Don't attempt decode if decoder already busy
if(m_nTx60>10) return; //Don't decode if WSJT-X transmitted too much in 60 s mode if(m_nTx60>10) return; //Don't decode if WSJT-X transmitted too much in 60 s mode
//No need to call decoder for first half, if we transmitted in the firsat half:
if((datcom_.nhsym<=200) and (m_nTx30a>5)) return;
//No need to call decoder in second half, if we transmitted in that half:
if((datcom_.nhsym>=330) and (m_nTx30b>5)) return;
QString fname=" "; QString fname=" ";
ui->DecodeButton->setStyleSheet(m_pbdecoding_style1); ui->DecodeButton->setStyleSheet(m_pbdecoding_style1);
@ -816,7 +821,7 @@ void MainWindow::decode() //decode()
double uth=nhr + nmin/60.0; double uth=nhr + nmin/60.0;
int nfreq=(int)datcom_.fcenter; int nfreq=(int)datcom_.fcenter;
int ndop00=0; int ndop00=0;
if((datcom_.nCFOM&&1)==0) { if((datcom_.nCFOM&1)==0) {
astrosub00_(&nyear, &month, &nday, &uth, &nfreq, m_myGrid.toLatin1(),&ndop00,6); astrosub00_(&nyear, &month, &nday, &uth, &nfreq, m_myGrid.toLatin1(),&ndop00,6);
} }
datcom_.ndop00=ndop00; //Send self Doppler (or 0, if disk data had CFOM already) to decoder datcom_.ndop00=ndop00; //Send self Doppler (or 0, if disk data had CFOM already) to decoder