From 83ddcd9b8e1bf0c805cdb84e8842d648c690e10c Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 4 Jul 2021 12:05:42 -0400 Subject: [PATCH 1/3] Correct a flaw in mapsim when generating many files with different callsigns. --- map65/libm65/mapsim.f90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/map65/libm65/mapsim.f90 b/map65/libm65/mapsim.f90 index f47708322..2290e0662 100644 --- a/map65/libm65/mapsim.f90 +++ b/map65/libm65/mapsim.f90 @@ -12,7 +12,7 @@ program mapsim logical bq65 character msg0*22,message*22,msgsent*22,arg*8,fname*11,mode*2 character*16 msg_list(60) - data ilist/0/,msg_list/ & + data msg_list/ & 'W1AAA K2BBB EM00','W2CCC K3DDD EM01','W3EEE K4FFF EM02', & 'W5GGG K6HHH EM03','W7III K8JJJ EM04','W9KKK K0LLL EM05', & 'G0MMM F1NNN JN06','G2OOO F3PPP JN07','G4QQQ F5RRR JN08', & @@ -91,6 +91,7 @@ program mapsim 1000 format('File N Mode DT freq pol fDop SNR Message'/68('-')) do ifile=1,nfiles + ilist=0 nmin=ifile-1 if(mode(2:2).eq.' ') nmin=2*nmin write(fname,1002) nmin !Create the output filenames From 85da2bbb188e25e87acabb0b0e664e3209dde4fc Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 4 Jul 2021 12:19:29 -0400 Subject: [PATCH 2/3] Correct the formatting of Q65 messages to livecq. --- map65/libm65/display.f90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/map65/libm65/display.f90 b/map65/libm65/display.f90 index a9f9ffab8..006ae7b9a 100644 --- a/map65/libm65/display.f90 +++ b/map65/libm65/display.f90 @@ -127,6 +127,8 @@ subroutine display(nkeep,ftol) livecq=line3(k)(6:13)//line3(k)(28:31)//line3(k)(39:45)// & line3(k)(23:27)//line3(k)(35:38)//line3(k)(46:70)// & line3(k)(73:77) + if(livecq(56:56).eq.':') livecq(56:58)=' '//livecq(56:57) + print*,'= ',trim(livecq) if(index(livecq,' CQ ').gt.0 .or. index(livecq,' QRZ ').gt.0 .or. & index(livecq,' QRT ').gt.0 .or. index(livecq,' CQV ').gt.0 .or. & index(livecq,' CQH ').gt.0) write(19,1029) livecq From 808b5f556d56896f15100c1388d8386a1b30d385 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 5 Jul 2021 00:12:55 +0100 Subject: [PATCH 3/3] Release preparation --- NEWS | 3 ++- Release_Notes.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index fea3fb76b..5fb39e0d1 100644 --- a/NEWS +++ b/NEWS @@ -13,7 +13,7 @@ Copyright 2001 - 2021 by Joe Taylor, K1JT. Release: WSJT-X 2.5.0-rc3 - Jul 3, 2021 + Jul 5, 2021 ------------------------- Remember that the WSJT-X 2.5.0 package includes MAP65 3.0.0. Changes @@ -25,6 +25,7 @@ MAP65: - Translate reported frequencies so that |DF| <= 500 Hz for Q65 decodes. - Provide access to Release Notes from the Help menu + - Correct the formatting of Q65 messages to livecq WSJT-X: - Repair a long standing defect that caused UDP Protocol Heartbeat diff --git a/Release_Notes.txt b/Release_Notes.txt index 85edbce68..386746893 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -13,7 +13,7 @@ Copyright 2001 - 2021 by Joe Taylor, K1JT. Release: WSJT-X 2.5.0-rc3 - Jul 3, 2021 + Jul 5, 2021 ------------------------- Remember that the WSJT-X 2.5.0 package includes MAP65 3.0.0. Changes @@ -25,6 +25,7 @@ MAP65: - Translate reported frequencies so that |DF| <= 500 Hz for Q65 decodes. - Provide access to Release Notes from the Help menu + - Correct the formatting of Q65 messages to livecq WSJT-X: - Repair a long standing defect that caused UDP Protocol Heartbeat