From 7195f121ddbe79cb2926a3484f7d3048a37f68c8 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 28 Jun 2017 18:23:56 +0000
Subject: [PATCH] FT8 mode: Add suggested default freqs; start Tx audio at
 t=0.5 s rather than 1.0 s; Correct the displayed value of DT.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7747 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 FrequencyList.cpp  | 12 +++++++++++-
 Modulator.cpp      |  5 +++++
 lib/ft8_decode.f90 |  5 +++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/FrequencyList.cpp b/FrequencyList.cpp
index 242b6f9e9..bbd6e10dc 100644
--- a/FrequencyList.cpp
+++ b/FrequencyList.cpp
@@ -38,21 +38,25 @@ namespace
       {1836600, Modes::WSPR},
       {1838000, Modes::JT65},
       {1840000, Modes::JT9},
+      {1841000, Modes::FT8},
       {2500000, Modes::FreqCal},
       {3330000, Modes::FreqCal},
       {3576000, Modes::JT65},
       {3578000, Modes::JT9},
+      {3579000, Modes::FT8},
       {3592600, Modes::WSPR},
       {5357000, Modes::JT65},
       {5000000, Modes::FreqCal},
       {7038600, Modes::WSPR},
       {7076000, Modes::JT65},
       {7078000, Modes::JT9},
+      {7079000, Modes::FT8},
       {7850000, Modes::FreqCal},
       {10000000, Modes::FreqCal},
       {10138000, Modes::JT65},
       {10138700, Modes::WSPR},
       {10140000, Modes::JT9},
+      {10141000, Modes::FT8},
       {14095600, Modes::WSPR},
       {14076000, Modes::JT65},
       {14078000, Modes::JT9},
@@ -61,23 +65,29 @@ namespace
       {15000000, Modes::FreqCal},
       {18102000, Modes::JT65},
       {18104000, Modes::JT9},
+      {18104100, Modes::FT8},
       {18104600, Modes::WSPR},
       {20000000, Modes::FreqCal},
       {21076000, Modes::JT65},
       {21078000, Modes::JT9},
+      {21079000, Modes::FT8},
       {21094600, Modes::WSPR},
       {24917000, Modes::JT65},
       {24919000, Modes::JT9},
+      {24920000, Modes::FT8},
       {24924600, Modes::WSPR},
       {28076000, Modes::JT65},
       {28078000, Modes::JT9},
+      {28079000, Modes::FT8},
       {28124600, Modes::WSPR},
       {50000000, Modes::Echo},
       {50276000, Modes::JT65},
       {50280000, Modes::MSK144},
       {50293000, Modes::WSPR},
-      {50301000, Modes::FT8},
+      {50310000, Modes::JT65},
+      {50313000, Modes::FT8},
       {70091000, Modes::JT65},
+      {70094000, Modes::JT65},
       {70091000, Modes::WSPR},
       {144000000, Modes::Echo},
       {144120000, Modes::JT65},
diff --git a/Modulator.cpp b/Modulator.cpp
index d16b26efc..67a77049d 100644
--- a/Modulator.cpp
+++ b/Modulator.cpp
@@ -86,6 +86,11 @@ void Modulator::start (unsigned symbolsLength, double framesPerSymbol,
   if (synchronize && !m_tuning && !m_bFastMode)	{
     m_silentFrames = m_ic + m_frameRate - (mstr * m_frameRate / 1000);
   }
+  if(m_ic==0 and (m_silentFrames/48000.0 > 0.6) and m_nsps==2048 and m_period==15) {
+    // FT8 mode: Start audio at t=0.5 s rather than t=1.0 s.
+    m_silentFrames=m_silentFrames-24000;
+  }
+
   initialize (QIODevice::ReadOnly, channel);
   Q_EMIT stateChanged ((m_state = (synchronize && m_silentFrames) ?
                         Synchronizing : Active));
diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90
index bb72349aa..921df6689 100644
--- a/lib/ft8_decode.f90
+++ b/lib/ft8_decode.f90
@@ -55,15 +55,16 @@ contains
        nsnr=min(99,nint(10.0*log10(sync) - 25.5))    !### empirical ###
        call timer('ft8b    ',0)
        call ft8b(s,nfqso,f1,xdt,nharderrors,dmin,nbadcrc,message)
+       xdt=xdt-0.6
        call timer('ft8b    ',1)
        if (associated(this%callback)) call this%callback(sync,nsnr,xdt,   &
             f1,nbadcrc,message)
 !       write(13,1110) datetime,0,nsnr,xdt,f1,nharderrors,dmin,message
 !1110   format(a13,2i4,f6.2,f7.1,i4,' ~ ',f6.2,2x,a22,'  FT8')
        write(51,3051) xdt,f1,sync,dmin,nsnr,nharderrors,nbadcrc,message
-3051 format(4f9.1,3i5,2x,a22)
+3051   format(4f9.1,3i5,2x,a22)
+       flush(51)
     enddo
-    flush(51)
 
     return
   end subroutine decode