1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 06:24:48 -04:00

API: implemented Channel Marker in Tx channels

This commit is contained in:
f4exb
2021-12-03 22:32:54 +01:00
parent 8a438a94c1
commit 2a3ce0e7fb
92 changed files with 1017 additions and 2 deletions
+24
View File
@@ -636,6 +636,9 @@ void PacketMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("udpPort")) {
settings.m_udpPort = response.getPacketModSettings()->getUdpPort();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getPacketModSettings()->getChannelMarker());
}
}
int PacketMod::webapiReportGet(
@@ -796,6 +799,20 @@ void PacketMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
response.getPacketModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getPacketModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getPacketModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getPacketModSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getPacketModSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getPacketModSettings()->setChannelMarker(swgChannelMarker);
}
}
}
void PacketMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -1005,6 +1022,13 @@ void PacketMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("udpPort") || force) {
swgPacketModSettings->setUdpPort(settings.m_udpPort);
}
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgPacketModSettings->setChannelMarker(swgChannelMarker);
}
}
void PacketMod::networkManagerFinished(QNetworkReply *reply)