VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00
Code Issues Projects Releases Wiki Activity

Deep redesign: Better support for FCD dongles #9: use fcd_traits template instead of hardcoded values

Browse Source
This commit is contained in:
f4exb
2015-09-05 05:50:29 +02:00
parent f56a3d9385
commit 208d3deb6e
14 changed files with 154 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
+5 -4
View File
@@ -26,6 +26,7 @@
#include "fcdproplusgui.h"
#include "fcdproplusserializer.h"
#include "fcdproplusthread.h"
#include "fcdtraits.h"
MESSAGE_CLASS_DEFINITION(FCDProPlusInput::MsgConfigureFCD, Message)
//MESSAGE_CLASS_DEFINITION(FCDInput::MsgReportFCD, Message)
@@ -114,7 +115,7 @@ FCDProPlusInput::FCDProPlusInput() :
m_dev(0),
m_settings(),
m_FCDThread(0),
m_deviceDescription("Funcube Dongle Pro+")
m_deviceDescription(fcd_traits<ProPlus>::displayedName)
{
}
@@ -139,7 +140,7 @@ bool FCDProPlusInput::start(int device)
return false;
}
m_dev = fcdOpen(0x04D8, 0xFB31, device);
m_dev = fcdOpen(fcd_traits<ProPlus>::vendorId, fcd_traits<ProPlus>::productId, device);
if (m_dev == 0)
{
@@ -198,7 +199,7 @@ const QString& FCDProPlusInput::getDeviceDescription() const
int FCDProPlusInput::getSampleRate() const
{
return 192000;
return fcd_traits<ProPlus>::sampleRate;
}
quint64 FCDProPlusInput::getCenterFrequency() const
@@ -260,7 +261,7 @@ void FCDProPlusInput::applySettings(const Settings& settings, bool force)
if (signalChange)
{
DSPSignalNotification *notif = new DSPSignalNotification(192000, m_settings.centerFrequency);
DSPSignalNotification *notif = new DSPSignalNotification(fcd_traits<ProPlus>::sampleRate, m_settings.centerFrequency);
getOutputMessageQueue()->push(notif);
}
}