From 5b977444d1c63b62526a347ee99935921ea9650e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 13 Sep 2012 20:16:07 +0000 Subject: [PATCH] Fix decoding of shorthand messages after changing nfast. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2582 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- libm65/ccf65.f90 | 5 +++-- mainwindow.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libm65/ccf65.f90 b/libm65/ccf65.f90 index a2a77b444..f06c1d308 100644 --- a/libm65/ccf65.f90 +++ b/libm65/ccf65.f90 @@ -16,7 +16,7 @@ subroutine ccf65(ss,nhsym,nfast,ssmax,sync1,ipol1,jpz,dt1,flipk, & real ccf(-11:54,4) logical first integer npr(126) - data first/.true./ + data first/.true./,nfast0/-99/ equivalence (s,cs),(pr,cpr),(s2,cs2),(pr2,cpr2) save @@ -30,7 +30,7 @@ subroutine ccf65(ss,nhsym,nfast,ssmax,sync1,ipol1,jpz,dt1,flipk, & 0,1,0,1,0,0,1,1,0,0,1,0,0,1,0,0,0,0,1,1, & 1,1,1,1,1,1/ - if(first) then + if(first .or. nfast.ne.nfast0) then ! Initialize pr, pr2; compute cpr, cpr2. fac=1.0/NFFT do i=1,NFFT @@ -49,6 +49,7 @@ subroutine ccf65(ss,nhsym,nfast,ssmax,sync1,ipol1,jpz,dt1,flipk, & call four2a(pr,NFFT,1,-1,0) call four2a(pr2,NFFT,1,-1,0) first=.false. + nfast0=nfast endif ! Look for JT65 sync pattern and shorthand square-wave pattern. diff --git a/mainwindow.cpp b/mainwindow.cpp index da48c07d1..e15a19217 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"