From 2fb5d22e6f7a83e4fc3304002c0b04ee4eda1e8f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 20 Oct 2021 11:18:31 -0400 Subject: [PATCH 1/2] Fix the logic for setting ibwa, ibwb, and maxiters in Q65 "Deep" decoding attempts. --- lib/q65_decode.f90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index d3bb5dbd5..6e2b5e9d9 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -134,7 +134,8 @@ contains ibwa=max(1,int(1.8*log(baud*mode_q65)) + 1) ibwb=min(10,ibwa+5) maxiters=67 - else if(iand(ndepth,3).eq.3) then + endif + if(iand(ndepth,3).eq.3) then ibwa=max(1,ibwa-1) ibwb=min(10,ibwb+1) maxiters=100 From 83c1a85226440e187a19b385050888f0d5e4d5a0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 20 Oct 2021 12:51:18 -0400 Subject: [PATCH 2/2] In Q65 mode, allow q2 decodes when MyCall is compound or nonstandard. --- lib/ft8/ft8apset.f90 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ft8/ft8apset.f90 b/lib/ft8/ft8apset.f90 index 90f05b708..73a224ec6 100644 --- a/lib/ft8/ft8apset.f90 +++ b/lib/ft8/ft8apset.f90 @@ -6,20 +6,19 @@ subroutine ft8apset(mycall12,hiscall12,ncontest,apsym,aph10) character*13 hc13 character*10 c10 integer apsym(58),aph10(10) - logical nohiscall,unpk77_success + logical nohiscall,unpk77_success,std apsym=0 apsym(1)=99 apsym(30)=99 aph10=0 aph10(1)=99 - if(len(trim(mycall12)).lt.3) return nohiscall=.false. hiscall=hiscall12 if(len(trim(hiscall)).lt.3) then - hiscall=mycall12 ! use mycall for dummy hiscall - mycall won't be hashed. + hiscall='KA1ABC' !Use a dummy hiscall nohiscall=.true. else hc13=hiscall @@ -34,7 +33,9 @@ subroutine ft8apset(mycall12,hiscall12,ncontest,apsym,aph10) ! Encode a dummy standard message: i3=1, 28 1 28 1 1 15 ! - msg=trim(mycall12)//' '//trim(hiscall)//' RRR' + msg=trim(mycall12)//' '//trim(hiscall)//' RRR' + call stdcall(mycall12,std) + if(.not.std) msg='<'//trim(mycall12)//'> '//trim(hiscall)//' RRR' i3=0 n3=0 call pack77(msg,i3,n3,c77)