comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix/add FMS as temporary FM-Stereo mode

This commit is contained in:
Charles J. Cliffe 2015-11-18 00:23:04 -05:00
parent 5f6b492478
commit bb62fd1999
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/AppFrame.cpp
View File

@ -68,11 +68,12 @@ AppFrame::AppFrame() :
demodModeSelector = new ModeSelectorCanvas(demodPanel, attribList);
demodModeSelector->addChoice(0, "FM");
demodModeSelector->addChoice(1, "AM");
demodModeSelector->addChoice(2, "LSB");
demodModeSelector->addChoice(3, "USB");
demodModeSelector->addChoice(4, "DSB");
demodModeSelector->addChoice(5, "I/Q");
demodModeSelector->addChoice(1, "FMS");
demodModeSelector->addChoice(2, "AM");
demodModeSelector->addChoice(3, "LSB");
demodModeSelector->addChoice(4, "USB");
demodModeSelector->addChoice(5, "DSB");
demodModeSelector->addChoice(6, "I/Q");
demodModeSelector->setSelection("FM");
demodModeSelector->setHelpTip("Choose modulation type: Frequency Modulation, Amplitude Modulation and Lower, Upper or Double Side-Band.");
demodTray->Add(demodModeSelector, 2, wxEXPAND | wxALL, 0);

2
src/CubicSDR.cpp
View File

@ -165,7 +165,7 @@ bool CubicSDR::OnInit() {
wxApp::SetAppName("CubicSDR");
Modem::addModemFactory("FM", new ModemFM);
Modem::addModemFactory("WBFM", new ModemFMStereo);
Modem::addModemFactory("FMS", new ModemFMStereo);
Modem::addModemFactory("AM", new ModemAM);
Modem::addModemFactory("LSB", new ModemLSB);
Modem::addModemFactory("USB", new ModemUSB);

2
src/modules/modem/analog/ModemFMStereo.cpp
View File

@ -1,6 +1,8 @@
#include "ModemFMStereo.h"
ModemFMStereo::ModemFMStereo() {
demodFM = freqdem_create(0.5);
firStereoR2C = firhilbf_create(5, 60.0f);
firStereoC2R = firhilbf_create(5, 60.0f);