w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-22 12:08:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Joe Taylor 2022-12-29 10:22:01 -05:00
commit a14d9cc6eb
4 changed files with 72 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Configuration.cpp
View File

@ -228,6 +228,22 @@ namespace
|DC # District of Columbia
|DX # anyone else
|SCC # Slovenia Contest Club contest
|DR|FR|GD|GR|OV|ZH|ZL # Dutch provinces (also FL,NH,UT,NB,LB)
|X01|X02|X03|X04|X05|X06|X07 # 99 neutral exchanges
|X08|X09|X10|X11|X12|X13|X14
|X15|X16|X17|X18|X19|X20|X21
|X22|X23|X24|X25|X26|X27|X28
|X29|X30|X31|X32|X33|X34|X35
|X36|X37|X38|X39|X40|X41|X42
|X43|X44|X45|X46|X47|X48|X49
|X50|X51|X52|X53|X54|X55|X56
|X57|X58|X59|X60|X61|X62|X63
|X64|X65|X66|X67|X68|X69|X70
|X71|X72|X73|X74|X75|X76|X77
|X78|X79|X80|X81|X82|X83|X84
|X85|X86|X87|X88|X89|X90|X91
|X92|X93|X94|X95|X96|X97|X98
|X99
)
)", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption};
@ -241,15 +257,15 @@ namespace
[A-F]\ * # class and optional space
(
AB|AK|AL|AR|AZ|BC|CO|CT|DE|EB # ARRL/RAC section
|EMA|ENY|EPA|EWA|GA|GTA|IA|ID
|IL|IN|KS|KY|LA|LAX|MAR|MB|MDC
|ME|MI|MN|MO|MS|MT|NC|ND|NE|NFL
|NH|NL|NLI|NM|NNJ|NNY|NT|NTX|NV
|OH|OK|ONE|ONN|ONS|OR|ORG|PAC|PE
|PR|QC|RI|SB|SC|SCV|SD|SDG|SF
|SFL|SJV|SK|SNJ|STX|SV|TN|UT|VA
|VI|VT|WCF|WI|WMA|WNY|WPA|WTX
|WV|WWA|WY
|EMA|ENY|EPA|EWA|GA|GH|IA|ID
|IL|IN|KS|KY|LA|LAX|MB|MDC|ME
|MI|MN|MO|MS|MT|NB|NC|ND|NE|NFL
|NH|NL|NLI|NM|NNJ|NNY|NS|NTX|NV
|OH|OK|ONE|ONN|ONS|OR|ORG|PAC
|PE|PR|QC|RI|SB|SC|SCV|SD|SDG
|SF|SFL|SJV|SK|SNJ|STX|SV|TER
|TN|UT|VA|VI|VT|WCF|WI|WMA|WNY
|WPA|WTX|WV|WWA|WY
|DX # anyone else
)
)", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption};

5
NEWS
View File

@ -37,6 +37,11 @@ the following changes since Release Candidate 5:
- Add tooltips to better explain the split operation options.
- Add some additional FT roundup exchanges which can be used for
local contests or QSO parties.
- Update of some ARRL section abbreviations.
Release: WSJT-X 2.6.0-rc5
November 29, 2022

6
Release_Notes.txt
View File

@ -48,10 +48,16 @@ Other enhancements and bug fixes since 2.6.0-rc5 include the following:
- Add tooltips to better explain the split operation options.
- Add some additional FT roundup exchanges which can be used for
local contests or QSO parties.
- Update of some ARRL section abbreviations.
For full details on changes since WSJT-X version 2.5.4, be sure to
read the Release Notes sections for 2.6.0-rc1 through rc5, immediately
following.
Release: WSJT-X 2.6.0-rc5
November 29, 2022
-------------------------

50
lib/77bit/packjt77.f90
View File

