From deb89de196e030aa86d476225a56753a16aaeb08 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 30 Jun 2016 23:17:40 +0000 Subject: [PATCH] Temporary (partial?) workaround for qra decoder bug. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/jt65_decode.f90 | 4 ++-- lib/qra02.f90 | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/jt65_decode.f90 b/lib/jt65_decode.f90 index 4f13745d7..14ecf53b7 100644 --- a/lib/jt65_decode.f90 +++ b/lib/jt65_decode.f90 @@ -101,7 +101,8 @@ contains ! This is QRA65 mode ! print*,'A',nsubmode,nsubmode,nsubmode call qra02(dd,nf1,nf2,nfqso,ntol,mycall,sync,nsnr,dtx,nfreq,decoded,nft) -! print*,'Z',nft,decoded +! print*,'Z',sync,nft,decoded + if(sync.lt.12.8) go to 900 !### Temporary ### if (associated(this%callback)) then ndrift=0 nflip=1 @@ -111,7 +112,6 @@ contains call this%callback(sync,nsnr,dtx,nfreq,ndrift, & nflip,width,decoded,nft,nqual,nsmo,1,minsync) end if - go to 900 endif diff --git a/lib/qra02.f90 b/lib/qra02.f90 index 463908b8d..70319bede 100644 --- a/lib/qra02.f90 +++ b/lib/qra02.f90 @@ -128,11 +128,13 @@ subroutine qra02(dd,nf1,nf2,nfqso,ntol,mycall_12,sync,nsnr,dtx,nfreq, & ! flush(75) ! flush(76) - nsnr=-30 - if(sync.gt.1.0) nsnr=nint(10.0*log10(sync) - 38.0) - decoded=' ' nft=100 + nsnr=-30 + if(sync.gt.1.0) nsnr=nint(10.0*log10(sync) - 38.0) + if(sync.lt.12.8) go to 900 !### Temporary ### +! print*,'A',sync,nsnr + mycall=mycall_12(1:6) !### May need fixing ### call packcall(mycall,nmycall,ltext) ! write(77,3002) s3 @@ -147,5 +149,5 @@ subroutine qra02(dd,nf1,nf2,nfqso,ntol,mycall_12,sync,nsnr,dtx,nfreq, & nft=100 + irc endif - return +900 return end subroutine qra02