From 5e1795ff5c9136b425188c1ad4b09838afc969e4 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 17 Feb 2022 10:17:47 -0500 Subject: [PATCH] Fix the issue with using 'QQ0XYZ' in ft8_a7.f90. --- lib/chkcall.f90 | 4 +++- lib/ft8/ft8_a7.f90 | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/chkcall.f90 b/lib/chkcall.f90 index 23900748e..944cfeeb8 100644 --- a/lib/chkcall.f90 +++ b/lib/chkcall.f90 @@ -34,7 +34,9 @@ subroutine chkcall(w,bc,cok) ! One of first two characters (c1 or c2) must be a letter if((.not.isletter(bc(1:1))) .and. (.not.isletter(bc(2:2)))) go to 100 - if(bc(1:1).eq.'Q') go to 100 !Calls don't start with Q +! Real calls don't start with Q, but we'll allow the placeholder +! callsign QU1RK to be considered a standard call: + if(bc(1:1).eq.'Q' .and. bc(1:5).ne.'QU1RK') go to 100 ! Must have a digit in 2nd or 3rd position i1=0 diff --git a/lib/ft8/ft8_a7.f90 b/lib/ft8/ft8_a7.f90 index 51e73d7b9..dbad46cd0 100644 --- a/lib/ft8/ft8_a7.f90 +++ b/lib/ft8/ft8_a7.f90 @@ -275,7 +275,7 @@ subroutine ft8_a7d(dd0,newdat,call_1,call_2,grid4,xdt,f1,nharderrors,dmin, & do imsg=1,MAXMSG msg=trim(call_1)//' '//trim(call_2) i=imsg - if(call_1(1:3).eq.'CQ ' .and. i.ne.5) msg='QQ0XYZ '//trim(call_2) + if(call_1(1:3).eq.'CQ ' .and. i.ne.5) msg='QU1RK '//trim(call_2) if(.not.std_1) then if(i.eq.1 .or. i.ge.6) msg='<'//trim(call_1)//'> '//trim(call_2) if(i.ge.2 .and. i.le.4) msg=trim(call_1)//' <'//trim(call_2)//'>' @@ -370,6 +370,7 @@ subroutine ft8_a7d(dd0,newdat,call_1,call_2,grid4,xdt,f1,nharderrors,dmin, & if(dmin.gt.100.0 .or. dmin2/dmin.lt.1.3) nharderrors=-1 msg37=msgbest if(msg37(1:3).eq.'CQ ' .and. std_2 .and. grid4.eq.' ') nharderrors=-1 + if(index(msg37(1:6).eq.'QU1RK ') nharderrors=-1 return end subroutine ft8_a7d