@ -204,8 +204,8 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
! the value of nrx is used to decide when mycall13 or dxcall13 should
! be used in place of a callsign from the hashtable
!
parameter (NSEC=85) !Number of ARRL Sections
parameter (NUSCAN=65) !Number of US states and Canadian provinces
parameter (NSEC=86) !Number of ARRL Sections
parameter (NUSCAN=171) !Number of States and Provinces
parameter (MAXGRID4=32400)
integer*8 n58
integer ntel(3)
@ -229,14 +229,14 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
data c/' 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ/'/
data csec/ &
"AB ","AK ","AL ","AR ","AZ ","BC ","CO ","CT ","DE ","EB ", &
"EMA","ENY","EPA","EWA","GA ","GTA","IA ","ID ","IL ","IN ", &
"KS ","KY ","LA ","LAX","MAR","MB ","MDC","ME ","MI ","MN ", &
"EMA","ENY","EPA","EWA","GA ","GH ","IA ","ID ","IL ","IN ", &
"KS ","KY ","LA ","LAX","NS ","MB ","MDC","ME ","MI ","MN ", &
"MO ","MS ","MT ","NC ","ND ","NE ","NFL","NH ","NL ","NLI", &
"NM ","NNJ","NNY","NT ","NTX","NV ","OH ","OK ","ONE","ONN", &
"NM ","NNJ","NNY","TER","NTX","NV ","OH ","OK ","ONE","ONN", &
"ONS","OR ","ORG","PAC","PR ","QC ","RI ","SB ","SC ","SCV", &
"SD ","SDG","SF ","SFL","SJV","SK ","SNJ","STX","SV ","TN ", &
"UT ","VA ","VI ","VT ","WCF","WI ","WMA","WNY","WPA","WTX", &
"WV ","WWA","WY ","DX ","PE "/
"WV ","WWA","WY ","DX ","PE ","NB "/
data cmult/ &
"AL ","AK ","AZ ","AR ","CA ","CO ","CT ","DE ","FL ","GA ", &
"HI ","ID ","IL ","IN ","IA ","KS ","KY ","LA ","ME ","MD ", &
@ -244,7 +244,18 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
"NM ","NY ","NC ","ND ","OH ","OK ","OR ","PA ","RI ","SC ", &
"SD ","TN ","TX ","UT ","VT ","VA ","WA ","WV ","WI ","WY ", &
"NB ","NS ","QC ","ON ","MB ","SK ","AB ","BC ","NWT","NF ", &
"LB ","NU ","YT ","PEI","DC "/
"LB ","NU ","YT ","PEI","DC ","DR ","FR ","GD ","GR ","OV ", &
"ZH ","ZL ","X01","X02","X03","X04","X05","X06","X07","X08", &
"X09","X10","X11","X12","X13","X14","X15","X16","X17","X18", &
"X19","X20","X21","X22","X23","X24","X25","X26","X27","X28", &
"X29","X30","X31","X32","X33","X34","X35","X36","X37","X38", &
"X39","X40","X41","X42","X43","X44","X45","X46","X47","X48", &
"X49","X50","X51","X52","X53","X54","X55","X56","X57","X58", &
"X59","X60","X61","X62","X63","X64","X65","X66","X67","X68", &
"X69","X70","X71","X72","X73","X74","X75","X76","X77","X78", &
"X79","X80","X81","X82","X83","X84","X85","X86","X87","X88", &
"X89","X90","X91","X92","X93","X94","X95","X96","X97","X98", &
"X99"/
data dxcall13_set/.false./
data mycall13_set/.false./
data mycall13_0/''/
@ -892,7 +903,7 @@ subroutine pack77_03(nwords,w,i3,n3,c77)
! Check 0.3 and 0.4 (ARRL Field Day exchange)
! Example message: WA9XYZ KA1ABC R 16A EMA 28 28 1 4 3 7 71
parameter (NSEC=85) !Number of ARRL Sections
parameter (NSEC=86) !Number of ARRL Sections
character*13 w(19)
character*77 c77
character*6 bcall_1,bcall_2
@ -900,14 +911,14 @@ subroutine pack77_03(nwords,w,i3,n3,c77)
logical ok1,ok2
data csec/ &
"AB ","AK ","AL ","AR ","AZ ","BC ","CO ","CT ","DE ","EB ", &
"EMA","ENY","EPA","EWA","GA ","GTA","IA ","ID ","IL ","IN ", &
"KS ","KY ","LA ","LAX","MAR","MB ","MDC","ME ","MI ","MN ", &
"EMA","ENY","EPA","EWA","GA ","GH ","IA ","ID ","IL ","IN ", &
"KS ","KY ","LA ","LAX","NS ","MB ","MDC","ME ","MI ","MN ", &
"MO ","MS ","MT ","NC ","ND ","NE ","NFL","NH ","NL ","NLI", &
"NM ","NNJ","NNY","NT ","NTX","NV ","OH ","OK ","ONE","ONN", &
"NM ","NNJ","NNY","TER","NTX","NV ","OH ","OK ","ONE","ONN", &
"ONS","OR ","ORG","PAC","PR ","QC ","RI ","SB ","SC ","SCV", &
"SD ","SDG","SF ","SFL","SJV","SK ","SNJ","STX","SV ","TN ", &
"UT ","VA ","VI ","VT ","WCF","WI ","WMA","WNY","WPA","WTX", &
"WV ","WWA","WY ","DX ","PE "/
"WV ","WWA","WY ","DX ","PE ","NB "/
if(nwords.lt.4 .or. nwords.gt.5) return
call chkcall(w(1),bcall_1,ok1)
@ -1194,7 +1205,7 @@ subroutine pack77_3(nwords,w,i3,n3,c77)
! - DX: rpt serial R 559 0013
! Example message: TU; W9XYZ K1ABC R 579 MA 1 28 28 1 3 13 74
parameter (NUSCAN=65) !Number of US states and Canadian provinces/territories
parameter (NUSCAN=171) !Number of US states and Canadian provinces/territories
character*13 w(19)
character*77 c77
character*6 bcall_1,bcall_2
@ -1208,7 +1219,18 @@ subroutine pack77_3(nwords,w,i3,n3,c77)
"NM ","NY ","NC ","ND ","OH ","OK ","OR ","PA ","RI ","SC ", &
"SD ","TN ","TX ","UT ","VT ","VA ","WA ","WV ","WI ","WY ", &
"NB ","NS ","QC ","ON ","MB ","SK ","AB ","BC ","NWT","NF ", &
"LB ","NU ","YT ","PEI","DC "/
"LB ","NU ","YT ","PEI","DC ","DR ","FR ","GD ","GR ","OV ", &
"ZH ","ZL ","X01","X02","X03","X04","X05","X06","X07","X08", &
"X09","X10","X11","X12","X13","X14","X15","X16","X17","X18", &
"X19","X20","X21","X22","X23","X24","X25","X26","X27","X28", &
"X29","X30","X31","X32","X33","X34","X35","X36","X37","X38", &
"X39","X40","X41","X42","X43","X44","X45","X46","X47","X48", &
"X49","X50","X51","X52","X53","X54","X55","X56","X57","X58", &
"X59","X60","X61","X62","X63","X64","X65","X66","X67","X68", &
"X69","X70","X71","X72","X73","X74","X75","X76","X77","X78", &
"X79","X80","X81","X82","X83","X84","X85","X86","X87","X88", &
"X89","X90","X91","X92","X93","X94","X95","X96","X97","X98", &
"X99"/
if(w(1)(1:1).eq.'<' .and. w(2)(1:1).eq.'<') go to 900
if(nwords.eq.4 .or. nwords.eq.5 .or. nwords.eq.6) then