Clean up the way UTC gets written to q65_decodes.txt and all_qmap.txt.

qmap/libqmap/q65b.f90

@@ -26,7 +26,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,          &
   character*4 grid4
   character*3 csubmode
   character*60 result,ctmp
-  character*20 datetime
+  character*20 datetime,datetime1
   common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy,              &
        nWTransmitting,result(50)
   common/cacb/ca
@@ -100,8 +100,21 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,          &
   if(iseq.eq.1) iwave(1:360000)=iwave(360001:720000)
 !###
 
+  csubmode(1:2)='60'
+  csubmode(3:3)=char(ichar('A')+nsubmode)
+  nhhmmss=100*nutc
+  nutc1=nutc
+  datetime(12:13)='00'
+  datetime1=datetime
+  if(ntrperiod.eq.30) then
+     csubmode(1:2)='30'
+     nhhmmss=100*nutc + iseq*30
+     nutc1=nhhmmss
+     if(iseq.eq.1) datetime1(12:13)='30'
+  endif
+
 ! NB: Frequency of ipk is now shifted to 1000 Hz.
-  call map65_mmdec(nutc,iwave,nqd,ntrperiod,nsubmode,nfa,nfb,1000,ntol,     &
+  call map65_mmdec(nutc1,iwave,nqd,ntrperiod,nsubmode,nfa,nfb,1000,ntol,     &
        newdat,nagain,max_drift,ndepth,mycall,hiscall,hisgrid)
    MHz=fcenter
   freq0=MHz + 0.001d0*ikhz
@@ -118,18 +131,11 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,          &
      ndecodes=ndecodes+1
      frx=0.001*k0*df+nkhz_center-48.0+1.0 - 0.001*nfcal
      fsked=frx - 0.001*ndop00/2.0 - 0.001*offset
-     nhhmmss=100*nutc
-     csubmode(1:2)='60'
-     csubmode(3:3)=char(ichar('A')+nsubmode)
-     if(ntrperiod.eq.30) then
-        csubmode(1:2)='30'
-        nhhmmss=100*nutc + iseq*30
-     endif
      ctmp=csubmode//'  '//trim(msg0)
      write(result(ndecodes),1120) nhhmmss,frx,fsked,xdt0,nsnr0,trim(ctmp)
 1120 format(i6.6,f9.3,f7.1,f7.2,i5,2x,a)
-     write(12,1130) datetime,trim(result(ndecodes)(5:))
+     write(12,1130) datetime1,trim(result(ndecodes)(7:))
-1130 format(a11,1x,a)
+1130 format(a13,1x,a)
      result(ndecodes)=trim(result(ndecodes))//char(0)
      idec=0
   endif

qmap/libqmap/q65c.f90

@@ -29,7 +29,7 @@ subroutine q65c(itimer)
   save first
 
   nparams=nparams0                     !Copy parameters into common/npar/
-  datetime(12:)='         '
+  datetime(12:)='00       '
 
   if(itimer.ne.0) then
      call timer('decode0 ',101)
@@ -37,7 +37,6 @@ subroutine q65c(itimer)
      return
   endif
 
-!  datetime(18:20)=':00'
   npatience=1
   newdat=1                          !Always on ??
 

qmap/mainwindow.cpp

@@ -410,7 +410,7 @@ void MainWindow::dataSink(int k)
     datcom_.nagain=0;
     datcom_.nhsym=ihsym;
     QDateTime t = QDateTime::currentDateTimeUtc();
-    m_dateTime=t.toString("yymmdd_hhmm");
+    m_dateTime=t.toString("yyMMdd_hhmm");
     decode();                                           //Start the decoder
     if(m_saveAll and !m_diskData and m_nTransmitted<10) {
       QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" +
@@ -874,6 +874,7 @@ void MainWindow::decode()                                       //decode()
   } else {
     memcpy(datcom_.datetime, m_dateTime.toLatin1(), 11);
   }
+  qDebug() << "aa" << fname << m_dateTime << datcom_.datetime;
   datcom_.junk1=1234;                                     //Cecck for these values in m65
   datcom_.junk2=5678;
 
@@ -1072,4 +1073,3 @@ void MainWindow::on_actionQuick_Start_Guide_to_WSJT_X_2_7_and_QMAP_triggered()
 {
   QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/Quick_Start_WSJT-X_2.7_QMAP.pdf"});
 }
-

qmap/mainwindow.h

@@ -176,6 +176,7 @@ private:
   QString m_dateTime;
   QString m_mode;
   QString m_UTC0="";
+  QDateTime m_dateTimeSeqStart;        //Nominal start time of Rx sequence about to be decoded
 
   QHash<QString,bool> m_worked;