From e3594a2a04f4f4afb111ca467fd111b44a12b94a Mon Sep 17 00:00:00 2001 From: Steve Franke Date: Sat, 7 Jul 2018 12:57:16 -0500 Subject: [PATCH] More fixes related to MSK144 changeover. --- lib/genmsk_128_90.f90 | 5 ++--- lib/msk144decodeframe.f90 | 2 +- lib/msk144sim.f90 | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/genmsk_128_90.f90 b/lib/genmsk_128_90.f90 index 6b0ce8305..4e5956895 100644 --- a/lib/genmsk_128_90.f90 +++ b/lib/genmsk_128_90.f90 @@ -55,14 +55,14 @@ subroutine genmsk_128_90(msg0,mygrid,ichk,bcontest,msgsent,i4tone,itype) 2 i4tone(1)=nfreq else message=msg0 - do i=1,22 + do i=1, 37 if(ichar(message(i:i)).eq.0) then message(i:)=' ' exit endif enddo - do i=1,22 !Strip leading blanks + do i=1,37 !Strip leading blanks if(message(1:1).ne.' ') exit message=message(i+1:) enddo @@ -109,6 +109,5 @@ subroutine genmsk_128_90(msg0,mygrid,ichk,bcontest,msgsent,i4tone,itype) ! Flip polarity i4tone=-i4tone+1 - 999 return end subroutine genmsk_128_90 diff --git a/lib/msk144decodeframe.f90 b/lib/msk144decodeframe.f90 index 20a69f552..297987d9e 100644 --- a/lib/msk144decodeframe.f90 +++ b/lib/msk144decodeframe.f90 @@ -88,7 +88,7 @@ subroutine msk144decodeframe(c,softbits,msgreceived,nsuccess,recent_calls,nrecen ssig=sqrt(s2av-sav*sav) softbits=softbits/ssig - sigma=0.75 + sigma=0.60 llr(1:48)=softbits(9:9+47) llr(49:128)=softbits(65:65+80-1) llr=2.0*llr/(sigma*sigma) diff --git a/lib/msk144sim.f90 b/lib/msk144sim.f90 index 485de9a77..48257e705 100644 --- a/lib/msk144sim.f90 +++ b/lib/msk144sim.f90 @@ -41,6 +41,7 @@ program msk144sim bcontest=.false. if(msg(i1:i1+1).eq.'R ') bcontest=.true. ichk=0 + itype=1 call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,itone,itype) twopi=8.d0*atan(1.d0)