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

SigMF file input: REST API

Browse Source
This commit is contained in:
f4exb
2020-11-10 00:36:03 +01:00
parent dc40755324
commit 8a06f73efa
27 changed files with 2371 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapirequestmapper.cpp
+16 -11
View File
@@ -3890,6 +3890,11 @@ bool WebAPIRequestMapper::getDeviceSettings(
deviceSettings->setSdrPlaySettings(new SWGSDRangel::SWGSDRPlaySettings());
deviceSettings->getSdrPlaySettings()->fromJsonObject(settingsJsonObject);
}
else if (deviceSettingsKey == "sigMFFileInputSettings")
{
deviceSettings->setSigMfFileInputSettings(new SWGSDRangel::SWGSigMFFileInputSettings());
deviceSettings->getSigMfFileInputSettings()->fromJsonObject(settingsJsonObject);
}
else if (deviceSettingsKey == "soapySDRInputSettings")
{
processSoapySDRSettings(deviceSettings, settingsJsonObject, deviceSettingsKeys, true);
@@ -3974,20 +3979,20 @@ bool WebAPIRequestMapper::getDeviceActions(
if (deviceKeys.contains(deviceActionsKey) && deviceActionsJson[deviceActionsKey].isObject())
{
// QJsonObject actionsJsonObject = deviceActionsJson[deviceActionsKey].toObject();
// deviceActionsKeys = actionsJsonObject.keys();
QJsonObject actionsJsonObject = deviceActionsJson[deviceActionsKey].toObject();
deviceActionsKeys = actionsJsonObject.keys();
// if (deviceActionsKey == "xtrxInputActions")
// {
// deviceActions->setXtrxInputActions(new SWGSDRangel::SWGXtrxInputActions());
// deviceActions->getXtrxInputActions()->fromJsonObject(actionsJsonObject);
// }
// else
// {
if (deviceActionsKey == "SigMFFileInputActions")
{
deviceActions->setSigMfFileInputActions(new SWGSDRangel::SWGSigMFFileInputActions());
deviceActions->getSigMfFileInputActions()->fromJsonObject(actionsJsonObject);
}
else
{
return false;
// }
}
// return true;
return true;
}
else
{