Another try: Ignore messages decoding to i3.n3 = 0.2.

This commit is contained in:
Joe Taylor 2020-06-16 11:02:24 -04:00 committed by Bill Somerville
parent ad0ff6d2be
commit 9208ac55b8
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 6 additions and 4 deletions

View File

@ -281,7 +281,7 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
call unpacktext77(c77(1:71),msg(1:13)) call unpacktext77(c77(1:71),msg(1:13))
msg(14:)=' ' msg(14:)=' '
msg=adjustl(msg) msg=adjustl(msg)
else if(i3.eq.0 .and. n3.eq.1) then else if(i3.eq.0 .and. n3.eq.1) then
! 0.1 K1ABC RR73; W9XYZ <KH1/KH7Z> -11 28 28 10 5 71 DXpedition Mode ! 0.1 K1ABC RR73; W9XYZ <KH1/KH7Z> -11 28 28 10 5 71 DXpedition Mode
read(c77,1010) n28a,n28b,n10,n5 read(c77,1010) n28a,n28b,n10,n5
@ -303,6 +303,9 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
n10.eq.hashmy10) call_3='<'//trim(mycall13)//'>' n10.eq.hashmy10) call_3='<'//trim(mycall13)//'>'
msg=trim(call_1)//' RR73; '//trim(call_2)//' '//trim(call_3)//' '//crpt msg=trim(call_1)//' RR73; '//trim(call_2)//' '//trim(call_3)//' '//crpt
else if(i3.eq.0 .and. n3.eq.2) then
unpk77_success=.false.
else if(i3.eq.0 .and. (n3.eq.3 .or. n3.eq.4)) then else if(i3.eq.0 .and. (n3.eq.3 .or. n3.eq.4)) then
! 0.3 WA9XYZ KA1ABC R 16A EMA 28 28 1 4 3 7 71 ARRL Field Day ! 0.3 WA9XYZ KA1ABC R 16A EMA 28 28 1 4 3 7 71 ARRL Field Day
! 0.4 WA9XYZ KA1ABC R 32A EMA 28 28 1 4 3 7 71 ARRL Field Day ! 0.4 WA9XYZ KA1ABC R 32A EMA 28 28 1 4 3 7 71 ARRL Field Day

View File

@ -423,10 +423,9 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,nzhsym,lapon, &
read(c77(72:74),'(b3)') n3 read(c77(72:74),'(b3)') n3
read(c77(75:77),'(b3)') i3 read(c77(75:77),'(b3)') i3
if(i3.gt.5 .or. (i3.eq.0.and.n3.gt.6)) cycle if(i3.gt.5 .or. (i3.eq.0.and.n3.gt.6)) cycle
if(i3.eq.0 .and. n3.eq.2) cycle
call unpack77(c77,1,msg37,unpk77_success) call unpack77(c77,1,msg37,unpk77_success)
if(.not.unpk77_success) then if(.not.unpk77_success) cycle
cycle
endif
nbadcrc=0 ! If we get this far: valid codeword, valid (i3,n3), nonquirky message. nbadcrc=0 ! If we get this far: valid codeword, valid (i3,n3), nonquirky message.
call get_ft8_tones_from_77bits(message77,itone) call get_ft8_tones_from_77bits(message77,itone)
if(lsubtract) then if(lsubtract) then