From 001f4ee23b715b460c1993db2f3c86060437ef82 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 18 Nov 2015 23:06:21 -0500 Subject: [PATCH] Add digital modem factories --- src/CubicSDR.cpp | 13 ++++++++++++- src/CubicSDR.h | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp index 0bf2432..5b05f19 100644 --- a/src/CubicSDR.cpp +++ b/src/CubicSDR.cpp @@ -171,7 +171,18 @@ bool CubicSDR::OnInit() { Modem::addModemFactory("USB", new ModemUSB); Modem::addModemFactory("DSB", new ModemDSB); Modem::addModemFactory("I/Q", new ModemIQ); - + + Modem::addModemFactory("APSK", new ModemAPSK); + Modem::addModemFactory("ASK", new ModemASK); + Modem::addModemFactory("BPSK", new ModemBPSK); + Modem::addModemFactory("DPSK", new ModemDPSK); + Modem::addModemFactory("OOK", new ModemOOK); + Modem::addModemFactory("PSK", new ModemPSK); + Modem::addModemFactory("QAM", new ModemQAM); + Modem::addModemFactory("QPSK", new ModemQPSK); + Modem::addModemFactory("SQAM", new ModemSQAM); + Modem::addModemFactory("ST", new ModemST); + frequency = wxGetApp().getConfig()->getCenterFreq(); offset = 0; ppm = 0; diff --git a/src/CubicSDR.h b/src/CubicSDR.h index 0253624..54bb4b0 100644 --- a/src/CubicSDR.h +++ b/src/CubicSDR.h @@ -28,6 +28,7 @@ #include "SpectrumVisualDataThread.h" #include "SDRDevices.h" #include "Modem.h" + #include "ModemFM.h" #include "ModemFMStereo.h" #include "ModemAM.h" @@ -36,6 +37,17 @@ #include "ModemDSB.h" #include "ModemIQ.h" +#include "ModemAPSK.h" +#include "ModemASK.h" +#include "ModemBPSK.h" +#include "ModemDPSK.h" +#include "ModemOOK.h" +#include "ModemPSK.h" +#include "ModemQAM.h" +#include "ModemQPSK.h" +#include "ModemSQAM.h" +#include "ModemST.h" + #include #define NUM_DEMODULATORS 1