VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 13:00:26 -04:00
Code Issues Projects Releases Wiki Activity

API fixed update of AFCSettings and VORLocalizerSettings feature settings

Browse Source
This commit is contained in:
f4exb 2022-01-11 23:22:24 +01:00
parent d15a574c9d
commit ac28cadffa
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdrbase/webapi/webapirequestmapper.cpp
View File

@ -4775,7 +4775,12 @@ bool WebAPIRequestMapper::getFeatureSettings(
extractKeys(settingsJsonObject, featureSettingsKeys); extractKeys(settingsJsonObject, featureSettingsKeys);
qDebug() << "WebAPIRequestMapper::getFeatureSettings: featureSettingsKeys: " << featureSettingsKeys; qDebug() << "WebAPIRequestMapper::getFeatureSettings: featureSettingsKeys: " << featureSettingsKeys;
if (featureSettingsKey == "AISSSettings") if (featureSettingsKey == "AFCSettings")
{
featureSettings->setAfcSettings(new SWGSDRangel::SWGAFCSettings());
featureSettings->getAfcSettings()->fromJsonObject(settingsJsonObject);
}
else if (featureSettingsKey == "AISSSettings")
{ {
featureSettings->setAisSettings(new SWGSDRangel::SWGAISSettings()); featureSettings->setAisSettings(new SWGSDRangel::SWGAISSettings());
featureSettings->getAisSettings()->fromJsonObject(settingsJsonObject); featureSettings->getAisSettings()->fromJsonObject(settingsJsonObject);
@ -4837,6 +4842,11 @@ bool WebAPIRequestMapper::getFeatureSettings(
featureSettings->setRigCtlServerSettings(new SWGSDRangel::SWGRigCtlServerSettings()); featureSettings->setRigCtlServerSettings(new SWGSDRangel::SWGRigCtlServerSettings());
featureSettings->getRigCtlServerSettings()->fromJsonObject(settingsJsonObject); featureSettings->getRigCtlServerSettings()->fromJsonObject(settingsJsonObject);
} }
else if (featureSettingsKey == "VORLocalizerSettings")
{
featureSettings->setVorLocalizerSettings(new SWGSDRangel::SWGVORLocalizerSettings());
featureSettings->getVorLocalizerSettings()->fromJsonObject(settingsJsonObject);
}
else else
{ {
return false; return false;

10
sdrbase/webapi/webapiutils.cpp
View File

@ -264,18 +264,20 @@ const QMap<QString, QString> WebAPIUtils::m_mimoDeviceHwIdToActionsKey = {
}; };
const QMap<QString, QString> WebAPIUtils::m_featureTypeToSettingsKey = { const QMap<QString, QString> WebAPIUtils::m_featureTypeToSettingsKey = {
{"AFC", "AFCSettings"},
{"AIS", "AISSettings"}, {"AIS", "AISSettings"},
{"AntennaTools", "AntennaToolsSettings"}, {"AntennaTools", "AntennaToolsSettings"},
{"APRS", "APRSSettings"}, {"APRS", "APRSSettings"},
{"DemodAnalyzer", "DemodAnalyzerSettings"}, {"DemodAnalyzer", "DemodAnalyzerSettings"},
{"JogdialController", "JogdialControllerSettings"}, {"JogdialController", "JogdialControllerSettings"},
{"GS232Controller", "GS232ControllerSettings"}, {"GS232Controller", "GS232ControllerSettings"}, // a.k.a Rotator Controller
{"Map", "MapSettings"}, {"Map", "MapSettings"},
{"PERTester", "PERTesterSettings"}, {"PERTester", "PERTesterSettings"},
{"RigCtlServer", "RigCtlServerSettings"},
{"SatelliteTracker", "SatelliteTrackerSettings"}, {"SatelliteTracker", "SatelliteTrackerSettings"},
{"SimplePTT", "SimplePTTSettings"}, {"SimplePTT", "SimplePTTSettings"},
{"StarTracker", "StarTrackerSettings"}, {"StarTracker", "StarTrackerSettings"},
{"RigCtlServer", "RigCtlServerSettings"} {"VORLocalizer", "VORLocalizerSettings"}
}; };
const QMap<QString, QString> WebAPIUtils::m_featureTypeToActionsKey = { const QMap<QString, QString> WebAPIUtils::m_featureTypeToActionsKey = {
@ -291,6 +293,7 @@ const QMap<QString, QString> WebAPIUtils::m_featureTypeToActionsKey = {
}; };
const QMap<QString, QString> WebAPIUtils::m_featureURIToSettingsKey = { const QMap<QString, QString> WebAPIUtils::m_featureURIToSettingsKey = {
{"sdrangel.feature.afc", "AFCSettings"},
{"sdrangel.feature.ais", "AISSSettings"}, {"sdrangel.feature.ais", "AISSSettings"},
{"sdrangel.feature.antennatools", "AntennaToolsSettings"}, {"sdrangel.feature.antennatools", "AntennaToolsSettings"},
{"sdrangel.feature.aprs", "APRSSettings"}, {"sdrangel.feature.aprs", "APRSSettings"},
@ -299,10 +302,11 @@ const QMap<QString, QString> WebAPIUtils::m_featureURIToSettingsKey = {
{"sdrangel.feature.gs232controller", "GS232ControllerSettings"}, {"sdrangel.feature.gs232controller", "GS232ControllerSettings"},
{"sdrangel.feature.map", "MapSettings"}, {"sdrangel.feature.map", "MapSettings"},
{"sdrangel.feature.pertester", "PERTesterSettings"}, {"sdrangel.feature.pertester", "PERTesterSettings"},
{"sdrangel.feature.rigctlserver", "RigCtlServerSettings"},
{"sdrangel.feature.satellitetracker", "SatelliteTrackerSettings"}, {"sdrangel.feature.satellitetracker", "SatelliteTrackerSettings"},
{"sdrangel.feature.simpleptt", "SimplePTTSettings"}, {"sdrangel.feature.simpleptt", "SimplePTTSettings"},
{"sdrangel.feature.startracker", "StarTrackerSettings"}, {"sdrangel.feature.startracker", "StarTrackerSettings"},
{"sdrangel.feature.rigctlserver", "RigCtlServerSettings"} {"sdrangel.feature.vorlocalizer", "VORLocalizerSettings"}
}; };
// Get integer value from within JSON object // Get integer value from within JSON object