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

Single DeviceAPI: REST API fixes

Browse Source
This commit is contained in:
f4exb
2019-05-09 01:12:40 +02:00
parent 89e53cf179
commit 029e559824
14 changed files with 339 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/webapi/webapiadaptergui.cpp
+94 -44
View File
@@ -115,28 +115,47 @@ int WebAPIAdapterGUI::instanceDelete(
}
int WebAPIAdapterGUI::instanceDevices(
bool tx,
int direction,
SWGSDRangel::SWGInstanceDevicesResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
int nbSamplingDevices = tx ? DeviceEnumerator::instance()->getNbTxSamplingDevices() : DeviceEnumerator::instance()->getNbRxSamplingDevices();
int nbSamplingDevices;
if (direction == 0) { // Single Rx stream device
nbSamplingDevices = DeviceEnumerator::instance()->getNbRxSamplingDevices();
} else if (direction == 1) { // Single Tx stream device
nbSamplingDevices = DeviceEnumerator::instance()->getNbTxSamplingDevices();
} else { // not supported
nbSamplingDevices = 0;
}
response.setDevicecount(nbSamplingDevices);
QList<SWGSDRangel::SWGDeviceListItem*> *devices = response.getDevices();
for (int i = 0; i < nbSamplingDevices; i++)
{
PluginInterface::SamplingDevice samplingDevice = tx ? DeviceEnumerator::instance()->getTxSamplingDevice(i) : DeviceEnumerator::instance()->getRxSamplingDevice(i);
const PluginInterface::SamplingDevice *samplingDevice = nullptr;
if (direction == 0) {
samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(i);
} else if (direction == 1) {
samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(i);
} else {
continue;
}
devices->append(new SWGSDRangel::SWGDeviceListItem);
devices->back()->init();
*devices->back()->getDisplayedName() = samplingDevice.displayedName;
*devices->back()->getHwType() = samplingDevice.hardwareId;
*devices->back()->getSerial() = samplingDevice.serial;
devices->back()->setSequence(samplingDevice.sequence);
devices->back()->setDirection((int) samplingDevice.streamType);
devices->back()->setDeviceNbStreams(samplingDevice.deviceNbItems);
devices->back()->setDeviceSetIndex(samplingDevice.claimed);
*devices->back()->getDisplayedName() = samplingDevice->displayedName;
*devices->back()->getHwType() = samplingDevice->hardwareId;
*devices->back()->getSerial() = samplingDevice->serial;
devices->back()->setSequence(samplingDevice->sequence);
devices->back()->setDirection((int) samplingDevice->streamType);
devices->back()->setDeviceNbStreams(samplingDevice->deviceNbItems);
devices->back()->setDeviceSetIndex(samplingDevice->claimed);
devices->back()->setIndex(i);
}
@@ -144,14 +163,31 @@ int WebAPIAdapterGUI::instanceDevices(
}
int WebAPIAdapterGUI::instanceChannels(
bool tx,
int direction,
SWGSDRangel::SWGInstanceChannelsResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
response.init();
PluginAPI::ChannelRegistrations *channelRegistrations = tx ? m_mainWindow.m_pluginManager->getTxChannelRegistrations() : m_mainWindow.m_pluginManager->getRxChannelRegistrations();
int nbChannelDevices = channelRegistrations->size();
PluginAPI::ChannelRegistrations *channelRegistrations;
int nbChannelDevices;
if (direction == 0) // Single sink (Rx) channel
{
channelRegistrations = m_mainWindow.m_pluginManager->getRxChannelRegistrations();
nbChannelDevices = channelRegistrations->size();
}
else if (direction == 1) // Single source (Tx) channel
{
channelRegistrations = m_mainWindow.m_pluginManager->getTxChannelRegistrations();
nbChannelDevices = channelRegistrations->size();
}
else // not supported
{
channelRegistrations = nullptr;
nbChannelDevices = 0;
}
response.setChannelcount(nbChannelDevices);
QList<SWGSDRangel::SWGChannelListItem*> *channels = response.getChannels();
@@ -163,7 +199,7 @@ int WebAPIAdapterGUI::instanceChannels(
const PluginDescriptor& pluginDescriptor = channelInterface->getPluginDescriptor();
*channels->back()->getVersion() = pluginDescriptor.version;
*channels->back()->getName() = pluginDescriptor.displayedName;
channels->back()->setDirection(tx ? 1 : 0);
channels->back()->setDirection(direction);
*channels->back()->getIdUri() = channelRegistrations->at(i).m_channelIdURI;
*channels->back()->getId() = channelRegistrations->at(i).m_channelId;
channels->back()->setIndex(i);
@@ -655,15 +691,17 @@ int WebAPIAdapterGUI::instancePresetPatch(
const Preset *selectedPreset = m_mainWindow.m_settings.getPreset(*presetIdentifier->getGroupName(),
presetIdentifier->getCenterFrequency(),
*presetIdentifier->getName());
*presetIdentifier->getName(),
*presetIdentifier->getType());
if (selectedPreset == 0)
{
error.init();
*error.getMessage() = QString("There is no preset [%1, %2, %3]")
*error.getMessage() = QString("There is no preset [%1, %2, %3 %4]")
.arg(*presetIdentifier->getGroupName())
.arg(presetIdentifier->getCenterFrequency())
.arg(*presetIdentifier->getName());
.arg(*presetIdentifier->getName())
.arg(*presetIdentifier->getType());
return 404;
}
@@ -713,15 +751,17 @@ int WebAPIAdapterGUI::instancePresetPut(
const Preset *selectedPreset = m_mainWindow.m_settings.getPreset(*presetIdentifier->getGroupName(),
presetIdentifier->getCenterFrequency(),
*presetIdentifier->getName());
*presetIdentifier->getName(),
*presetIdentifier->getType());
if (selectedPreset == 0)
{
error.init();
*error.getMessage() = QString("There is no preset [%1, %2, %3]")
*error.getMessage() = QString("There is no preset [%1, %2, %3 %4]")
.arg(*presetIdentifier->getGroupName())
.arg(presetIdentifier->getCenterFrequency())
.arg(*presetIdentifier->getName());
.arg(*presetIdentifier->getName())
.arg(*presetIdentifier->getType());
return 404;
}
else // update existing preset
@@ -786,7 +826,8 @@ int WebAPIAdapterGUI::instancePresetPost(
const Preset *selectedPreset = m_mainWindow.m_settings.getPreset(*presetIdentifier->getGroupName(),
deviceCenterFrequency,
*presetIdentifier->getName());
*presetIdentifier->getName(),
*presetIdentifier->getType());
if (selectedPreset == 0) // save on a new preset
{
@@ -795,10 +836,11 @@ int WebAPIAdapterGUI::instancePresetPost(
else
{
error.init();
*error.getMessage() = QString("Preset already exists [%1, %2, %3]")
*error.getMessage() = QString("Preset already exists [%1, %2, %3 %4]")
.arg(*presetIdentifier->getGroupName())
.arg(deviceCenterFrequency)
.arg(*presetIdentifier->getName());
.arg(*presetIdentifier->getName())
.arg(*presetIdentifier->getType());
return 409;
}
@@ -820,14 +862,16 @@ int WebAPIAdapterGUI::instancePresetDelete(
{
const Preset *selectedPreset = m_mainWindow.m_settings.getPreset(*response.getGroupName(),
response.getCenterFrequency(),
*response.getName());
*response.getName(),
*response.getType());
if (selectedPreset == 0)
{
*error.getMessage() = QString("There is no preset [%1, %2, %3]")
*error.getMessage() = QString("There is no preset [%1, %2, %3 %4]")
.arg(*response.getGroupName())
.arg(response.getCenterFrequency())
.arg(*response.getName());
.arg(*response.getName())
.arg(*response.getType());
return 404;
}
@@ -852,12 +896,12 @@ int WebAPIAdapterGUI::instanceDeviceSetsGet(
}
int WebAPIAdapterGUI::instanceDeviceSetPost(
bool tx,
int direction,
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
MainWindow::MsgAddDeviceSet *msg = MainWindow::MsgAddDeviceSet::create(tx);
MainWindow::MsgAddDeviceSet *msg = MainWindow::MsgAddDeviceSet::create(direction);
m_mainWindow.m_inputMessageQueue.push(msg);
response.init();
@@ -972,34 +1016,40 @@ int WebAPIAdapterGUI::devicesetDevicePut(
for (int i = 0; i < nbSamplingDevices; i++)
{
int tx;
const PluginInterface::SamplingDevice *samplingDevice;
if (query.getDirection() == 0) {
if (query.getDirection() == 0)
{
tx = 0;
} else if (query.getDirection() == 1) {
samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(i);
}
else if (query.getDirection() == 1)
{
tx = 1;
} else {
samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(i);
}
else
{
continue; // TODO: any device (2) not supported yet
}
PluginInterface::SamplingDevice samplingDevice = query.getDirection() == 0 ? DeviceEnumerator::instance()->getRxSamplingDevice(i) : DeviceEnumerator::instance()->getTxSamplingDevice(i);
if (query.getDisplayedName() && (*query.getDisplayedName() != samplingDevice.displayedName)) {
if (query.getDisplayedName() && (*query.getDisplayedName() != samplingDevice->displayedName)) {
continue;
}
if (query.getHwType() && (*query.getHwType() != samplingDevice.hardwareId)) {
if (query.getHwType() && (*query.getHwType() != samplingDevice->hardwareId)) {
continue;
}
if ((query.getSequence() >= 0) && (query.getSequence() != samplingDevice.sequence)) {
if ((query.getSequence() >= 0) && (query.getSequence() != samplingDevice->sequence)) {
continue;
}
if (query.getSerial() && (*query.getSerial() != samplingDevice.serial)) {
if (query.getSerial() && (*query.getSerial() != samplingDevice->serial)) {
continue;
}
if ((query.getDeviceStreamIndex() >= 0) && (query.getDeviceStreamIndex() != samplingDevice.deviceItemIndex)) {
if ((query.getDeviceStreamIndex() >= 0) && (query.getDeviceStreamIndex() != samplingDevice->deviceItemIndex)) {
continue;
}
@@ -1007,13 +1057,13 @@ int WebAPIAdapterGUI::devicesetDevicePut(
m_mainWindow.m_inputMessageQueue.push(msg);
response.init();
*response.getDisplayedName() = samplingDevice.displayedName;
*response.getHwType() = samplingDevice.hardwareId;
*response.getSerial() = samplingDevice.serial;
response.setSequence(samplingDevice.sequence);
*response.getDisplayedName() = samplingDevice->displayedName;
*response.getHwType() = samplingDevice->hardwareId;
*response.getSerial() = samplingDevice->serial;
response.setSequence(samplingDevice->sequence);
response.setDirection(tx);
response.setDeviceNbStreams(samplingDevice.deviceNbItems);
response.setDeviceStreamIndex(samplingDevice.deviceItemIndex);
response.setDeviceNbStreams(samplingDevice->deviceNbItems);
response.setDeviceStreamIndex(samplingDevice->deviceItemIndex);
response.setDeviceSetIndex(deviceSetIndex);
response.setIndex(i);