From 3b783a083ee26a88ff01b385280d982d4ac82646 Mon Sep 17 00:00:00 2001 From: Steve Franke Date: Fri, 28 Sep 2018 16:36:33 -0500 Subject: [PATCH] Better handling of decodes with unhashed callsigns. --- lib/ft8/ft8b_2.f90 | 2 +- lib/ft8/genft8_174_91.f90 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ft8/ft8b_2.f90 b/lib/ft8/ft8b_2.f90 index 133a1de8a..555b010a8 100644 --- a/lib/ft8/ft8b_2.f90 +++ b/lib/ft8/ft8b_2.f90 @@ -325,7 +325,7 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & cycle endif nbadcrc=0 ! If we get this far: valid codeword, valid (i3,n3), nonquirky message. - call genft8_174_91(msg37,i3,n3,msgsent37,msgbits,itone) + call get_tones_from_77bits(message77,itone) if(lsubtract) call subtractft8(dd0,itone,f1,xdt) xsig=0.0 xnoi=0.0 diff --git a/lib/ft8/genft8_174_91.f90 b/lib/ft8/genft8_174_91.f90 index c9b2a7cd7..a9e8d7007 100644 --- a/lib/ft8/genft8_174_91.f90 +++ b/lib/ft8/genft8_174_91.f90 @@ -17,11 +17,13 @@ subroutine genft8_174_91(msg,i3,n3,msgsent,msgbits,itone) i3=-1 n3=-1 call pack77(msg,i3,n3,c77) - call unpack77(c77,msgsent,unpk77_success) read(c77,'(77i1)',err=1) msgbits go to 2 1 write(81,*) msg,c77 ; flush(81) + +entry get_tones_from_77bits(msgbits,itone) + 2 call encode174_91(msgbits,codeword) !Encode the test message ! Message structure: S7 D29 S7 D29 S7