From 854cf81f36020e4e3bd725788a28b79a63a7c5a1 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Tue, 29 Oct 2019 21:55:43 -0400
Subject: [PATCH] Working decoder processing signal every second

---
 Detector.hpp   |  1 +
 mainwindow.cpp | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Detector.hpp b/Detector.hpp
index d5e5b0a..91cf5ae 100644
--- a/Detector.hpp
+++ b/Detector.hpp
@@ -24,6 +24,7 @@ public:
   //
   Detector (unsigned frameRate, unsigned periodLengthInSeconds, unsigned downSampleFactor = 4u, QObject * parent = 0);
 
+  unsigned period() const {return m_period;}
   void setTRPeriod(unsigned p) {m_period=p;}
   bool reset () override;
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ac1a63d..c568c9c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2561,12 +2561,13 @@ void MainWindow::dataSink(qint64 frames)
     qint32 halfSymbolStop = m_hsymStop;
     bool newDataReady = m_ihsym % m_hsymStop == 0;
 
-#if 0
+#if 1
     static int lastn = 0;
     int n = now.time().second();
-    // newDataReady = n != lastn;
-    // lastn = n;
-#elif 1
+    newDataReady = n != lastn;
+    dec_data.params.nsz = halfSymbolStop * m_nsps / 2.0;
+    lastn = n;
+#elif 0
     newDataReady = false;
 
     if(!m_decoderBusy) // m_nSubMode == Varicode::JS8CallNormal)
@@ -4074,13 +4075,23 @@ void MainWindow::decode(int submode, int period)
       qDebug() << "try decode from" << (dec_data.params.kin-periodFrames) << "to" << dec_data.params.kin << "with period frames" << periodFrames;
   }
 #elif 1
+  // clear out d1
+  memset(dec_data.d1, 0, sizeof(dec_data.d1));
+
+  // compute frames to copy for decoding
   int neededFrames = dec_data.params.nsz; // m_hsymStop*m_nsps/2;
   int start = qMax(0, dec_data.params.kin-neededFrames);
   int stop =  qMin(start + neededFrames, dec_data.params.kin);
   int availableFrames = stop - start;
   int missingFrames = neededFrames - availableFrames;
+
   qDebug() << "try decode from" << start << "to" << stop << "available" << availableFrames << "missing" << missingFrames;
-  memset(dec_data.d1, 0, sizeof(dec_data.d1));
+  if(missingFrames){
+      // the maximum frame is the period sample size
+      int maxFrames = m_detector->period() * RX_SAMPLE_RATE;
+      qDebug() << "-> copy missing frames from" << maxFrames-missingFrames << "to" << maxFrames << "to beginning of d1";
+      memcpy(dec_data.d1, &dec_data.d2[maxFrames-missingFrames], sizeof(dec_data.d2[0]) * missingFrames);
+  }
   memcpy(dec_data.d1 + missingFrames, dec_data.d2 + start, sizeof(dec_data.d2[0]) * availableFrames);
 #else
   qDebug() << "try decode from" << 0 << "to" << dec_data.params.kin;
@@ -5308,10 +5319,13 @@ void MainWindow::guiUpdate()
     bool forceDirty = false;
     if(m_sec0 % (m_TRperiod-2) == 0 ||
        m_sec0 % (m_TRperiod) == 0   ||
-       m_sec0 % (m_TRperiod+2) == 0 ){
+       m_sec0 % (m_TRperiod+2) == 0){
         // force rx dirty at the end of the period
         forceDirty = true;
     }
+    if(!forceDirty){
+        forceDirty = !m_rxActivityQueue.isEmpty();
+    }
 
     // update the dial frequency once per second..
     displayDialFrequency();