From a44b240192323e4ee677d430014984556cdcd900 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 29 Jun 2020 17:33:46 -0400
Subject: [PATCH 1/2] Change to NSPS=720 for 15-seconf FST240 modes, to allow
 use for EME.

---
 Modulator/Modulator.cpp |  2 +-
 widgets/mainwindow.cpp  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Modulator/Modulator.cpp b/Modulator/Modulator.cpp
index 7b06cd915..8308a44cb 100644
--- a/Modulator/Modulator.cpp
+++ b/Modulator/Modulator.cpp
@@ -69,7 +69,7 @@ void Modulator::start (QString mode, unsigned symbolsLength, double framesPerSym
   m_bFastMode=fastMode;
   m_TRperiod=TRperiod;
   unsigned delay_ms=1000;
-  if(mode=="FT8" or (mode=="FST240" and m_nsps==800)) delay_ms=500;   //FT8, FST240-15
+  if(mode=="FT8" or (mode=="FST240" and m_nsps==720)) delay_ms=500;   //FT8, FST240-15
   if(mode=="FT4") delay_ms=300;                                       //FT4
 
 // noise generator parameters
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 097cec75a..1ff8edaac 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -1342,8 +1342,8 @@ void MainWindow::fixStop()
   } else if (m_mode=="FT4") {
   m_hsymStop=21;
   } else if(m_mode=="FST240" or m_mode=="FST240W") {
-    int stop[] = {44,85,187,387,1003};
-    int stop_EME[] = {51,95,197,396,1012};
+    int stop[] = {39,85,187,387,1003};
+    int stop_EME[] = {48,95,197,396,1012};
     int i=0;
     if(m_TRperiod==30) i=1;
     if(m_TRperiod==60) i=2;
@@ -3538,7 +3538,7 @@ void MainWindow::guiUpdate()
   if(m_modeTx=="QRA64")  txDuration=1.0 + 84*6912/12000.0;    // QRA64
   if(m_modeTx=="WSPR") txDuration=2.0 + 162*8192/12000.0;     // WSPR
   if(m_modeTx=="FST240" or m_mode=="FST240W") {               //FST240, FST240W
-    if(m_TRperiod==15)  txDuration=1.0 + 160*800/12000.0;
+    if(m_TRperiod==15)  txDuration=1.0 + 160*720/12000.0;
     if(m_TRperiod==30)  txDuration=1.0 + 160*1680/12000.0;
     if(m_TRperiod==60)  txDuration=1.0 + 160*3888/12000.0;
     if(m_TRperiod==120) txDuration=1.0 + 160*8200/12000.0;
@@ -3882,7 +3882,7 @@ void MainWindow::guiUpdate()
             genfst240_(message,&ichk,msgsent,const_cast<char *> (fst240msgbits),
                            const_cast<int *>(itone), &iwspr, 37, 37);
             int hmod=int(pow(2.0,double(m_nSubMode)));
-            int nsps=800;
+            int nsps=720;
             if(m_TRperiod==30) nsps=1680;
             if(m_TRperiod==60) nsps=3888;
             if(m_TRperiod==120) nsps=8200;
@@ -7163,7 +7163,7 @@ void MainWindow::transmit (double snr)
   if (m_modeTx == "FST240" or m_modeTx == "FST240W") {
     m_dateTimeSentTx3=QDateTime::currentDateTimeUtc();
     toneSpacing=-2.0;                     //Transmit a pre-computed, filtered waveform.
-    int nsps=800;
+    int nsps=720;
     if(m_TRperiod==30) nsps=1680;
     if(m_TRperiod==60) nsps=3888;
     if(m_TRperiod==120) nsps=8200;

From 023e09bc4d2533288872a2a9d8af9b9f465bf3d6 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 30 Jun 2020 08:58:40 -0400
Subject: [PATCH 2/2] Correct the help message's option label for setting
 FST240 mode.

---
 lib/jt9.f90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jt9.f90 b/lib/jt9.f90
index 23f330c9f..1bebf56f9 100644
--- a/lib/jt9.f90
+++ b/lib/jt9.f90
@@ -54,7 +54,7 @@ program jt9
     option ('jt4', .false., '4', 'JT4 mode', ''),                            &
     option ('ft4', .false., '5', 'FT4 mode', ''),                            &
     option ('jt65', .false.,'6', 'JT65 mode', ''),                           &
-    option ('fst240', .false., '7', 'FT8 mode', ''),                         &
+    option ('fst240', .false., '7', 'FST240 mode', ''),                      &
     option ('ft8', .false., '8', 'FT8 mode', ''),                            &
     option ('jt9', .false., '9', 'JT9 mode', ''),                            &
     option ('qra64', .false., 'q', 'QRA64 mode', ''),                        &