Add GMSK, fix modem bandwidth logic, cleanup.

CMakeLists.txt

@@ -297,6 +297,7 @@ IF(ENABLE_DIGITAL_LAB)
         src/modules/modem/digital/ModemBPSK.cpp
         src/modules/modem/digital/ModemDPSK.cpp
         src/modules/modem/digital/ModemFSK.cpp
+        src/modules/modem/digital/ModemGMSK.cpp
         src/modules/modem/digital/ModemPSK.cpp
         src/modules/modem/digital/ModemOOK.cpp
         src/modules/modem/digital/ModemST.cpp
@@ -402,6 +403,7 @@ SET (cubicsdr_headers
     src/modules/modem/digital/ModemBPSK.h
     src/modules/modem/digital/ModemDPSK.h
     src/modules/modem/digital/ModemFSK.h
+    src/modules/modem/digital/ModemGMSK.h
     src/modules/modem/digital/ModemPSK.h
     src/modules/modem/digital/ModemOOK.h
     src/modules/modem/digital/ModemST.h

src/AppFrame.cpp

@@ -67,13 +67,13 @@ AppFrame::AppFrame() :
     gainSpacerItem->Show(false);
             
     demodModeSelector = new ModeSelectorCanvas(demodPanel, attribList);
-    demodModeSelector->addChoice(0, "FM");
+    demodModeSelector->addChoice("FM");
-    demodModeSelector->addChoice(1, "FMS");
+    demodModeSelector->addChoice("FMS");
-    demodModeSelector->addChoice(2, "AM");
+    demodModeSelector->addChoice("AM");
-    demodModeSelector->addChoice(3, "LSB");
+    demodModeSelector->addChoice("LSB");
-    demodModeSelector->addChoice(4, "USB");
+    demodModeSelector->addChoice("USB");
-    demodModeSelector->addChoice(5, "DSB");
+    demodModeSelector->addChoice("DSB");
-    demodModeSelector->addChoice(6, "I/Q");
+    demodModeSelector->addChoice("I/Q");
     demodModeSelector->setSelection("FM");
     demodModeSelector->setHelpTip("Choose modulation type: Frequency Modulation, Amplitude Modulation and Lower, Upper or Double Side-Band.");
     demodModeSelector->SetMinSize(wxSize(40,-1));
@@ -82,17 +82,18 @@ AppFrame::AppFrame() :
     
 #ifdef ENABLE_DIGITAL_LAB
     demodModeSelectorAdv = new ModeSelectorCanvas(demodPanel, attribList);
-    demodModeSelectorAdv->addChoice(0, "ASK");
+    demodModeSelectorAdv->addChoice("ASK");
-    demodModeSelectorAdv->addChoice(1, "APSK");
+    demodModeSelectorAdv->addChoice("APSK");
-    demodModeSelectorAdv->addChoice(2, "BPSK");
+    demodModeSelectorAdv->addChoice("BPSK");
-    demodModeSelectorAdv->addChoice(3, "DPSK");
+    demodModeSelectorAdv->addChoice("DPSK");
-    demodModeSelectorAdv->addChoice(4, "PSK");
+    demodModeSelectorAdv->addChoice("PSK");
-    demodModeSelectorAdv->addChoice(5, "FSK");
+    demodModeSelectorAdv->addChoice("FSK");
-    demodModeSelectorAdv->addChoice(6, "OOK");
+    demodModeSelectorAdv->addChoice("GMSK");
-    demodModeSelectorAdv->addChoice(7, "ST");
+    demodModeSelectorAdv->addChoice("OOK");
-    demodModeSelectorAdv->addChoice(8, "SQAM");
+    demodModeSelectorAdv->addChoice("ST");
-    demodModeSelectorAdv->addChoice(9, "QAM");
+    demodModeSelectorAdv->addChoice("SQAM");
-    demodModeSelectorAdv->addChoice(10, "QPSK");
+    demodModeSelectorAdv->addChoice("QAM");
+    demodModeSelectorAdv->addChoice("QPSK");
     demodModeSelectorAdv->setHelpTip("Choose advanced modulation types.");
     demodModeSelectorAdv->SetMinSize(wxSize(40,-1));
     demodModeSelectorAdv->SetMaxSize(wxSize(40,-1));
@@ -906,25 +907,16 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
             if (dSelection != "" && dSelection != demod->getDemodulatorType()) {
                 demod->setDemodulatorType(dSelection);
                 demodModeSelectorAdv->setSelection(-1);
-                if (int lastDemodBw = wxGetApp().getDemodMgr().getLastBandwidth(dSelection)) {
-                    demod->setBandwidth(lastDemodBw);
-                }
             }
             // advanced demodulators
 			else if (dSelectionadv != "" && dSelectionadv != demod->getDemodulatorType()) {
 				demod->setDemodulatorType(dSelectionadv);
 				demodModeSelector->setSelection(-1);
-                if (int lastDemodBw = wxGetApp().getDemodMgr().getLastBandwidth(dSelection)) {
-                    demod->setBandwidth(lastDemodBw);
-                }
             }
 #else
             // basic demodulators
             if (dSelection != "" && dSelection != demod->getDemodulatorType()) {
                 demod->setDemodulatorType(dSelection);
-                if (int lastDemodBw = wxGetApp().getDemodMgr().getLastBandwidth(dSelection)) {
-                    demod->setBandwidth(lastDemodBw);
-                }
             }
 #endif
 
@@ -1017,7 +1009,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
         if (!demodTuner->HasFocus()) {
             demodTuner->SetFocus();
         }
-    } else if (!wxGetApp().isDeviceSelectorOpen()) {
+    } else if (!wxGetApp().isDeviceSelectorOpen() && (!modemProps || !modemProps->isMouseInView())) {
 		if (!waterfallCanvas->HasFocus()) {
 			waterfallCanvas->SetFocus();
 		}

src/CubicSDR.cpp

@@ -178,6 +178,7 @@ bool CubicSDR::OnInit() {
     Modem::addModemFactory(new ModemBPSK);
     Modem::addModemFactory(new ModemDPSK);
     Modem::addModemFactory(new ModemFSK);
+    Modem::addModemFactory(new ModemGMSK);
     Modem::addModemFactory(new ModemOOK);
     Modem::addModemFactory(new ModemPSK);
     Modem::addModemFactory(new ModemQAM);

src/CubicSDR.h

@@ -43,6 +43,7 @@
 #include "ModemBPSK.h"
 #include "ModemDPSK.h"
 #include "ModemFSK.h"
+#include "ModemGMSK.h"
 #include "ModemOOK.h"
 #include "ModemPSK.h"
 #include "ModemQAM.h"

src/ModemProperties.cpp

@@ -14,10 +14,14 @@ ModemProperties::ModemProperties(wxWindow *parent, wxWindowID winid,
     
     m_propertyGrid->Connect( wxEVT_PG_CHANGED, wxPropertyGridEventHandler( ModemProperties::OnChange ), NULL, this );
     this->Connect( wxEVT_SHOW, wxShowEventHandler( ModemProperties::OnShow ), NULL, this );
+    
+    this->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( ModemProperties::OnMouseEnter ), NULL, this);
+    this->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( ModemProperties::OnMouseLeave ), NULL, this);
+    
+    mouseInView = false;
 }
 
 void ModemProperties::OnShow(wxShowEvent &event) {
-    m_propertyGrid->FitColumns();
 }
 
 ModemProperties::~ModemProperties() {
@@ -27,6 +31,7 @@ ModemProperties::~ModemProperties() {
 void ModemProperties::initProperties(ModemArgInfoList newArgs) {
     args = newArgs;
 
+    bSizer->Layout();
     m_propertyGrid->Clear();
 
     if (newArgs.size() == 0) {
@@ -35,9 +40,6 @@ void ModemProperties::initProperties(ModemArgInfoList newArgs) {
     } else {
         Show();
     }
-
-    bSizer->Layout();
-    Layout();
     
     m_propertyGrid->Append(new wxPropertyCategory("Modem Settings"));
     
@@ -149,6 +151,10 @@ std::string ModemProperties::readProperty(std::string key) {
 void ModemProperties::OnChange(wxPropertyGridEvent &event) {
     DemodulatorInstance *inst = wxGetApp().getDemodMgr().getLastActiveDemodulator();
     
+    if (!inst) {
+        return;
+    }
+    
     std::map<std::string, wxPGProperty *>::const_iterator prop_i;
     for (prop_i = props.begin(); prop_i != props.end(); prop_i++) {
         if (prop_i->second == event.m_property) {
@@ -159,3 +165,15 @@ void ModemProperties::OnChange(wxPropertyGridEvent &event) {
         }
     }
 }
+
+void ModemProperties::OnMouseEnter(wxMouseEvent &event) {
+    mouseInView = true;
+}
+
+void ModemProperties::OnMouseLeave(wxMouseEvent &event) {
+    mouseInView = false;
+}
+
+bool ModemProperties::isMouseInView() {
+    return mouseInView;
+}

src/ModemProperties.h

@@ -20,15 +20,20 @@ public:
     ~ModemProperties();
     
     void initProperties(ModemArgInfoList newArgs);
+    bool isMouseInView();
 
 private:
     wxPGProperty *addArgInfoProperty(wxPropertyGrid *pg, ModemArgInfo arg);
     std::string readProperty(std::string);
     void OnChange(wxPropertyGridEvent &event);
     void OnShow(wxShowEvent &event);
+
+    void OnMouseEnter(wxMouseEvent &event);
+    void OnMouseLeave(wxMouseEvent &event);
     
     wxBoxSizer* bSizer;
     wxPropertyGrid* m_propertyGrid;
     ModemArgInfoList args;
     std::map<std::string, wxPGProperty *> props;
+    bool mouseInView;
 };

src/demod/DemodulatorInstance.cpp

@@ -264,13 +264,25 @@ void DemodulatorInstance::setDemodulatorType(std::string demod_type_in) {
         std::string currentDemodType = demodulatorPreThread->getDemodType();
         if ((currentDemodType != "") && (currentDemodType != demod_type_in)) {
             lastModemSettings[currentDemodType] = demodulatorPreThread->readModemSettings();
+            lastModemBandwidth[currentDemodType] = demodulatorPreThread->getBandwidth();
         }
 #if ENABLE_DIGITAL_LAB
         if (activeOutput) {
             activeOutput->Hide();
         }
 #endif
+
         demodulatorPreThread->setDemodType(demod_type_in);
+        int lastbw = 0;
+        if (currentDemodType != "" && lastModemBandwidth.find(demod_type_in) != lastModemBandwidth.end()) {
+            lastbw = lastModemBandwidth[demod_type_in];
+        }
+        if (!lastbw) {
+            lastbw = Modem::getModemDefaultSampleRate(demod_type_in);
+        }
+        if (lastbw) {
+            setBandwidth(lastbw);
+        }
     }
 }
 
@@ -297,7 +309,6 @@ int DemodulatorInstance::getDemodulatorLock() {
 
 void DemodulatorInstance::setBandwidth(int bw) {
     demodulatorPreThread->setBandwidth(bw);
-    wxGetApp().getDemodMgr().setLastBandwidth(bw);
 }
 
 int DemodulatorInstance::getBandwidth() {

src/demod/DemodulatorInstance.h

@@ -127,6 +127,7 @@ private:
     std::atomic<float> currentAudioGain;
     std::atomic_bool follow, tracking;
     std::map<std::string, ModemSettings> lastModemSettings;
+    std::map<std::string, int> lastModemBandwidth;
 #if ENABLE_DIGITAL_LAB
     ModemDigitalOutput *activeOutput;
 #endif

src/demod/DemodulatorMgr.cpp

@@ -8,13 +8,6 @@
 DemodulatorMgr::DemodulatorMgr() :
         activeDemodulator(NULL), lastActiveDemodulator(NULL), activeVisualDemodulator(NULL), lastBandwidth(DEFAULT_DEMOD_BW), lastDemodType(
                 DEFAULT_DEMOD_TYPE), lastSquelchEnabled(false), lastSquelch(-100), lastGain(1.0), lastMuted(false) {
-    setLastBandwidth("FM",200000);
-    setLastBandwidth("FMS",200000);
-    setLastBandwidth("AM",6000);
-    setLastBandwidth("USB",5400);
-    setLastBandwidth("LSB",5400);
-    setLastBandwidth("DSB",5400);
-    setLastBandwidth("IQ",48000);
 }
 
 DemodulatorMgr::~DemodulatorMgr() {
@@ -171,7 +164,6 @@ void DemodulatorMgr::updateLastState() {
         lastSquelch = lastActiveDemodulator->getSquelchLevel();
         lastGain = lastActiveDemodulator->getGain();
         lastModemSettings[lastDemodType] = lastActiveDemodulator->readModemSettings();
-        lastBandwidthNamed[lastDemodType] = lastBandwidth;
     }
 
 }
@@ -236,10 +228,3 @@ ModemSettings DemodulatorMgr::getLastModemSettings(std::string modemType) {
 void DemodulatorMgr::setLastModemSettings(std::string modemType, ModemSettings settings) {
     lastModemSettings[modemType] = settings;
 }
-
-int DemodulatorMgr::getLastBandwidth(std::string modemType) {
-    return lastBandwidthNamed[modemType];
-}
-void DemodulatorMgr::setLastBandwidth(std::string modemType, int lastBandwidth_in) {
-    lastBandwidthNamed[modemType] = lastBandwidth_in;
-}

src/demod/DemodulatorMgr.h

@@ -25,9 +25,6 @@ public:
     int getLastBandwidth() const;
     void setLastBandwidth(int lastBandwidth);
 
-    int getLastBandwidth(std::string modemType);
-    void setLastBandwidth(std::string modemType, int lastBandwidth);
-
     std::string getLastDemodulatorType() const;
     void setLastDemodulatorType(std::string lastDemodType);
 
@@ -57,7 +54,6 @@ private:
     DemodulatorInstance *lastActiveDemodulator;
     DemodulatorInstance *activeVisualDemodulator;
 
-    std::map<std::string, int> lastBandwidthNamed;
     int lastBandwidth;
     std::string lastDemodType;
     bool lastDemodLock;

src/modules/modem/Modem.cpp

@@ -1,4 +1,6 @@
 #include "Modem.h"
+#include "CubicSDR.h"
+
 
 ModemFactoryList Modem::modemFactories;
 
@@ -52,12 +54,24 @@ Modem *Modem::makeModem(std::string modemName) {
     return nullptr;
 }
 
+int Modem::getModemDefaultSampleRate(std::string modemName) {
+    if (modemFactories.find(modemName) != modemFactories.end()) {
+        return modemFactories[modemName]->getDefaultSampleRate();
+    }
+    
+    return 0;
+}
+
 ModemArgInfoList Modem::getSettings() {
     ModemArgInfoList args;
     
     return args;
 }
 
+int Modem::getDefaultSampleRate() {
+    return 200000;
+}
+
 void Modem::writeSetting(std::string setting, std::string value) {
     // ...
 }

src/modules/modem/Modem.h

@@ -113,6 +113,7 @@ public:
     static ModemFactoryList getFactories();
     
     static Modem *makeModem(std::string modemName);
+    static int getModemDefaultSampleRate(std::string modemName);
     
     virtual std::string getType() = 0;
     virtual std::string getName() = 0;
@@ -123,6 +124,7 @@ public:
     virtual ~Modem();
     
     virtual ModemArgInfoList getSettings();
+    virtual int getDefaultSampleRate();
     virtual void writeSetting(std::string setting, std::string value);
     virtual void writeSettings(ModemSettings settings);
     virtual std::string readSetting(std::string setting);

src/modules/modem/analog/ModemAM.cpp

@@ -4,6 +4,10 @@ ModemAM::ModemAM() : ModemAnalog() {
     demodAM = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 0);
 }
 
+ModemAM::~ModemAM() {
+    ampmodem_destroy(demodAM);
+}
+
 Modem *ModemAM::factory() {
     return new ModemAM;
 }
@@ -12,6 +16,10 @@ std::string ModemAM::getName() {
     return "AM";
 }
 
+int ModemAM::getDefaultSampleRate() {
+    return 6000;
+}
+
 void ModemAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
     ModemKitAnalog *amkit = (ModemKitAnalog *)kit;
     

src/modules/modem/analog/ModemAM.h

@@ -5,8 +5,14 @@
 class ModemAM : public ModemAnalog {
 public:
     ModemAM();
+    ~ModemAM();
+    
     std::string getName();
+    
     Modem *factory();
+    
+    int getDefaultSampleRate();
+
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
     
 private:

src/modules/modem/analog/ModemDSB.cpp

@@ -4,6 +4,10 @@ ModemDSB::ModemDSB() : ModemAnalog() {
     demodAM_DSB = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 1);
 }
 
+ModemDSB::~ModemDSB() {
+    ampmodem_destroy(demodAM_DSB);
+}
+
 Modem *ModemDSB::factory() {
     return new ModemDSB;
 }
@@ -12,6 +16,10 @@ std::string ModemDSB::getName() {
     return "DSB";
 }
 
+int ModemDSB::getDefaultSampleRate() {
+    return 5400;
+}
+
 void ModemDSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
     ModemKitAnalog *amkit = (ModemKitAnalog *)kit;
 

src/modules/modem/analog/ModemDSB.h

@@ -5,8 +5,14 @@
 class ModemDSB : public ModemAnalog {
 public:
     ModemDSB();
+    ~ModemDSB();
+    
     std::string getName();
+    
     Modem *factory();
+    
+    int getDefaultSampleRate();
+
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
     
 private:

src/modules/modem/analog/ModemFM.cpp

@@ -4,6 +4,10 @@ ModemFM::ModemFM() : ModemAnalog() {
     demodFM = freqdem_create(0.5);
 }
 
+ModemFM::~ModemFM() {
+    freqdem_destroy(demodFM);
+}
+
 Modem *ModemFM::factory() {
     return new ModemFM;
 }
@@ -12,6 +16,10 @@ std::string ModemFM::getName() {
     return "FM";
 }
 
+int ModemFM::getDefaultSampleRate() {
+    return 200000;
+}
+
 void ModemFM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
     ModemKitAnalog *fmkit = (ModemKitAnalog *)kit;
     

src/modules/modem/analog/ModemFM.h

@@ -5,11 +5,16 @@
 class ModemFM : public ModemAnalog {
 public:
     ModemFM();
+    ~ModemFM();
+    
     std::string getName();
+    
     Modem *factory();
+
+    int getDefaultSampleRate();
+
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
 
 private:
- 
     freqdem demodFM;
 };

src/modules/modem/analog/ModemFMStereo.cpp

@@ -40,6 +40,10 @@ int ModemFMStereo::checkSampleRate(long long sampleRate, int audioSampleRate) {
     }
 }
 
+int ModemFMStereo::getDefaultSampleRate() {
+    return 200000;
+}
+
 ModemKit *ModemFMStereo::buildKit(long long sampleRate, int audioSampleRate) {
     ModemKitFMStereo *kit = new ModemKitFMStereo;
     

src/modules/modem/analog/ModemFMStereo.h

@@ -27,6 +27,7 @@ public:
     Modem *factory();
     
     int checkSampleRate(long long sampleRate, int audioSampleRate);
+    int getDefaultSampleRate();
     
     ModemKit *buildKit(long long sampleRate, int audioSampleRate);
     void disposeKit(ModemKit *kit);

src/modules/modem/analog/ModemIQ.cpp

@@ -4,6 +4,14 @@ ModemIQ::ModemIQ() {
     
 }
 
+std::string ModemIQ::getType() {
+    return "analog";
+}
+
+std::string ModemIQ::getName() {
+    return "I/Q";
+}
+
 Modem *ModemIQ::factory() {
     return new ModemIQ;
 }
@@ -15,14 +23,6 @@ ModemKit *ModemIQ::buildKit(long long sampleRate, int audioSampleRate) {
     return kit;
 }
 
-std::string ModemIQ::getType() {
-    return "analog";
-}
-
-std::string ModemIQ::getName() {
-    return "I/Q";
-}
-
 void ModemIQ::disposeKit(ModemKit *kit) {
     delete kit;
 }
@@ -31,6 +31,10 @@ int ModemIQ::checkSampleRate(long long sampleRate, int audioSampleRate) {
     return audioSampleRate;
 }
 
+int ModemIQ::getDefaultSampleRate() {
+    return 48000;
+}
+
 void ModemIQ::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
     int bufSize = input->data.size();
     

src/modules/modem/analog/ModemIQ.h

@@ -4,12 +4,19 @@
 class ModemIQ : public Modem {
 public:
     ModemIQ();
+
     std::string getType();
     std::string getName();
+    
     Modem *factory();
-    ModemKit *buildKit(long long sampleRate, int audioSampleRate);
+
     int checkSampleRate(long long sampleRate, int audioSampleRate);
+    int getDefaultSampleRate();
+
+    ModemKit *buildKit(long long sampleRate, int audioSampleRate);
+
     void disposeKit(ModemKit *kit);
+    
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
     
 private:

src/modules/modem/analog/ModemLSB.cpp

@@ -29,6 +29,10 @@ int ModemLSB::checkSampleRate(long long sampleRate, int audioSampleRate) {
     return sampleRate+1;
 }
 
+int ModemLSB::getDefaultSampleRate() {
+    return 5400;
+}
+
 void ModemLSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
     ModemKitAnalog *akit = (ModemKitAnalog *)kit;
     

src/modules/modem/analog/ModemLSB.h

@@ -1,14 +1,18 @@
 #pragma once
-#include "Modem.h"
 #include "ModemAnalog.h"
 
 class ModemLSB : public ModemAnalog {
 public:
     ModemLSB();
     ~ModemLSB();
+    
     std::string getName();
+    
     Modem *factory();
+    
     int checkSampleRate(long long sampleRate, int audioSampleRate);
+    int getDefaultSampleRate();
+
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
     
 private:

src/modules/modem/analog/ModemUSB.cpp

@@ -29,6 +29,10 @@ int ModemUSB::checkSampleRate(long long sampleRate, int audioSampleRate) {
     return sampleRate+1;
 }
 
+int ModemUSB::getDefaultSampleRate() {
+    return 5400;
+}
+
 void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
     ModemKitAnalog *akit = (ModemKitAnalog *)kit;
     

src/modules/modem/analog/ModemUSB.h

@@ -5,9 +5,14 @@ class ModemUSB : public ModemAnalog {
 public:
     ModemUSB();
     ~ModemUSB();
+    
     std::string getName();
+    
     Modem *factory();
+    
     int checkSampleRate(long long sampleRate, int audioSampleRate);
+    int getDefaultSampleRate();
+
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
     
 private:

src/modules/modem/digital/ModemFSK.cpp

@@ -22,6 +22,10 @@ int ModemFSK::checkSampleRate(long long sampleRate, int audioSampleRate) {
     }
 }
 
+int ModemFSK::getDefaultSampleRate() {
+    return 19200;
+}
+
 ModemArgInfoList ModemFSK::getSettings() {
     ModemArgInfoList args;
     

src/modules/modem/digital/ModemFSK.h

@@ -21,6 +21,7 @@ public:
     Modem *factory();
     
     int checkSampleRate(long long sampleRate, int audioSampleRate);
+    int getDefaultSampleRate();
 
     ModemArgInfoList getSettings();
     void writeSetting(std::string setting, std::string value);

src/modules/modem/digital/ModemGMSK.cpp

@@ -0,0 +1,133 @@
+#include "ModemGMSK.h"
+#include <iomanip>
+
+ModemGMSK::ModemGMSK() : ModemDigital()  {
+    _sps = 4;
+    _fdelay = 3;
+    _ebf = 0.3;
+    outStream << std::hex;
+}
+
+ModemGMSK::~ModemGMSK() {
+    
+}
+
+std::string ModemGMSK::getName() {
+    return "GMSK";
+}
+
+Modem *ModemGMSK::factory() {
+    return new ModemGMSK;
+}
+
+int ModemGMSK::checkSampleRate(long long sampleRate, int audioSampleRate) {
+    if (sampleRate < 1500) {
+        return 1500;
+    }
+    return sampleRate;
+}
+
+int ModemGMSK::getDefaultSampleRate() {
+    return 19200;
+}
+
+ModemArgInfoList ModemGMSK::getSettings() {
+    ModemArgInfoList args;
+    
+    ModemArgInfo fdelayArg;
+    fdelayArg.key = "fdelay";
+    fdelayArg.name = "Filter delay";
+    fdelayArg.value = std::to_string(_fdelay);
+    fdelayArg.description = "Filter delay in samples";
+    fdelayArg.type = ModemArgInfo::INT;
+    fdelayArg.units = "samples";
+    fdelayArg.range = ModemRange(1,128);
+    args.push_back(fdelayArg);
+    
+    ModemArgInfo spsArg;
+    spsArg.key = "sps";
+    spsArg.name = "Samples / symbol";
+    spsArg.value = std::to_string(_sps);
+    spsArg.description = "Modem samples-per-symbol";
+    spsArg.type = ModemArgInfo::INT;
+    spsArg.units = "samples/symbol";
+    spsArg.range = ModemRange(2,512);
+    args.push_back(spsArg);
+    
+    ModemArgInfo ebfArg;
+    ebfArg.key = "ebf";
+    ebfArg.name = "Excess bandwidth";
+    ebfArg.value = std::to_string(_ebf);
+    ebfArg.description = "Modem excess bandwidth factor";
+    ebfArg.type = ModemArgInfo::FLOAT;
+    ebfArg.range = ModemRange(0.1,0.49);
+    args.push_back(ebfArg);
+
+    return args;
+}
+
+void ModemGMSK::writeSetting(std::string setting, std::string value) {
+    if (setting == "fdelay") {
+        _fdelay = std::stoi(value);
+        rebuildKit();
+    } else if (setting == "sps") {
+        _sps = std::stoi(value);
+        rebuildKit();
+    } else if (setting == "ebf") {
+        _ebf = std::stof(value);
+        rebuildKit();
+    }
+}
+
+std::string ModemGMSK::readSetting(std::string setting) {
+    if (setting == "fdelay") {
+        return std::to_string(_fdelay);
+    } else if (setting == "sps") {
+        return std::to_string(_sps);
+    } else if (setting == "ebf") {
+        return std::to_string(_ebf);
+    }
+    return "";
+}
+
+ModemKit *ModemGMSK::buildKit(long long sampleRate, int audioSampleRate) {
+    ModemKitGMSK *dkit = new ModemKitGMSK;
+    dkit->sps    = _sps;
+    dkit->fdelay = _fdelay;
+    dkit->ebf    = _ebf;
+
+    dkit->demodGMSK = gmskdem_create(dkit->sps, dkit->fdelay, dkit->ebf);
+
+    dkit->sampleRate = sampleRate;
+    dkit->audioSampleRate = audioSampleRate;
+ 
+    return dkit;
+}
+
+void ModemGMSK::disposeKit(ModemKit *kit) {
+    ModemKitGMSK *dkit = (ModemKitGMSK *)kit;
+    
+    gmskdem_destroy(dkit->demodGMSK);
+    
+    delete dkit;
+}
+
+void ModemGMSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
+    ModemKitGMSK *dkit = (ModemKitGMSK *)kit;
+    unsigned int sym_out;
+    
+    digitalStart(dkit, nullptr, input);
+
+    dkit->inputBuffer.insert(dkit->inputBuffer.end(),input->data.begin(),input->data.end());
+
+    int numProcessed = 0;
+    for (int i = 0, iMax = dkit->inputBuffer.size()/dkit->sps; i < iMax; i+= dkit->sps) {
+        gmskdem_demodulate(dkit->demodGMSK, &input->data[i],&sym_out);
+        outStream << sym_out;
+        numProcessed += dkit->sps;
+    }
+    
+    dkit->inputBuffer.erase(dkit->inputBuffer.begin(),dkit->inputBuffer.begin()+numProcessed);
+    
+    digitalFinish(dkit, nullptr);
+}

src/modules/modem/digital/ModemGMSK.h

@@ -0,0 +1,41 @@
+#pragma once
+#include "ModemDigital.h"
+#include <sstream>
+
+class ModemKitGMSK : public ModemKitDigital {
+public:
+    unsigned int fdelay, sps;
+    float ebf;
+    
+    gmskdem demodGMSK;
+    std::vector<liquid_float_complex> inputBuffer;
+};
+
+
+class ModemGMSK : public ModemDigital {
+public:
+    ModemGMSK();
+    ~ModemGMSK();
+
+    std::string getName();
+    
+    Modem *factory();
+    
+    int checkSampleRate(long long sampleRate, int audioSampleRate);
+    int getDefaultSampleRate();
+
+    ModemArgInfoList getSettings();
+    void writeSetting(std::string setting, std::string value);
+    std::string readSetting(std::string setting);
+    
+    ModemKit *buildKit(long long sampleRate, int audioSampleRate);
+    void disposeKit(ModemKit *kit);
+    
+    void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
+
+private:
+    int _sps;    // samples per symbol
+    int _fdelay;    // filter delay
+    float _ebf;
+};
+

src/modules/modem/digital/ModemOOK.cpp

@@ -4,10 +4,6 @@ ModemOOK::ModemOOK() : ModemDigital()  {
     demodOOK = modem_create(LIQUID_MODEM_OOK);
 }
 
-Modem *ModemOOK::factory() {
-    return new ModemOOK;
-}
-
 ModemOOK::~ModemOOK() {
     modem_destroy(demodOOK);
 }
@@ -16,6 +12,17 @@ std::string ModemOOK::getName() {
     return "OOK";
 }
 
+Modem *ModemOOK::factory() {
+    return new ModemOOK;
+}
+
+int ModemOOK::checkSampleRate(long long sampleRate, int audioSampleRate) {
+    if (sampleRate < 100) {
+        return 100;
+    }
+    return sampleRate;
+}
+
 void ModemOOK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
     ModemKitDigital *dkit = (ModemKitDigital *)kit;
     digitalStart(dkit, demodOOK, input);

src/modules/modem/digital/ModemOOK.h

@@ -10,6 +10,8 @@ public:
     
     Modem *factory();
     
+    int checkSampleRate(long long sampleRate, int audioSampleRate);
+
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
     
 private:

src/visual/ModeSelectorCanvas.cpp

@@ -155,6 +155,11 @@ void ModeSelectorCanvas::addChoice(int value, std::string label) {
     numChoices = selections.size();
 }
 
+void ModeSelectorCanvas::addChoice(std::string label) {
+    selections.push_back(ModeSelectorMode(selections.size()+1, label));
+    numChoices = selections.size();
+}
+
 void ModeSelectorCanvas::setSelection(std::string label) {
     for (int i = 0; i < numChoices; i++) {
         if (selections[i].label == label) {

src/visual/ModeSelectorCanvas.h

@@ -32,6 +32,7 @@ public:
     void setHelpTip(std::string tip);
 
     void addChoice(int value, std::string label);
+    void addChoice(std::string label);
     void setSelection(std::string label);
     std::string getSelectionLabel();
     void setSelection(int value);

src/visual/WaterfallCanvas.cpp

@@ -663,11 +663,7 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
                 demod->setFrequency(freq);
 
                 demod->setDemodulatorType(mgr->getLastDemodulatorType());
-                if (int lastDemodBw = mgr->getLastBandwidth(mgr->getLastDemodulatorType())) {
+                demod->setBandwidth(mgr->getLastBandwidth());
-                    demod->setBandwidth(lastDemodBw);
-                } else {
-                    demod->setBandwidth(mgr->getLastBandwidth());
-                }
                 demod->setSquelchLevel(mgr->getLastSquelchLevel());
                 demod->setSquelchEnabled(mgr->isLastSquelchEnabled());
                 demod->setGain(mgr->getLastGain());
@@ -756,11 +752,7 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
             demod = wxGetApp().getDemodMgr().newThread();
             demod->setFrequency(freq);
             demod->setDemodulatorType(mgr->getLastDemodulatorType());
-            if (int lastDemodBw = mgr->getLastBandwidth(mgr->getLastDemodulatorType())) {
+            demod->setBandwidth(bw);
-                demod->setBandwidth(lastDemodBw);
-            } else {
-                demod->setBandwidth(mgr->getLastBandwidth());
-            }
             demod->setSquelchLevel(mgr->getLastSquelchLevel());
             demod->setSquelchEnabled(mgr->isLastSquelchEnabled());
             demod->setGain(mgr->getLastGain());