1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-01-08 09:28:42 -05:00

REST API: added SigMFFileInputActions in mapper (was missing)

This commit is contained in:
f4exb 2020-08-08 12:00:04 +02:00
parent 31d3011b70
commit d779c27bdf

View File

@ -3846,20 +3846,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
{
@ -3958,7 +3958,7 @@ void WebAPIRequestMapper::resetDeviceActions(SWGSDRangel::SWGDeviceActions& devi
{
deviceActions.cleanup();
deviceActions.setDeviceHwType(nullptr);
// deviceActions.setXtrxInputActions(nullptr);
deviceActions.setSigMfFileInputActions(nullptr);
}
void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings& channelSettings)