Add test harness script

airframesio · Jan 22, 2025 · 188d8c4 · 188d8c4
1 parent 4af24c8
commit 188d8c4
Show file tree

Hide file tree

Showing 10 changed files with 180 additions and 239 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,4 +20,3 @@ find_file(COMMON_LOGGER_SOURCE_FILE logger.cpp ${COMMON_INCLUDE_DIR})
 
 add_subdirectory(decode)
 add_subdirectory(publish)
-add_subdirectory(audio-src)
diff --git a/audio-src/CMakeLists.txt b/audio-src/CMakeLists.txt
diff --git a/audio-src/main.cpp b/audio-src/main.cpp
diff --git a/audio-src/sink.cpp b/audio-src/sink.cpp
diff --git a/audio-src/sink.h b/audio-src/sink.h
diff --git a/common/notifier.cpp b/common/notifier.cpp
@@ -1,7 +1,7 @@
 #include <QDebug>
+#include <QSocketNotifier>
 
 #include <csignal>
-#include <qsocketnotifier.h>
 #include <sys/socket.h>
 #include <unistd.h>
 

diff --git a/decode/decode.cpp b/decode/decode.cpp
@@ -109,13 +109,14 @@ Decoder::Decoder(const QString &station_id, const QString &publisher,
     if (burstMode) {
       DBG("Connecting audioReceived signal to burst OQPSK demodulator");
 
+      hunter->disable();
       connect(this, SIGNAL(audioReceived(const QByteArray &, quint32)),
               burstOqpskDemod, SLOT(dataReceived(const QByteArray &, quint32)));
       connect(burstOqpskDemod,
               SIGNAL(processDemodulatedSoftBits(const QVector<short> &)), aerol,
               SLOT(processDemodulatedSoftBits(const QVector<short> &)));
       connect(burstOqpskDemod, SIGNAL(SignalStatus(bool)), hunter,
-              SLOT(updatesSignalStatus(bool)));
+              SLOT(updatedSignalStatus(bool)));
       connect(hunter, SIGNAL(newFreqCenter(double)), burstOqpskDemod,
               SLOT(CenterFreqChangedSlot(double)));
     } else {
@@ -137,13 +138,14 @@ Decoder::Decoder(const QString &station_id, const QString &publisher,
     if (burstMode) {
       DBG("Connecting audioReceived signal to burst MSK demodulator");
 
-      connect(this, SIGNAL(audioReceived(const QByteArrau &, quint32)),
+      hunter->disable();
+      connect(this, SIGNAL(audioReceived(const QByteArray &, quint32)),
               burstMskDemod, SLOT(dataReceived(const QByteArray &, quint32)));
       connect(burstMskDemod,
               SIGNAL(processDemodulatedSoftBits(const QVector<short> &)), aerol,
               SLOT(processDemodulatedSoftBits(const QVector<short> &)));
       connect(burstMskDemod, SIGNAL(SignalStatus(bool)), hunter,
-              SLOT(updateSingalStatus(bool)));
+              SLOT(updatedSignalStatus(bool)));
       connect(hunter, SIGNAL(newFreqCenter(double)), burstMskDemod,
               SLOT(CenterFreqChangedSlot(double)));
     } else {

diff --git a/decode/hunter.cpp b/decode/hunter.cpp
@@ -18,6 +18,8 @@ void SignalHunter::handleDcd(bool dcd) {
 }
 
 void SignalHunter::updatedSignalStatus(bool gotasignal) {
+  if (!enabled) return;
+
   if (gotasignal) {
     iterationsSinceSignal = 0;
   } else {

diff --git a/decode/hunter.h b/decode/hunter.h
@@ -10,6 +10,9 @@ class SignalHunter : public QObject {
   SignalHunter(quint32 maxTries, QObject *parent = nullptr);
   ~SignalHunter();
 
+  void enable() { enabled = true; }
+  void disable() { enabled = false; }
+
   void setParams(quint32 minFreq, quint32 maxFreq, quint32 bandwidth) {
     this->minFreq = minFreq;
     this->maxFreq = maxFreq;
@@ -21,6 +24,7 @@ public slots:
   void handleDcd(bool dcd);
 
 private:
+  bool enabled;
   bool lastDcd;
 
   quint32 maxTries;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ find_file(COMMON_LOGGER_SOURCE_FILE logger.cpp ${COMMON_INCLUDE_DIR})

		add_subdirectory(decode)
		add_subdirectory(publish)
		add_subdirectory(audio-src)