diff --git a/CMakeLists.txt b/CMakeLists.txt index 73fc9dcd2..cbbb08df7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,8 +497,8 @@ set (wsjt_FSRCS lib/polyfit.f90 lib/prog_args.f90 lib/ps4.f90 - lib/qra/q65/q65_sync.f90 lib/qra/q65/q65_ap.f90 + lib/qra/q65/q65_dec0.f90 lib/qra/q65/q65_loops.f90 lib/qra/q65/q65_set_list.f90 lib/refspectrum.f90 diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 596cb0b90..573bc02d7 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -100,11 +100,11 @@ contains call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) dgen=0 call q65_enc(dgen,codewords) !Initialize the Q65 codec - call timer('sync_q65',0) - call q65_sync(nutc,iwave,ntrperiod, & + call timer('q65_dec0',0) + call q65_dec0(nutc,iwave,ntrperiod, & nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4, & snr2,idec) - call timer('sync_q65',1) + call timer('q65_dec0',1) if(idec.ge.0) then xdt1=xdt !We have a list-decode result f1=f0 diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90 index cb0cf8b6b..743753a25 100644 --- a/lib/qra/q65/q65.f90 +++ b/lib/qra/q65/q65.f90 @@ -15,7 +15,6 @@ module q65 contains - subroutine q65_clravg s1a=0. @@ -139,7 +138,6 @@ subroutine q65_dec_q3(df,s1,iz,jz,ia,lag1,lag2,i0,j0,ccf,ccf1,ccf2, & if(mode_q65.eq.4) nsubmode=2 if(mode_q65.eq.8) nsubmode=3 if(mode_q65.eq.16) nsubmode=4 - nFadingModel=1 baud=12000.0/nsps do ibw=ibwa,ibwb diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_dec0.f90 similarity index 98% rename from lib/qra/q65/q65_sync.f90 rename to lib/qra/q65/q65_dec0.f90 index a3d5d7c83..0ee6e474b 100644 --- a/lib/qra/q65/q65_sync.f90 +++ b/lib/qra/q65/q65_dec0.f90 @@ -1,4 +1,4 @@ -subroutine q65_sync(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, & +subroutine q65_dec0(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, & emedelay,xdt,f0,snr1,width,dat4,snr2,idec) ! Detect and align with the Q65 sync vector, returning time and frequency @@ -175,4 +175,4 @@ subroutine q65_sync(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, & close(17) 900 return -end subroutine q65_sync +end subroutine q65_dec0