VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 04:50:29 -04:00
Code Issues Projects Releases Wiki Activity

LimeSDR input: removed FcPos from settings. Serialize/Deserialize NCO data

Browse Source
This commit is contained in:
f4exb 2017-04-21 16:46:09 +02:00
parent 688ca8ab46
commit bef210d97f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/samplesource/limesdrinput/limesdrinputsettings.cpp
View File

@ -30,7 +30,6 @@ void LimeSDRInputSettings::resetToDefaults()
m_dcBlock = false; m_dcBlock = false;
m_iqCorrection = false; m_iqCorrection = false;
m_log2SoftDecim = 0; m_log2SoftDecim = 0;
m_fcPos = FC_POS_CENTER;
m_lpfBW = 4.5e6f; m_lpfBW = 4.5e6f;
m_lpfFIREnable = false; m_lpfFIREnable = false;
m_lpfFIRBW = 2.5e6f; m_lpfFIRBW = 2.5e6f;
@ -48,11 +47,12 @@ QByteArray LimeSDRInputSettings::serialize() const
s.writeBool(3, m_dcBlock); s.writeBool(3, m_dcBlock);
s.writeBool(4, m_iqCorrection); s.writeBool(4, m_iqCorrection);
s.writeU32(5, m_log2SoftDecim); s.writeU32(5, m_log2SoftDecim);
s.writeS32(6, (int) m_fcPos);
s.writeFloat(7, m_lpfBW); s.writeFloat(7, m_lpfBW);
s.writeBool(8, m_lpfFIREnable); s.writeBool(8, m_lpfFIREnable);
s.writeFloat(9, m_lpfFIRBW); s.writeFloat(9, m_lpfFIRBW);
s.writeU32(10, m_gain); s.writeU32(10, m_gain);
s.writeBool(11, m_ncoEnable);
s.writeS32(12, m_ncoFrequency);
return s.final(); return s.final();
} }
@ -71,17 +71,17 @@ bool LimeSDRInputSettings::deserialize(const QByteArray& data)
{ {
int intval; int intval;
d.readS32(1, &m_devSampleRate, 3072000); d.readS32(1, &m_devSampleRate, 5000000);
d.readU32(2, &m_log2HardDecim, 2); d.readU32(2, &m_log2HardDecim, 2);
d.readBool(3, &m_dcBlock, false); d.readBool(3, &m_dcBlock, false);
d.readBool(4, &m_iqCorrection, false); d.readBool(4, &m_iqCorrection, false);
d.readU32(5, &m_log2SoftDecim, 0); d.readU32(5, &m_log2SoftDecim, 0);
d.readS32(6, &intval, 0);
m_fcPos = (fcPos_t) intval;
d.readFloat(7, &m_lpfBW, 1.5e6); d.readFloat(7, &m_lpfBW, 1.5e6);
d.readBool(8, &m_lpfFIREnable, false); d.readBool(8, &m_lpfFIREnable, false);
d.readFloat(9, &m_lpfFIRBW, 1.5e6); d.readFloat(9, &m_lpfFIRBW, 1.5e6);
d.readU32(10, &m_gain, 0); d.readU32(10, &m_gain, 0);
d.readBool(11, &m_ncoEnable, false);
d.readS32(12, &m_ncoFrequency, 0);
return true; return true;
} }

1
plugins/samplesource/limesdrinput/limesdrinputsettings.h
View File

@ -40,7 +40,6 @@ struct LimeSDRInputSettings
bool m_dcBlock; bool m_dcBlock;
bool m_iqCorrection; bool m_iqCorrection;
uint32_t m_log2SoftDecim; uint32_t m_log2SoftDecim;
fcPos_t m_fcPos;
float m_lpfBW; //!< LMS amalog lowpass filter bandwidth (Hz) float m_lpfBW; //!< LMS amalog lowpass filter bandwidth (Hz)
bool m_lpfFIREnable; //!< Enable LMS digital lowpass FIR filters bool m_lpfFIREnable; //!< Enable LMS digital lowpass FIR filters
float m_lpfFIRBW; //!< LMS digital lowpass FIR filters bandwidth (Hz) float m_lpfFIRBW; //!< LMS digital lowpass FIR filters bandwidth (Hz)