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

SDRdaemonSink: added compatibility with SDRangel and SDRdaemon server types

Browse Source
This commit is contained in:
f4exb
2018-09-01 10:44:12 +02:00
parent 3469b91163
commit 96dfce0154
12 changed files with 312 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp
+19
View File
@@ -32,6 +32,9 @@ void SDRdaemonSinkSettings::resetToDefaults()
m_apiPort = 9091;
m_dataAddress = "127.0.0.1";
m_dataPort = 9090;
m_serverType = ServerAngel;
m_deviceIndex = 0;
m_channelIndex = 0;
}
QByteArray SDRdaemonSinkSettings::serialize() const
@@ -46,6 +49,9 @@ QByteArray SDRdaemonSinkSettings::serialize() const
s.writeU32(6, m_apiPort);
s.writeString(7, m_dataAddress);
s.writeU32(8, m_dataPort);
s.writeS32(9, (int) m_serverType);
s.writeU32(10, m_deviceIndex);
s.writeU32(11, m_channelIndex);
return s.final();
}
@@ -63,6 +69,8 @@ bool SDRdaemonSinkSettings::deserialize(const QByteArray& data)
if (d.getVersion() == 1)
{
quint32 uintval;
int intval;
d.readU64(1, &m_centerFrequency, 435000*1000);
d.readU32(2, &m_sampleRate, 48000);
d.readFloat(3, &m_txDelay, 0.5);
@@ -73,6 +81,17 @@ bool SDRdaemonSinkSettings::deserialize(const QByteArray& data)
d.readString(7, &m_dataAddress, "127.0.0.1");
d.readU32(8, &uintval, 9090);
m_dataPort = uintval % (1<<16);
d.readS32(9, &intval, 0);
if ((intval < 0) || (intval > 1)) {
m_serverType = ServerAngel;
} else {
m_serverType = (ServerType) intval;
}
d.readU32(10, &m_deviceIndex, 0);
d.readU32(11, &m_channelIndex, 0);
return true;
}
else