w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-05 07:24:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up the handling of goofy calls.

Browse Source
This commit is contained in:
Joe Taylor
2018-08-29 09:21:08 -04:00
parent da2c670c0b
commit 17beaf71de
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/77bit/messages.txt
+16 -7
View File
@@ -55,15 +55,24 @@ PA9XYZ 590003 IO91NP
G4ABC/P R 570007 JO22DB
PA9XYZ G4ABC/P RR73
8. Compound or goofy calls
8. Compound or nonstandard callsign calls CQ
-----------------------------------------------------------
CQ PJ4/K1ABC
<PJ4/K1ABC> W9XYZ
W9XYZ K1ABC -11
K1ABC W9XYZ R-09
W9XYZ <PJ4/K1ABC> RRR
<PJ4/K1ABC> W9XYZ 73
9. Other stuff
PJ4/K1ABC <W9XYZ>
W9XYZ <PJ4/K1ABC> -11
<PJ4/K1ABC> W9XYZ R-09
<W9XYZ> PJ4/K1ABC RRR
PJ4/K1ABC <W9XYZ> 73
9. Compound or nonstandard callsign answers a CQ
-----------------------------------------------------------
CQ W9XYZ EN37
<W9XYZ> YW18FIFA
<YW18FIFA> W9XYZ -11
W9XYZ <YW18FIFA> R-09
YW18FIFA <W9XYZ> RRR
<W9XYZ> YW18FIFA 73
10. Other stuff
-----------------------------------------------------------
TNX BOB 73 GL
CQ YW18FIFA
lib/77bit/packjt77.f90
+2 -2
View File
@@ -116,7 +116,6 @@ subroutine save_hash_call(c13,n10,n12,n22)
900 return
end subroutine save_hash_call
subroutine pack77(msg0,i3,n3,c77)
use packjt
@@ -834,7 +833,6 @@ subroutine pack77_03(nwords,w,i3,n3,c77)
return
end subroutine pack77_03
subroutine pack77_1(nwords,w,i3,n3,c77)
! Check Type 1 (Standard 77-bit message) and Type 2 (ditto, with a "/P" call)
@@ -860,6 +858,8 @@ subroutine pack77_1(nwords,w,i3,n3,c77)
if(w(1)(1:1).eq.'<' .and. index(w(1),'>').ge.5) ok1=.true.
if(w(2)(1:1).eq.'<' .and. index(w(2),'>').ge.5) ok2=.true.
if(.not.ok1 .or. .not.ok2) return
if(w(1)(1:1).eq.'<' .and. index(w(2),'/').gt.0) return
if(w(2)(1:1).eq.'<' .and. index(w(1),'/').gt.0) return
if(nwords.eq.2 .and. (.not.ok2 .or. index(w(2),'/').ge.2)) return
if(nwords.eq.2) go to 10