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

FCD Pro+: replaced serializer with settings

Browse Source
This commit is contained in:
f4exb
2015-10-01 03:37:53 +02:00
parent b31033c0a2
commit a25fa4ef97
7 changed files with 123 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/fcdproplus/fcdproplusinput.h
+7 -22
View File
@@ -18,6 +18,7 @@
#ifndef INCLUDE_FCDINPUT_H
#define INCLUDE_FCDINPUT_H
#include "fcdproplussettings.h"
#include "dsp/samplesource.h"
#include "fcdhid.h"
#include <QString>
@@ -32,37 +33,21 @@ class FCDProPlusThread;
class FCDProPlusInput : public SampleSource {
public:
struct Settings {
Settings();
quint64 centerFrequency;
bool rangeLow;
bool lnaGain;
bool mixGain;
bool biasT;
quint32 ifGain;
qint32 ifFilterIndex;
qint32 rfFilterIndex;
qint32 LOppmTenths;
void resetToDefaults();
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
};
class MsgConfigureFCD : public Message {
MESSAGE_CLASS_DECLARATION
public:
const Settings& getSettings() const { return m_settings; }
const FCDProPlusSettings& getSettings() const { return m_settings; }
static MsgConfigureFCD* create(const Settings& settings)
static MsgConfigureFCD* create(const FCDProPlusSettings& settings)
{
return new MsgConfigureFCD(settings);
}
private:
Settings m_settings;
FCDProPlusSettings m_settings;
MsgConfigureFCD(const Settings& settings) :
MsgConfigureFCD(const FCDProPlusSettings& settings) :
Message(),
m_settings(settings)
{ }
@@ -91,11 +76,11 @@ public:
void set_lo_ppm();
private:
void applySettings(const Settings& settings, bool force);
void applySettings(const FCDProPlusSettings& settings, bool force);
hid_device *m_dev;
QMutex m_mutex;
Settings m_settings;
FCDProPlusSettings m_settings;
FCDProPlusThread* m_FCDThread;
QString m_deviceDescription;
};