mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

REST API: updates for MIMO (2)

pull/480/head
f4exb 2019-12-23 20:06:10 +01:00
rodzic ddc4667bdb
commit 0a9e7f5154
2 zmienionych plików z 216 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

120
sdrgui/webapi/webapiadaptergui.cpp
Wyświetl plik

@ -1025,6 +1025,8 @@ int WebAPIAdapterGUI::instancePresetPost(
deviceCenterFrequency = deviceSet->m_deviceSourceEngine->getSource()->getCenterFrequency();
} else if (deviceSet->m_deviceSinkEngine) { // Tx
deviceCenterFrequency = deviceSet->m_deviceSinkEngine->getSink()->getCenterFrequency();
} else if (deviceSet->m_deviceMIMOEngine) { // MIMO
deviceCenterFrequency = deviceSet->m_deviceMIMOEngine->getMIMO()->getMIMOCenterFrequency();
} else {
error.init();
*error.getMessage() = QString("Device set error");
@ -1209,12 +1211,21 @@ int WebAPIAdapterGUI::devicesetDevicePut(
return 404;
}
if ((query.getDirection() != 2) && (deviceSet->m_deviceMIMOEngine))
{
error.init();
*error.getMessage() = QString("Device type and device set type (MIMO) mismatch");
return 404;
}
int nbSamplingDevices;
if (query.getDirection() == 0) {
nbSamplingDevices = DeviceEnumerator::instance()->getNbRxSamplingDevices();
} else if (query.getDirection() == 1) {
nbSamplingDevices = DeviceEnumerator::instance()->getNbTxSamplingDevices();
} else if (query.getDirection() == 2) {
nbSamplingDevices = DeviceEnumerator::instance()->getNbMIMOSamplingDevices();
} else {
nbSamplingDevices = 0; // TODO: not implemented yet
}
@ -1222,22 +1233,27 @@ int WebAPIAdapterGUI::devicesetDevicePut(
for (int i = 0; i < nbSamplingDevices; i++)
{
int tx;
int direction;
const PluginInterface::SamplingDevice *samplingDevice;
if (query.getDirection() == 0)
{
tx = 0;
direction = 0;
samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(i);
}
else if (query.getDirection() == 1)
{
tx = 1;
direction = 1;
samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(i);
}
else if (query.getDirection() == 2)
{
direction = 2;
samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(i);
}
else
{
continue; // TODO: any device (2) not supported yet
continue; // device not supported
}
if (query.getDisplayedName() && (*query.getDisplayedName() != samplingDevice->displayedName)) {
@ -1268,7 +1284,7 @@ int WebAPIAdapterGUI::devicesetDevicePut(
*response.getHwType() = samplingDevice->hardwareId;
*response.getSerial() = samplingDevice->serial;
response.setSequence(samplingDevice->sequence);
response.setDirection(tx);
response.setDirection(direction);
response.setDeviceNbStreams(samplingDevice->deviceNbItems);
response.setDeviceStreamIndex(samplingDevice->deviceItemIndex);
response.setDeviceSetIndex(deviceSetIndex);
@ -1314,6 +1330,13 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsGet(
DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink();
return sink->webapiSettingsGet(response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId()));
response.setDirection(2);
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
return mimo->webapiSettingsGet(response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1376,6 +1399,24 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch(
return sink->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage());
}
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
if (response.getDirection() != 2)
{
*error.getMessage() = QString("MIMO device found but other type of device requested");
return 400;
}
else if (deviceSet->m_deviceAPI->getHardwareId() != *response.getDeviceHwType())
{
*error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceAPI->getHardwareId());
return 400;
}
else
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
return mimo->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage());
}
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1412,6 +1453,12 @@ int WebAPIAdapterGUI::devicesetDeviceRunGet(
response.init();
return sink->webapiRunGet(response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
response.init();
return mimo->webapiRunGet(response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1448,6 +1495,12 @@ int WebAPIAdapterGUI::devicesetDeviceRunPost(
response.init();
return sink->webapiRun(true, response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
response.init();
return mimo->webapiRun(true, response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1484,6 +1537,12 @@ int WebAPIAdapterGUI::devicesetDeviceRunDelete(
response.init();
return sink->webapiRun(false, response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
response.init();
return mimo->webapiRun(false, response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1523,6 +1582,13 @@ int WebAPIAdapterGUI::devicesetDeviceReportGet(
DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink();
return sink->webapiReportGet(response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId()));
response.setDirection(2);
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
return mimo->webapiReportGet(response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1569,10 +1635,10 @@ int WebAPIAdapterGUI::devicesetChannelPost(
if (query.getDirection() == 0) // Single Rx
{
if (deviceSet->m_deviceSourceEngine == 0)
if (!deviceSet->m_deviceSourceEngine || !deviceSet->m_deviceMIMOEngine)
{
error.init();
*error.getMessage() = QString("Device set at %1 is not a receive device set").arg(deviceSetIndex);
*error.getMessage() = QString("Device set at %1 is not a receive capable device set").arg(deviceSetIndex);
return 400;
}
@ -1605,10 +1671,10 @@ int WebAPIAdapterGUI::devicesetChannelPost(
}
else if (query.getDirection() == 1) // single Tx
{
if (deviceSet->m_deviceSinkEngine == 0)
if (!deviceSet->m_deviceSinkEngine || !deviceSet->m_deviceMIMOEngine)
{
error.init();
*error.getMessage() = QString("Device set at %1 is not a transmit device set").arg(deviceSetIndex);
*error.getMessage() = QString("Device set at %1 is not a transmit capable device set").arg(deviceSetIndex);
return 400;
}
@ -1639,6 +1705,42 @@ int WebAPIAdapterGUI::devicesetChannelPost(
return 404;
}
}
else if (query.getDirection() == 2) // MIMO
{
if (!deviceSet->m_deviceMIMOEngine)
{
error.init();
*error.getMessage() = QString("Device set at %1 is not a MIMO capable device set").arg(deviceSetIndex);
return 400;
}
PluginAPI::ChannelRegistrations *channelRegistrations = m_mainWindow.m_pluginManager->getMIMOChannelRegistrations();
int nbRegistrations = channelRegistrations->size();
int index = 0;
for (; index < nbRegistrations; index++)
{
if (channelRegistrations->at(index).m_channelId == *query.getChannelType()) {
break;
}
}
if (index < nbRegistrations)
{
MainWindow::MsgAddChannel *msg = MainWindow::MsgAddChannel::create(deviceSetIndex, index, true);
m_mainWindow.m_inputMessageQueue.push(msg);
response.init();
*response.getMessage() = QString("Message to add a channel (MsgAddChannel) was submitted successfully");
return 202;
}
else
{
error.init();
*error.getMessage() = QString("There is no MIMO channel with id %1").arg(*query.getChannelType());
return 404;
}
}
else
{
error.init();

110
sdrsrv/webapi/webapiadaptersrv.cpp
Wyświetl plik

@ -1298,12 +1298,21 @@ int WebAPIAdapterSrv::devicesetDevicePut(
return 404;
}
if ((query.getDirection() != 2) && (deviceSet->m_deviceMIMOEngine))
{
error.init();
*error.getMessage() = QString("Device type and device set type (MIMO) mismatch");
return 404;
}
int nbSamplingDevices;
if (query.getDirection() == 0) {
nbSamplingDevices = DeviceEnumerator::instance()->getNbRxSamplingDevices();
} else if (query.getDirection() == 1) {
nbSamplingDevices = DeviceEnumerator::instance()->getNbTxSamplingDevices();
} else if (query.getDirection() == 2) {
nbSamplingDevices = DeviceEnumerator::instance()->getNbMIMOSamplingDevices();
} else {
nbSamplingDevices = 0; // TODO: not implemented yet
}
@ -1323,9 +1332,14 @@ int WebAPIAdapterSrv::devicesetDevicePut(
direction = 1;
samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(i);
}
else if (query.getDirection() == 2)
{
direction = 2;
samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(i);
}
else
{
continue; // TODO: any device (2) not supported yet
continue; // device not supported
}
if (query.getDisplayedName() && (*query.getDisplayedName() != samplingDevice->displayedName)) {
@ -1403,6 +1417,13 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsGet(
DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink();
return sink->webapiSettingsGet(response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId()));
response.setDirection(2);
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
return mimo->webapiSettingsGet(response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1465,6 +1486,24 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch(
return sink->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage());
}
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
if (response.getDirection() != 2)
{
*error.getMessage() = QString("MIMO device found but other type of device requested");
return 400;
}
else if (deviceSet->m_deviceAPI->getHardwareId() != *response.getDeviceHwType())
{
*error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceAPI->getHardwareId());
return 400;
}
else
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
return mimo->webapiSettingsPutPatch(force, deviceSettingsKeys, response, *error.getMessage());
}
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1501,6 +1540,12 @@ int WebAPIAdapterSrv::devicesetDeviceRunGet(
response.init();
return sink->webapiRunGet(response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
response.init();
return mimo->webapiRunGet(response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1537,6 +1582,12 @@ int WebAPIAdapterSrv::devicesetDeviceRunPost(
response.init();
return sink->webapiRun(true, response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
response.init();
return mimo->webapiRun(true, response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1573,6 +1624,12 @@ int WebAPIAdapterSrv::devicesetDeviceRunDelete(
response.init();
return sink->webapiRun(false, response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
response.init();
return mimo->webapiRun(false, response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1611,6 +1668,13 @@ int WebAPIAdapterSrv::devicesetDeviceReportGet(
DeviceSampleSink *sink = deviceSet->m_deviceAPI->getSampleSink();
return sink->webapiReportGet(response, *error.getMessage());
}
else if (deviceSet->m_deviceMIMOEngine) // MIMO
{
response.setDeviceHwType(new QString(deviceSet->m_deviceAPI->getHardwareId()));
response.setDirection(2);
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getSampleMIMO();
return mimo->webapiReportGet(response, *error.getMessage());
}
else
{
*error.getMessage() = QString("DeviceSet error");
@ -1657,10 +1721,10 @@ int WebAPIAdapterSrv::devicesetChannelPost(
if (query.getDirection() == 0) // Single Rx
{
if (deviceSet->m_deviceSourceEngine == 0)
if (!deviceSet->m_deviceSourceEngine || !deviceSet->m_deviceMIMOEngine)
{
error.init();
*error.getMessage() = QString("Device set at %1 is not a receive device set").arg(deviceSetIndex);
*error.getMessage() = QString("Device set at %1 is not a receive capable device set").arg(deviceSetIndex);
return 400;
}
@ -1693,10 +1757,10 @@ int WebAPIAdapterSrv::devicesetChannelPost(
}
else if (query.getDirection() == 1) // single Tx
{
if (deviceSet->m_deviceSinkEngine == 0)
if (!deviceSet->m_deviceSinkEngine || !deviceSet->m_deviceMIMOEngine)
{
error.init();
*error.getMessage() = QString("Device set at %1 is not a transmit device set").arg(deviceSetIndex);
*error.getMessage() = QString("Device set at %1 is not a transmit capable device set").arg(deviceSetIndex);
return 400;
}
@ -1727,6 +1791,42 @@ int WebAPIAdapterSrv::devicesetChannelPost(
return 404;
}
}
else if (query.getDirection() == 2) // MIMO
{
if (!deviceSet->m_deviceMIMOEngine)
{
error.init();
*error.getMessage() = QString("Device set at %1 is not a MIMO capable device set").arg(deviceSetIndex);
return 400;
}
PluginAPI::ChannelRegistrations *channelRegistrations = m_mainCore.m_pluginManager->getMIMOChannelRegistrations();
int nbRegistrations = channelRegistrations->size();
int index = 0;
for (; index < nbRegistrations; index++)
{
if (channelRegistrations->at(index).m_channelId == *query.getChannelType()) {
break;
}
}
if (index < nbRegistrations)
{
MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, true);
m_mainCore.m_inputMessageQueue.push(msg);
response.init();
*response.getMessage() = QString("Message to add a channel (MsgAddChannel) was submitted successfully");
return 202;
}
else
{
error.init();
*error.getMessage() = QString("There is no MIMO channel with id %1").arg(*query.getChannelType());
return 404;
}
}
else
{
error.init();