More fixes related to MSK144 changeover.

This commit is contained in:
Steve Franke 2018-07-07 12:57:16 -05:00
parent a9bb1924f9
commit e3594a2a04
3 changed files with 4 additions and 4 deletions

View File

@ -55,14 +55,14 @@ subroutine genmsk_128_90(msg0,mygrid,ichk,bcontest,msgsent,i4tone,itype)
2 i4tone(1)=nfreq 2 i4tone(1)=nfreq
else else
message=msg0 message=msg0
do i=1,22 do i=1, 37
if(ichar(message(i:i)).eq.0) then if(ichar(message(i:i)).eq.0) then
message(i:)=' ' message(i:)=' '
exit exit
endif endif
enddo enddo
do i=1,22 !Strip leading blanks do i=1,37 !Strip leading blanks
if(message(1:1).ne.' ') exit if(message(1:1).ne.' ') exit
message=message(i+1:) message=message(i+1:)
enddo enddo
@ -109,6 +109,5 @@ subroutine genmsk_128_90(msg0,mygrid,ichk,bcontest,msgsent,i4tone,itype)
! Flip polarity ! Flip polarity
i4tone=-i4tone+1 i4tone=-i4tone+1
999 return 999 return
end subroutine genmsk_128_90 end subroutine genmsk_128_90

View File

@ -88,7 +88,7 @@ subroutine msk144decodeframe(c,softbits,msgreceived,nsuccess,recent_calls,nrecen
ssig=sqrt(s2av-sav*sav) ssig=sqrt(s2av-sav*sav)
softbits=softbits/ssig softbits=softbits/ssig
sigma=0.75 sigma=0.60
llr(1:48)=softbits(9:9+47) llr(1:48)=softbits(9:9+47)
llr(49:128)=softbits(65:65+80-1) llr(49:128)=softbits(65:65+80-1)
llr=2.0*llr/(sigma*sigma) llr=2.0*llr/(sigma*sigma)

View File

@ -41,6 +41,7 @@ program msk144sim
bcontest=.false. bcontest=.false.
if(msg(i1:i1+1).eq.'R ') bcontest=.true. if(msg(i1:i1+1).eq.'R ') bcontest=.true.
ichk=0 ichk=0
itype=1
call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,itone,itype) call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,itone,itype)
twopi=8.d0*atan(1.d0) twopi=8.d0*atan(1.d0)