From 8e7a56634bf66f1e432a762db6fcfabe525ff57f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 28 Feb 2020 15:03:39 -0500 Subject: [PATCH] Set nearly=41; don't write after the early decode pass. --- lib/decoder.f90 | 8 +++++--- lib/jt9.f90 | 2 +- lib/jt9a.f90 | 2 +- widgets/mainwindow.h | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 3f58f8b3e..114771c70 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -85,7 +85,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample) if(params%nmode.eq.8) then ! We're in FT8 mode - + if(ncontest.eq.6) then ! Fox mode: initialize and open houndcallers.txt inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex) @@ -276,9 +276,11 @@ subroutine multimode_decoder(ss,id2,params,nfsample) ! JT65 is not yet producing info for nsynced, ndecoded. 800 ndecoded = my_jt4%decoded + my_jt65%decoded + my_jt9%decoded + & my_ft8%decoded + my_ft4%decoded - write(*,1010) nsynced,ndecoded + if(params%nmode.ne.8 .or. params%nzhsym.ge.48) then + write(*,1010) nsynced,ndecoded 1010 format('',2i4) - call flush(6) + call flush(6) + endif close(13) if(ncontest.eq.6) close(19) if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14) diff --git a/lib/jt9.f90 b/lib/jt9.f90 index 6eb732a82..7fb4756b0 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -304,7 +304,7 @@ program jt9 if(mode.eq.9 .and. fsplit.ne.2700) shared_data%params%nfa=fsplit if(mode.eq.8) then ! "Early" decoding pass, FT8 only - nearly=35 + nearly=41 shared_data%params%nzhsym=nearly id2a(1:nearly*3456)=shared_data%id2(1:nearly*3456) id2a(nearly*3456+1:)=0 diff --git a/lib/jt9a.f90 b/lib/jt9a.f90 index ac3a98462..eb513f1d8 100644 --- a/lib/jt9a.f90 +++ b/lib/jt9a.f90 @@ -64,7 +64,7 @@ subroutine jt9a() call timer('decoder ',0) if(local_params%nmode.eq.8 .and. local_params%ndiskdat) then ! "Early" decoding pass for data read from disk: FT8 only - nearly=35 + nearly=41 local_params%nzhsym=nearly id2a(1:nearly*3456)=shared_data%id2(1:nearly*3456) id2a(nearly*3456+1:)=0 diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index dea12db1c..fb16a3dcd 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -467,7 +467,7 @@ private: qint32 m_nFoxFreq; //Audio freq at which Hound received a call from Fox qint32 m_nSentFoxRrpt=0; //Serial number for next R+rpt Hound will send to Fox qint32 m_kin0=0; - qint32 m_earlyDecode=35; + qint32 m_earlyDecode=41; bool m_btxok; //True if OK to transmit bool m_diskData;