From 7a22e6a2e1a219a5d2ff908f9fd1366c170bbaac Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Sun, 25 Oct 2020 14:10:38 -0400
Subject: [PATCH] Change the Q65 value of nsps from 7680 to 7200.

---
 lib/q65_decode.f90       | 2 +-
 lib/qra/qra65/q65sim.f90 | 2 +-
 lib/qra_loops.f90        | 2 +-
 lib/test_q65.f90         | 2 +-
 lib/test_qra64.f90       | 2 +-
 widgets/mainwindow.cpp   | 4 ++--
 widgets/plotter.cpp      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 8b522ce2e..d1f874649 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -71,7 +71,7 @@ contains
     else if(ntrperiod.eq.30) then
        nsps=3600
     else if(ntrperiod.eq.60) then
-       nsps=7680
+       nsps=7200
     else if(ntrperiod.eq.120) then
        nsps=16000
     else if(ntrperiod.eq.300) then
diff --git a/lib/qra/qra65/q65sim.f90 b/lib/qra/qra65/q65sim.f90
index 03696a0ae..8841b92cd 100644
--- a/lib/qra/qra65/q65sim.f90
+++ b/lib/qra/qra65/q65sim.f90
@@ -54,7 +54,7 @@ program q65sim
   else if(ntrperiod.eq.30) then
      nsps=3600
   else if(ntrperiod.eq.60) then
-     nsps=7680
+     nsps=7200
   else if(ntrperiod.eq.120) then
      nsps=16000
   else if(ntrperiod.eq.300) then
diff --git a/lib/qra_loops.f90 b/lib/qra_loops.f90
index c2155aeba..de58263de 100644
--- a/lib/qra_loops.f90
+++ b/lib/qra_loops.f90
@@ -118,7 +118,7 @@ subroutine qra_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel,   &
      ndist=ndistx
   endif
 
-200 if(mode.eq.65 .and. nsps.eq.7680/2) xdt=xdt+0.4 !### Empirical -- WHY ??? ###
+200 if(mode.eq.65 .and. nsps.eq.7200/2) xdt=xdt+0.4 !### Empirical -- WHY ??? ###
 
   if(irc.ge.0) then
      navg=nsave
diff --git a/lib/test_q65.f90 b/lib/test_q65.f90
index c56fa0bab..ead15b013 100644
--- a/lib/test_q65.f90
+++ b/lib/test_q65.f90
@@ -38,7 +38,7 @@ program test_q65
      nsps=3600
      i50=-24
   else if(ntrperiod.eq.60) then
-     nsps=7680
+     nsps=7200
      i50=-28
   else if(ntrperiod.eq.120) then
      nsps=16000
diff --git a/lib/test_qra64.f90 b/lib/test_qra64.f90
index 24f54c2d6..632dbdf66 100644
--- a/lib/test_qra64.f90
+++ b/lib/test_qra64.f90
@@ -31,7 +31,7 @@ program test_qra64
   call getarg(9,arg)
   read(arg,*) nsnr
 
-  nsps=7680
+  nsps=6192
   i50=-28
   ia=-20
   ib=-33
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index f835e9f31..231e9efa9 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3730,7 +3730,7 @@ void MainWindow::guiUpdate()
   if(m_modeTx=="Q65")  {                                    // Q65
     if(m_TRperiod==15) txDuration=0.5 + 85*1800/12000.0;
     if(m_TRperiod==30) txDuration=0.5 + 85*3600/12000.0;
-    if(m_TRperiod==60) txDuration=1.0 + 85*7680/12000.0;
+    if(m_TRperiod==60) txDuration=1.0 + 85*7200/12000.0;
     if(m_TRperiod==120) txDuration=1.0 + 85*16000/12000.0;
     if(m_TRperiod==300) txDuration=1.0 + 85*41472/12000.0;
   }
@@ -7315,7 +7315,7 @@ void MainWindow::transmit (double snr)
   if (m_modeTx == "Q65") {
     int nsps=1800;
     if(m_TRperiod==30) nsps=3600;
-    if(m_TRperiod==60) nsps=7680;
+    if(m_TRperiod==60) nsps=7200;
     if(m_TRperiod==120) nsps=16000;
     if(m_TRperiod==300) nsps=41472;
     int mode65=pow(2.0,double(m_nSubMode));
diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp
index 888ae8619..b813978b5 100644
--- a/widgets/plotter.cpp
+++ b/widgets/plotter.cpp
@@ -475,7 +475,7 @@ void CPlotter::DrawOverlay()                   //DrawOverlay()
     int h=int(pow(2.0,m_nSubMode));
     int nsps=1800;
     if(m_TRperiod==30) nsps=3600;
-    if(m_TRperiod==60) nsps=7680;
+    if(m_TRperiod==60) nsps=7200;
     if(m_TRperiod==120) nsps=16000;
     if(m_TRperiod==300) nsps=41472;
     float baud=12000.0/nsps;