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

RTL-SDR: replaced serializer by setting class

Browse Source
This commit is contained in:
f4exb
2015-10-01 04:39:00 +02:00
parent 3540efc696
commit 3cc73fbf61
6 changed files with 90 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+1 -52
View File
@@ -23,61 +23,10 @@
#include "rtlsdrgui.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "rtlsdrserializer.h"
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgConfigureRTLSDR, Message)
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgReportRTLSDR, Message)
RTLSDRInput::Settings::Settings() :
m_devSampleRate(1024*1000),
m_centerFrequency(435000*1000),
m_gain(0),
m_loPpmCorrection(0),
m_log2Decim(4)
{
}
void RTLSDRInput::Settings::resetToDefaults()
{
m_devSampleRate = 1024*1000;
m_centerFrequency = 435000*1000;
m_gain = 0;
m_loPpmCorrection = 0;
m_log2Decim = 4;
}
QByteArray RTLSDRInput::Settings::serialize() const
{
SampleSourceSerializer::Data data;
data.m_lnaGain = m_gain;
data.m_log2Decim = m_log2Decim;
data.m_frequency = m_centerFrequency;
data.m_rate = m_devSampleRate;
data.m_correction = m_loPpmCorrection;
QByteArray byteArray;
RTLSDRSerializer::writeSerializedData(data, byteArray);
return byteArray;
}
bool RTLSDRInput::Settings::deserialize(const QByteArray& serializedData)
{
SampleSourceSerializer::Data data;
bool valid = RTLSDRSerializer::readSerializedData(serializedData, data);
m_gain = data.m_lnaGain;
m_log2Decim = data.m_log2Decim;
m_centerFrequency = data.m_frequency;
m_devSampleRate = data.m_rate;
m_loPpmCorrection = data.m_correction;
return valid;
}
RTLSDRInput::RTLSDRInput() :
m_settings(),
m_dev(0),
@@ -260,7 +209,7 @@ bool RTLSDRInput::handleMessage(const Message& message)
}
}
bool RTLSDRInput::applySettings(const Settings& settings, bool force)
bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force)
{
QMutexLocker mutexLocker(&m_mutex);
bool forwardChange = false;