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

DSD demod settings: correct serialize/deserialize frequency offset

Browse Source
This commit is contained in:
f4exb 2017-10-03 22:24:07 +02:00
parent 3e9be4181c
commit 2cf107ee34
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/channelrx/demoddsd/dsddemodsettings.cpp
View File

@ -56,12 +56,12 @@ void DSDDemodSettings::resetToDefaults()
QByteArray DSDDemodSettings::serialize() const QByteArray DSDDemodSettings::serialize() const
{ {
SimpleSerializer s(1); SimpleSerializer s(1);
s.writeS32(1, m_inputSampleRate); s.writeS32(1, m_inputFrequencyOffset);
s.writeS32(2, m_rfBandwidth/100.0); s.writeS32(2, m_rfBandwidth/100.0);
s.writeS32(3, m_demodGain*100.0); s.writeS32(3, m_demodGain*100.0);
s.writeS32(4, m_fmDeviation/100.0); s.writeS32(4, m_fmDeviation/100.0);
s.writeS32(5, m_squelch); s.writeS32(5, m_squelch);
s.writeS32(6, m_inputFrequencyOffset); s.writeS32(6, m_inputSampleRate);
s.writeU32(7, m_rgbColor); s.writeU32(7, m_rgbColor);
s.writeS32(8, m_squelchGate); s.writeS32(8, m_squelchGate);
s.writeS32(9, m_volume*10.0); s.writeS32(9, m_volume*10.0);
@ -105,7 +105,8 @@ bool DSDDemodSettings::deserialize(const QByteArray& data)
m_channelMarker->deserialize(bytetmp); m_channelMarker->deserialize(bytetmp);
} }
d.readS32(1, &m_inputSampleRate, 96000); d.readS32(1, &tmp, 0);
m_inputFrequencyOffset = tmp;
d.readS32(2, &tmp, 4); d.readS32(2, &tmp, 4);
m_rfBandwidth = tmp * 100.0; m_rfBandwidth = tmp * 100.0;
d.readS32(3, &tmp, 3); d.readS32(3, &tmp, 3);
@ -114,8 +115,7 @@ bool DSDDemodSettings::deserialize(const QByteArray& data)
m_fmDeviation = tmp * 100.0; m_fmDeviation = tmp * 100.0;
d.readS32(5, &tmp, -40); d.readS32(5, &tmp, -40);
m_squelch = tmp; m_squelch = tmp;
d.readS32(6, &tmp, 0); d.readS32(6, &m_inputSampleRate, 96000);
m_inputFrequencyOffset = tmp;
d.readU32(7, &m_rgbColor); d.readU32(7, &m_rgbColor);
d.readS32(8, &m_squelchGate, 5); d.readS32(8, &m_squelchGate, 5);
d.readS32(9, &tmp, 20); d.readS32(9, &tmp, 20);