Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0

Release_Notes.txt

@@ -12,31 +12,43 @@
                                                          
 Copyright 2001 - 2019 by Joe Taylor, K1JT.
 
-		   Release: WSJT-X 2.1.0-rc6
-		         May 30, 2019
+		   Release: WSJT-X 2.1.0-rc7
+		         June 3, 2019
 		   -------------------------
-		   
+
+This release is  a bug fix only release addressing  regressions in the
+prior  RC6 release.  There are  no  functional changes  other than  an
+updated AD1C CTY.DAT database.
+
+
+		   Release: WSJT-X 2.1.0-rc6
+		         June 2, 2019
+		   -------------------------
+
 Changes and bug fixes since WSJT-X 2.1.0-rc5:
 
-IMPORTANT CHANGES TO THE FT4 PROTOCOL, NOT BACKWARD COMPATIBLE
+IMPORTANT CHANGES TO THE FT4 PROTOCOL *** NOT BACKWARD COMPATIBLE ***
  - T/R sequence length increased from 6.0 to 7.5 seconds
- - Symbol rate decreased from 23.4375 to 20.8333 baud.
- - Bandwidth decreased from 90 Hz to 80 Hz
+ - Symbol rate decreased from 23.4375 to 20.8333 baud
+ - Signal bandwidth decreased from 90 Hz to 80 Hz
 
-OTHER IMPROVEMENTS
- - Allowable FT4 time offsets -1.0 < DT < +1.0 s
- - Allow RRR Tx4 message in FT4 mode, if not using contest messages
- - Send FT4 audio frequency to PSK Reporter
+OTHER FT4 IMPROVEMENTS
+ - Allowable time offsets -1.0 < DT < +1.0 s
+ - Tx4 message with RRR now allowed, except in contest messages
+ - Audio frequency is now sent to PSK Reporter
  - Add a third decoding pass
  - Add ordered statistics decoding
  - Improved sensitivity: threshold S/N is now -17.5 dB
+ - Improved S/N calculation
+ - In FT4 mode, Shift+F11/F12 moves Tx freq by +/- 100 Hz
+
+OTHER IMPROVEMENTS
  - Improvements to accessibility
  - Updates to the User Guide (not yet complete, however)
  - New user option: "Calling CQ forces Call 1st"
- - In FT4 mode, Shift+F11/F12 moves Tx freq by +/- 100 Hz
- - Improved S/N calculation for FT4 mode
  - N1MM Logger+ now uses the standard WSJT-X UDP messages
  - OK/Cancel buttons on Log QSO window maintain fixed positions
+ - Put EU VHF contest serial numbers into the ADIF SRX and STX fields
  - Enhancements to the Omni-Rig CAT interface
  - New setting option to include or exclude WAE entities
 
@@ -48,6 +60,13 @@ BUG FIXES
  - Fix a bug that caused a Fortran bounds error
  - Repaired field editing in the Contest Log window
 
+Release candidate WSJT-X 2.1.0-rc6 will be available for beta-testing
+through July 21, 2019.  It will be inoperable during the ARRL June VHF
+QSO Party (June 8-10) or ARRL Field Day (June 22-23).  It will
+permanently cease to function after July 21, 2019.  If all goes
+according to plan, by that time there will be a General
+Availability (GA) release of WSJT-X 2.1.0.
+		   
 
 		   Release: WSJT-X 2.1.0-rc5
 		         April 29, 2019

Versions.cmake

@@ -2,5 +2,5 @@
 set (WSJTX_VERSION_MAJOR 2)
 set (WSJTX_VERSION_MINOR 1)
 set (WSJTX_VERSION_PATCH 0)
-set (WSJTX_RC 7)		 # release candidate number, comment out or zero for development versions
+set (WSJTX_RC 8)		 # release candidate number, comment out or zero for development versions
 set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

lib/jt9.f90

@@ -139,7 +139,7 @@ program jt9
            read (optarg(:arglen), *) nexp_decode
      end select
   end do
-
+  
   if (display_help .or. stat .lt. 0                      &
        .or. (.not. read_files .and. remain .gt. 0)       &
        .or. (read_files .and. remain .lt. 1)) then
@@ -234,7 +234,7 @@ program jt9
         read(unit=wav%lun,end=3) shared_data%id2(k-kstep+1:k)
         go to 4
 3       call timer('read_wav',1)
-        print*,'EOF on input file ',infile
+        print*,'EOF on input file ',trim(infile)
         exit
 4       call timer('read_wav',1)
         nhsym=(k-2048)/kstep

lib/readwav.f90

@@ -53,7 +53,8 @@ contains
     type(riff_descriptor) :: desc
     character(len=4) :: riff_type
 
-    open (newunit=this%lun, file=filename, access='stream', form='unformatted', status='old')
+    this%lun=26
+    open (unit=this%lun, file=filename, access='stream',status='old')
     read (unit=this%lun) desc,riff_type
     inquire (unit=this%lun, pos=filepos)
     do
@@ -67,5 +68,6 @@ contains
        end if
        filepos = filepos + (desc%size + 1) / 2 * 2 ! pad to even alignment
     end do
+    return
   end subroutine read
 end module readwav