From 9208ac55b8bf125f1c605d408ea4f16c3215437e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 16 Jun 2020 11:02:24 -0400 Subject: [PATCH] Another try: Ignore messages decoding to i3.n3 = 0.2. --- lib/77bit/packjt77.f90 | 5 ++++- lib/ft8/ft8b.f90 | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90 index 0db23a5d8..2464ea80e 100644 --- a/lib/77bit/packjt77.f90 +++ b/lib/77bit/packjt77.f90 @@ -281,7 +281,7 @@ subroutine unpack77(c77,nrx,msg,unpk77_success) call unpacktext77(c77(1:71),msg(1:13)) msg(14:)=' ' msg=adjustl(msg) - + else if(i3.eq.0 .and. n3.eq.1) then ! 0.1 K1ABC RR73; W9XYZ -11 28 28 10 5 71 DXpedition Mode 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)//'>' 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 ! 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 diff --git a/lib/ft8/ft8b.f90 b/lib/ft8/ft8b.f90 index 246541461..f4dd60183 100644 --- a/lib/ft8/ft8b.f90 +++ b/lib/ft8/ft8b.f90 @@ -423,10 +423,9 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,nzhsym,lapon, & read(c77(72:74),'(b3)') n3 read(c77(75:77),'(b3)') i3 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) - if(.not.unpk77_success) then - cycle - endif + if(.not.unpk77_success) cycle nbadcrc=0 ! If we get this far: valid codeword, valid (i3,n3), nonquirky message. call get_ft8_tones_from_77bits(message77,itone) if(lsubtract) then