From cd397808f756db2e464a2d9f0e18abf1c9ccb456 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 16 Aug 2016 19:17:45 +0000 Subject: [PATCH] 1. Correct the max length of MSK144 decoded text strings. Thanks Mike!. 2. Suppress rare QRA64 garbage decodes that contain "000AAA". git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7033 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/qra64a.f90 | 5 +++++ mainwindow.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/qra64a.f90 b/lib/qra64a.f90 index 9fe73c030..ab43ab0bd 100644 --- a/lib/qra64a.f90 +++ b/lib/qra64a.f90 @@ -74,6 +74,11 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mode64,mycall_12,hiscall_12, & enddo enddo 900 continue + if(index(decoded,"000AAA ").ge.1) then +! Suppress a certain type of garbage decode. + decoded=' ' + irc=-1 + endif return end subroutine qra64a diff --git a/mainwindow.cpp b/mainwindow.cpp index 577f5ab71..6ff066732 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2255,7 +2255,7 @@ void::MainWindow::fast_decode_done() int i2=msg0.indexOf(m_hisCall); if((m_mode=="JTMSK" or m_mode=="MSK144" or m_bFast9) and m_bEME and tmax>=0.0 and i1>10 and i2>i1+3) { //Here, "m_bEME" implies AutoSeq - if((msg0.indexOf(" 73") < 0) or (m_ntx!=6)) processMessage(msg0,40,false); + if((msg0.indexOf(" 73") < 0) or (m_ntx!=6)) processMessage(msg0,43,false); } if(m_msg[i][0]==0) break; QString message=QString::fromLatin1(m_msg[i]);