From 8e5c986b0cb518ef55a123176b2cb6b4c22439fe Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 4 Nov 2016 16:45:12 +0000 Subject: [PATCH] Enable support for "CQ AA" through "CQ ZZ" in standard messages. They are encoded internally as "E9AA" through "E9ZZ". git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7289 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/packjt.f90 | 10 +++++++++- lib/testmsg.f90 | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/packjt.f90 b/lib/packjt.f90 index 6a567f604..c1fc0089d 100644 --- a/lib/packjt.f90 +++ b/lib/packjt.f90 @@ -416,7 +416,11 @@ subroutine packbits(dbits,nsymd,m0,sym) call fmtmsg(msg,iz) if(msg(1:6).eq.'CQ DX ') msg(3:3)='9' - + if(msg(1:3).eq."CQ " .and. & + msg(4:4).ge.'A' .and. msg(4:4).le.'Z' .and. & + msg(5:5).ge.'A' .and. msg(5:5).le.'Z' .and. & + msg(6:6).eq.' ') msg='E9'//msg(4:) + ! See if it's a CQ message if(msg(1:3).eq.'CQ ') then i=3 @@ -613,6 +617,10 @@ subroutine packbits(dbits,nsymd,m0,sym) 100 continue if(msg(1:6).eq.'CQ9DX ') msg(3:3)=' ' + if(msg(1:2).eq.'E9' .and. & + msg(3:3).ge.'A' .and. msg(3:3).le.'Z' .and. & + msg(4:4).ge.'A' .and. msg(4:4).le.'Z' .and. & + msg(5:5).eq.' ') msg='CQ '//msg(3:) return end subroutine unpackmsg diff --git a/lib/testmsg.f90 b/lib/testmsg.f90 index d0d1dafeb..9c4a8a0cb 100644 --- a/lib/testmsg.f90 +++ b/lib/testmsg.f90 @@ -1,4 +1,4 @@ - parameter (MAXTEST=35,NTEST=25) + parameter (MAXTEST=35,NTEST=27) character*22 testmsg(MAXTEST) data testmsg(1:NTEST)/ & "CQ WB9XYZ EN34", & @@ -13,6 +13,8 @@ "KA1ABC WB9XYZ", & "CQ 000 WB9XYZ EN34", & "CQ 999 WB9XYZ EN34", & + "CQ EU WB9XYZ EN34", & + "CQ WY WB9XYZ EN34", & "ZL/KA1ABC WB9XYZ", & "KA1ABC ZL/WB9XYZ", & "KA1ABC/4 WB9XYZ", &