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

Don't call decoder if we transmitted Q65-30x in this 30 s segment. Also some CFOM diagnostics.

Browse Source
This commit is contained in:
Joe Taylor 2023-12-21 11:04:23 -05:00
parent 031f7fc1e6
commit cdb7b02835
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmap/libqmap/q65b.f90
View File

@ -130,7 +130,8 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
freq1=freq0 + 0.001d0*(ikhz1-ikhz)
frx=0.001*k0*df+nkhz_center-48.0+1.0 - 0.001*nfcal
fsked=frx - 0.001*ndop00/2.0 - 0.001*offset
! write(*,'("A",i5,i8,f10.3,f10.1)') nCFOM,ndop00,frx,fsked
if(iand(nCFOM,2).eq.2) write(*,3001) nCFOM,ndop00,frx,fsked
3001 format('A',i5,i8,f10.3,f10.1)
ctmp=csubmode//' '//trim(msg0)
ndecodes=min(ndecodes+1,50)
write(result(ndecodes),1120) nhhmmss,frx,fsked,xdt0,nsnr0,trim(ctmp)

17
qmap/mainwindow.cpp
View File

@ -854,7 +854,7 @@ void MainWindow::decode() //decode()
double uth=nhr + nmin/60.0;
int nfreq=(int)datcom_.fcenter;
int ndop00=0;
if(datcom_.nCFOM==0) {
if((datcom_.nCFOM&&1)==0) {
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
@ -919,10 +919,11 @@ void MainWindow::decode() //decode()
}
decodes_.ncand=0;
decodes_.nQDecoderDone=0;
int itimer=0;
watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &itimer)));
decodeBusy(true);
if(m_nTx30<5) {
int itimer=0;
watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &itimer)));
decodeBusy(true);
}
}
void MainWindow::on_EraseButton_clicked()
@ -1024,7 +1025,11 @@ void MainWindow::guiUpdate()
QFile f(m_appDir + "/cfom");
ui->cbCFOM->setVisible(f.exists());
m_bCFOM=ui->cbCFOM->isVisible() and ui->cbCFOM->isChecked();
if(m_bCFOM) qDebug() << "CFOM" << n60 << datcom_.ndop00 << datcom2_.ndop00;
datcom_.nCFOM&=1;
if(m_bCFOM) {
datcom_.nCFOM|=2;
qDebug() << "CFOM" << n60 << datcom_.nCFOM << datcom_.ndop00 << datcom2_.ndop00;
}
n60z=n60;