Merge branch 'hotfix-2.0.0-rc6' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc6

doc/user_guide/en/settings-colors.adoc

@@ -44,4 +44,21 @@ this is available on line.
 
 * Adjust *Age of of last upload less than* to set the period within
   which a station must have uploaded their log to LoTW to trigger
-  highlighting.
+  highlighting.
+
+TIP: If you are using Windows and experience LoTW download errors, go
+here https://slproweb.com/products/Win32OpenSSL.html and download the
+OpenSSL installer, specifically the “Win32 OpenSSL v1.0.2q Light”
+version. Note that this is the correct version even if you are running
+64-bit Windows. The direct download link is
+https://slproweb.com/download/Win32OpenSSL_Light-1_0_2q.exe.  Run the
+installer with all default options and accept the option to install
+into the Windows system directory.
+
+TIP: If you cannot install the OpenSSL libraries or do not have an
+Internet connection on the computer used to run WSJT-X 2.0, you can
+download the LoTW file manually. Go to
+https://lotw.arrl.org/lotw-user-activity.csv in a web browser,
+download the file, then move it to the WSJT-X log files
+directory. This directory can be opened by selecting File | Open log
+directory.

lib/ft8/ft8sim.f90

@@ -108,7 +108,6 @@ program ft8sim
      ib=k
      wave=real(c)
      peak=maxval(abs(wave(ia:ib)))
-     rms=sqrt(dot_product(wave(ia:ib),wave(ia:ib))/NWAVE)
      nslots=1
      if(width.gt.0.0) call filt8(f0,nslots,width,wave)
    
@@ -119,10 +118,16 @@ program ft8sim
         enddo
      endif
 
-     fac=32767.0
+     gain=100.0
-     rms=100.0
+     if(snrdb.lt.90.0) then
-     if(snrdb.ge.90.0) iwave(1:NMAX)=nint(fac*wave)
+       wave=gain*wave
-     if(snrdb.lt.90.0) iwave(1:NMAX)=nint(rms*wave)
+     else
+       datpk=maxval(abs(wave))
+       fac=32766.9/datpk
+       wave=fac*wave
+     endif
+     if(any(abs(wave).gt.32767.0)) print*,"Warning - data will be clipped."
+     iwave=nint(wave)
 
      h=default_header(12000,NMAX)
      write(fname,1102) ifile