From 9431912289359ab480c2e2bdacdebb425edc9df8 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Sat, 30 Jul 2016 01:42:46 +0000 Subject: [PATCH] Both msk144 and msk40 messages work now. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6971 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/genmsk144.f90 | 7 ++++--- lib/genmsk40.f90 | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/genmsk144.f90 b/lib/genmsk144.f90 index bac51cda9..6d6c807da 100644 --- a/lib/genmsk144.f90 +++ b/lib/genmsk144.f90 @@ -48,12 +48,13 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file) data first/.true./ save + i=index(pchk_file,".pchk") + gen_file=pchk_file(1:i-1)//".gen" + call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0)) + if( first ) then first=.false. nsym=128 - i=index(pchk_file,".pchk") - gen_file=pchk_file(1:i-1)//".gen" - call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0)) pi=4.*atan(1.0) twopi=8.*atan(1.0) do i=1,12 diff --git a/lib/genmsk40.f90 b/lib/genmsk40.f90 index de7780a0e..ef039f0dd 100644 --- a/lib/genmsk40.f90 +++ b/lib/genmsk40.f90 @@ -67,8 +67,8 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype) write(cwstrbit,'(i2)') codeword(i) cwstring=cwstring//cwstrbit enddo - write(*,'(a6,i6,2x,a6,i6,2x,a6,i6)') ' msg: ',ig,'rprt: ',irpt,'hash: ',ihash - write(*,'(a6,32i1)') ' cw: ',codeword +! write(*,'(a6,i6,2x,a6,i6,2x,a6,i6)') ' msg: ',ig,'rprt: ',irpt,'hash: ',ihash +! write(*,'(a6,32i1)') ' cw: ',codeword bitseq(1:8)=s8r bitseq(9:40)=codeword