VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 00:44:48 -04:00
Code Issues Projects Releases Wiki Activity

API: implemented Channel Marker in Tx channels

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/modatv/atvmod.cpp
+25
View File
@@ -35,6 +35,7 @@
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
@@ -510,6 +511,9 @@ void ATVMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAtvModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAtvModSettings()->getChannelMarker());
}
}
int ATVMod::webapiReportGet(
@@ -581,6 +585,20 @@ void ATVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
response.getAtvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAtvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getAtvModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getAtvModSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getAtvModSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getAtvModSettings()->setChannelMarker(swgChannelMarker);
}
}
}
void ATVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -718,6 +736,13 @@ void ATVMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
swgATVModSettings->setStreamIndex(settings.m_streamIndex);
}
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgATVModSettings->setChannelMarker(swgChannelMarker);
}
}
void ATVMod::networkManagerFinished(QNetworkReply *reply)