From cdb7b028351d5c095d5d6504d4dceda4f72fdefc Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 21 Dec 2023 11:04:23 -0500
Subject: [PATCH] Don't call decoder if we transmitted Q65-30x in this 30 s
 segment.  Also some CFOM diagnostics.

---
 qmap/libqmap/q65b.f90 |  3 ++-
 qmap/mainwindow.cpp   | 17 +++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/qmap/libqmap/q65b.f90 b/qmap/libqmap/q65b.f90
index 2aec55ce4..93d99587f 100644
--- a/qmap/libqmap/q65b.f90
+++ b/qmap/libqmap/q65b.f90
@@ -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)
diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp
index 113b735e3..af3f7c51b 100644
--- a/qmap/mainwindow.cpp
+++ b/qmap/mainwindow.cpp
@@ -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;