VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

BFM demod: fixed requiredBW method

Browse Source
This commit is contained in:
f4exb 2017-01-08 20:11:01 +01:00
parent c2c0c902d4
commit 0ad22f3cd4
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include "../../channelrx/demodbfm/bfmdemodgui.h" #include "bfmdemodgui.h"
#include <device/devicesourceapi.h> #include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h> #include <dsp/downchannelizer.h>
@ -27,7 +27,7 @@
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include "../../../sdrbase/dsp/threadedbasebandsamplesink.h" #include "dsp/threadedbasebandsamplesink.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
#include "dsp/spectrumvis.h" #include "dsp/spectrumvis.h"
#include "gui/glspectrum.h" #include "gui/glspectrum.h"
@ -37,8 +37,8 @@
#include "gui/basicchannelsettingswidget.h" #include "gui/basicchannelsettingswidget.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "../../channelrx/demodbfm/bfmdemod.h" #include "bfmdemod.h"
#include "../../channelrx/demodbfm/rdstmc.h" #include "rdstmc.h"
#include "ui_bfmdemodgui.h" #include "ui_bfmdemodgui.h"
const QString BFMDemodGUI::m_channelID = "sdrangel.channel.bfm"; const QString BFMDemodGUI::m_channelID = "sdrangel.channel.bfm";
@ -47,15 +47,15 @@ const int BFMDemodGUI::m_rfBW[] = {
80000, 100000, 120000, 140000, 160000, 180000, 200000, 220000, 250000 80000, 100000, 120000, 140000, 160000, 180000, 200000, 220000, 250000
}; };
int requiredBW(int rfBW) //int requiredBW(int rfBW)
{ //{
if (rfBW <= 48000) // if (rfBW <= 48000)
return 48000; // return 48000;
else if (rfBW < 100000) // else if (rfBW < 100000)
return 96000; // return 96000;
else // else
return 384000; // return 384000;
} //}
BFMDemodGUI* BFMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI) BFMDemodGUI* BFMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{ {

11
plugins/channelrx/demodbfm/bfmdemodgui.h
View File

@ -23,7 +23,7 @@
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "dsp/movingaverage.h" #include "dsp/movingaverage.h"
#include "../../channelrx/demodbfm/rdsparser.h" #include "rdsparser.h"
class PluginAPI; class PluginAPI;
class DeviceSourceAPI; class DeviceSourceAPI;
@ -112,6 +112,15 @@ private:
void enterEvent(QEvent*); void enterEvent(QEvent*);
void changeFrequency(qint64 f); void changeFrequency(qint64 f);
static int requiredBW(int rfBW)
{
if (rfBW <= 48000) {
return 48000;
} else {
return (3*rfBW)/2;
}
}
}; };
#endif // INCLUDE_BFMDEMODGUI_H #endif // INCLUDE_BFMDEMODGUI_H

6
plugins/channelrx/demodbfm/bfmplugin.cpp
View File

@ -15,16 +15,16 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include "../../channelrx/demodbfm/bfmplugin.h" #include "bfmplugin.h"
#include <QtPlugin> #include <QtPlugin>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "../../channelrx/demodbfm/bfmdemodgui.h" #include "bfmdemodgui.h"
const PluginDescriptor BFMPlugin::m_pluginDescriptor = { const PluginDescriptor BFMPlugin::m_pluginDescriptor = {
QString("Broadcast FM Demodulator"), QString("Broadcast FM Demodulator"),
QString("2.0.0"), QString("3.1.0"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,