w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix the issue with using 'QQ0XYZ' in ft8_a7.f90.

Browse Source
This commit is contained in:
Joe Taylor 2022-02-17 10:17:47 -05:00
parent 5dc70b18db
commit 5e1795ff5c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/chkcall.f90
View File

@ -34,7 +34,9 @@ subroutine chkcall(w,bc,cok)
! One of first two characters (c1 or c2) must be a letter ! 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((.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 ! Must have a digit in 2nd or 3rd position
i1=0 i1=0

3
lib/ft8/ft8_a7.f90
View File

@ -275,7 +275,7 @@ subroutine ft8_a7d(dd0,newdat,call_1,call_2,grid4,xdt,f1,nharderrors,dmin, &
do imsg=1,MAXMSG do imsg=1,MAXMSG
msg=trim(call_1)//' '//trim(call_2) msg=trim(call_1)//' '//trim(call_2)
i=imsg 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(.not.std_1) then
if(i.eq.1 .or. i.ge.6) msg='<'//trim(call_1)//'> '//trim(call_2) 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)//'>' 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 if(dmin.gt.100.0 .or. dmin2/dmin.lt.1.3) nharderrors=-1
msg37=msgbest msg37=msgbest
if(msg37(1:3).eq.'CQ ' .and. std_2 .and. grid4.eq.' ') nharderrors=-1 if(msg37(1:3).eq.'CQ ' .and. std_2 .and. grid4.eq.' ') nharderrors=-1
if(index(msg37(1:6).eq.'QU1RK ') nharderrors=-1
return return
end subroutine ft8_a7d end subroutine ft8_a7d