VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-05 15:34:57 -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/modam/ammod.cpp
+24
View File
@@ -473,6 +473,9 @@ void AMMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAmModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAmModSettings()->getChannelMarker());
}
}
int AMMod::webapiReportGet(
@@ -526,6 +529,20 @@ void AMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respons
response.getAmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getAmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getAmModSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getAmModSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getAmModSettings()->setChannelMarker(swgChannelMarker);
}
}
}
void AMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@@ -674,6 +691,13 @@ void AMMod::webapiFormatChannelSettings(
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = swgAMModSettings->getCwKeyer();
m_basebandSource->getCWKeyer().webapiFormatChannelSettings(apiCwKeyerSettings, cwKeyerSettings);
}
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgAMModSettings->setChannelMarker(swgChannelMarker);
}
}
void AMMod::networkManagerFinished(QNetworkReply *reply)