From 92088369e689be151d6b641aa3fbd189806e9aaf Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 5 Jul 2016 21:32:19 +0000 Subject: [PATCH] Un-break decoding of long msk messages. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6871 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/detectmsk144.f90 | 2 +- lib/detectmsk32.f90 | 2 +- lib/msk144_decode.f90 | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/detectmsk144.f90 b/lib/detectmsk144.f90 index 2d7c2fc01..cde83deec 100644 --- a/lib/detectmsk144.f90 +++ b/lib/detectmsk144.f90 @@ -176,7 +176,7 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc) allmessages=char(0) lines=char(0) - do ip=1,1 !run through the candidates and try to sync/demod/decode + do ip=1,ndet !run through the candidates and try to sync/demod/decode imid=times(ip)*fs if( imid .lt. NPTS/2 ) imid=NPTS/2 if( imid .gt. n-NPTS/2 ) imid=n-NPTS/2 diff --git a/lib/detectmsk32.f90 b/lib/detectmsk32.f90 index 3513e5e70..9bf1c8b08 100644 --- a/lib/detectmsk32.f90 +++ b/lib/detectmsk32.f90 @@ -443,6 +443,6 @@ subroutine detectmsk32(cbig,n,lines,nmessages,nutc) ! cdbest,cdratbest,nbadsyncbest,ipkbest,idbest,idfbest,iavbest endif endif -1022 format(i4.4,2x,i4,f8.3,f8.2,f8.2,i6,i6,a6,i8,i10,i4,f8.2,f8.2,i5,i5,i5,i5,i5) +!1022 format(i4.4,2x,i4,f8.3,f8.2,f8.2,i6,i6,a6,i8,i10,i4,f8.2,f8.2,i5,i5,i5,i5,i5) return end subroutine detectmsk32 diff --git a/lib/msk144_decode.f90 b/lib/msk144_decode.f90 index 4b7436848..058161275 100644 --- a/lib/msk144_decode.f90 +++ b/lib/msk144_decode.f90 @@ -33,17 +33,16 @@ subroutine msk144_decode(id2,npts,nutc,nprint,pchk_file,line) if( nprint .ne. 0 ) then do i=1,nline write(*,'(a80)') line(i) - enddo + enddo endif if(nline .eq. 0) then call detectmsk32(c,npts,line,nline,nutc) - endif - - if( nprint .ne. 0 ) then - do i=1,nline - write(*,'(a80)') line(i) - enddo + if( nprint .ne. 0 ) then + do i=1,nline + write(*,'(a80)') line(i) + enddo + endif endif return