VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 21:42:26 -04:00
Code Issues Projects Releases Wiki Activity

REST API: device and channel actions: fixes to implementation (2)

Browse Source
This commit is contained in:
f4exb 2020-03-10 15:50:42 +01:00
parent b317c0a59d
commit 897d13d0b0
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdrbase/webapi/webapirequestmapper.cpp
View File

@ -192,9 +192,6 @@ const QMap<QString, QString> WebAPIRequestMapper::m_sinkDeviceHwIdToSettingsKey
{"PlutoSDR", "plutoSdrOutputSettings"}, {"PlutoSDR", "plutoSdrOutputSettings"},
{"RemoteOutput", "remoteOutputSettings"}, {"RemoteOutput", "remoteOutputSettings"},
{"SoapySDR", "soapySDROutputSettings"}, {"SoapySDR", "soapySDROutputSettings"},
<<<<<<< ours
{"XTRX", "XtrxOutputSettings"}
=======
{"XTRX", "xtrxOutputSettings"} {"XTRX", "xtrxOutputSettings"}
}; };
@ -205,7 +202,6 @@ const QMap<QString, QString> WebAPIRequestMapper::m_mimoDeviceHwIdToSettingsKey=
{"BladeRF2", "bladeRF2MIMOSettings"}, {"BladeRF2", "bladeRF2MIMOSettings"},
{"TestMI", "testMISettings"}, {"TestMI", "testMISettings"},
{"TestMOSync", "testMOSyncSettings"} {"TestMOSync", "testMOSyncSettings"}
>>>>>>> theirs
}; };
const QMap<QString, QString> WebAPIRequestMapper::m_mimoDeviceHwIdToActionsKey= { const QMap<QString, QString> WebAPIRequestMapper::m_mimoDeviceHwIdToActionsKey= {

3
sdrbase/webapi/webapirequestmapper.h
View File

@ -189,14 +189,11 @@ private:
static const QMap<QString, QString> m_channelTypeToSettingsKey; static const QMap<QString, QString> m_channelTypeToSettingsKey;
static const QMap<QString, QString> m_sourceDeviceHwIdToSettingsKey; static const QMap<QString, QString> m_sourceDeviceHwIdToSettingsKey;
static const QMap<QString, QString> m_sinkDeviceHwIdToSettingsKey; static const QMap<QString, QString> m_sinkDeviceHwIdToSettingsKey;
<<<<<<< ours
=======
static const QMap<QString, QString> m_mimoDeviceHwIdToSettingsKey; static const QMap<QString, QString> m_mimoDeviceHwIdToSettingsKey;
static const QMap<QString, QString> m_channelTypeToActionsKey; static const QMap<QString, QString> m_channelTypeToActionsKey;
static const QMap<QString, QString> m_sourceDeviceHwIdToActionsKey; static const QMap<QString, QString> m_sourceDeviceHwIdToActionsKey;
static const QMap<QString, QString> m_sinkDeviceHwIdToActionsKey; static const QMap<QString, QString> m_sinkDeviceHwIdToActionsKey;
static const QMap<QString, QString> m_mimoDeviceHwIdToActionsKey; static const QMap<QString, QString> m_mimoDeviceHwIdToActionsKey;
>>>>>>> theirs
}; };
#endif /* SDRBASE_WEBAPI_WEBAPIREQUESTMAPPER_H_ */ #endif /* SDRBASE_WEBAPI_WEBAPIREQUESTMAPPER_H_ */