From 7f960824f59d305da4aa64a0aa5941b50e4036de Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 12 Jul 2024 05:01:07 +0200
Subject: [PATCH] WDSP receiver: added to Web API mapper
---
sdrbase/webapi/webapirequestmapper.cpp | 12 +++++++++---
sdrbase/webapi/webapiutils.cpp | 2 ++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index 4eced1e82..bd501385a 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -4562,19 +4562,19 @@ bool WebAPIRequestMapper::getChannelSettings(
else if (channelSettingsKey == "FreqScannerSettings")
{
channelSettings->setFreqScannerSettings(new SWGSDRangel::SWGFreqScannerSettings());
- channelSettings->getFreqScannerSettings()->init();
+ channelSettings->getFreqScannerSettings()->init();
channelSettings->getFreqScannerSettings()->fromJsonObject(settingsJsonObject);
}
else if (channelSettingsKey == "FreqTrackerSettings")
{
channelSettings->setFreqTrackerSettings(new SWGSDRangel::SWGFreqTrackerSettings());
- channelSettings->getFreqTrackerSettings()->init();
+ channelSettings->getFreqTrackerSettings()->init();
channelSettings->getFreqTrackerSettings()->fromJsonObject(settingsJsonObject);
}
else if (channelSettingsKey == "FT8DemodSettings")
{
channelSettings->setFt8DemodSettings(new SWGSDRangel::SWGFT8DemodSettings());
- channelSettings->getFt8DemodSettings()->init();
+ channelSettings->getFt8DemodSettings()->init();
channelSettings->getFt8DemodSettings()->fromJsonObject(settingsJsonObject);
}
else if (channelSettingsKey == "HeatMapSettings")
@@ -4774,6 +4774,12 @@ bool WebAPIRequestMapper::getChannelSettings(
channelSettings->getWfmModSettings()->init();
channelSettings->getWfmModSettings()->fromJsonObject(settingsJsonObject);
}
+ else if (channelSettingsKey == "WDSPRxSettings")
+ {
+ channelSettings->setWdspRxSettings(new SWGSDRangel::SWGWDSPRxSettings());
+ channelSettings->getWdspRxSettings()->init();
+ channelSettings->getWdspRxSettings()->fromJsonObject(settingsJsonObject);
+ }
else
{
return false;
diff --git a/sdrbase/webapi/webapiutils.cpp b/sdrbase/webapi/webapiutils.cpp
index 50d96769e..5babcc316 100644
--- a/sdrbase/webapi/webapiutils.cpp
+++ b/sdrbase/webapi/webapiutils.cpp
@@ -77,6 +77,7 @@ const QMap<QString, QString> WebAPIUtils::m_channelURIToSettingsKey = {
{"sdrangel.channel.rttymod", "RTTYModSettings"},
{"sdrangel.channeltx.modssb", "SSBModSettings"},
{"sdrangel.channel.ssbdemod", "SSBDemodSettings"},
+ {"sdrangel.channel.wdsprx", "WDSPRxSettings"},
{"sdrangel.channel.ft8demod", "FT8DemodSettings"},
{"de.maintech.sdrangelove.channel.ssb", "SSBDemodSettings"}, // remap
{"sdrangel.channel.radioastronomy", "RadioAstronomySettings"},
@@ -199,6 +200,7 @@ const QMap<QString, QString> WebAPIUtils::m_channelTypeToSettingsKey = {
{"RTTYMod", "RTTYModSettings"},
{"SSBMod", "SSBModSettings"},
{"SSBDemod", "SSBDemodSettings"},
+ {"WDSPRx", "WDSPRxSettings"},
{"FT8Demod", "FT8DemodSettings"},
{"UDPSink", "UDPSinkSettings"},
{"UDPSource", "UDPSourceSettings"},