diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp index e37dc1108..8e77d2cce 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp @@ -69,6 +69,7 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks() i, PluginInterface::SamplingDevice::PhysicalDevice, false, + 1, 0)); } diff --git a/plugins/samplesink/filesink/filesinkplugin.cpp b/plugins/samplesink/filesink/filesinkplugin.cpp index ba328713b..5b8ef58f3 100644 --- a/plugins/samplesink/filesink/filesinkplugin.cpp +++ b/plugins/samplesink/filesink/filesinkplugin.cpp @@ -62,6 +62,7 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks() 0, PluginInterface::SamplingDevice::BuiltInDevice, false, + 1, 0)); return result; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index 98a9e4481..04cb1ecae 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -100,6 +100,7 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks() i, PluginInterface::SamplingDevice::PhysicalDevice, false, + 1, 0)); qDebug("HackRFOutputPlugin::enumSampleSinks: enumerated HackRF device #%d", i); diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index d6dd46ee6..3fad955c0 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -98,6 +98,7 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks() i, PluginInterface::SamplingDevice::PhysicalDevice, false, + limeSDRParams.m_nbTxChannels, j)); } } diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp index 776472ca0..ffaa23c14 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp @@ -76,6 +76,7 @@ PluginInterface::SamplingDevices PlutoSDROutputPlugin::enumSampleSinks() i, PluginInterface::SamplingDevice::PhysicalDevice, false, + 1, 0)); qDebug("PlutoSDROutputPlugin::enumSampleSources: enumerated PlutoSDR device #%d", i); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp index 99491d3e8..65e330910 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp @@ -63,6 +63,7 @@ PluginInterface::SamplingDevices SDRdaemonSinkPlugin::enumSampleSinks() 0, PluginInterface::SamplingDevice::BuiltInDevice, false, + 1, 0)); return result; diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index eccc2de54..43fe367a9 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -102,6 +102,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); qDebug("AirspyPlugin::enumSampleSources: enumerated Airspy device #%d", i); diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp index edf769473..e35097438 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp @@ -70,6 +70,7 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); } diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp index a813bdcb7..7b81c8f87 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.cpp +++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp @@ -68,6 +68,7 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); device_info = device_info->next; diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp index 4a5c58d29..419563aa6 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp @@ -70,6 +70,7 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); device_info = device_info->next; diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index a749a2ae6..6d7b07c0b 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -62,6 +62,7 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources() 0, PluginInterface::SamplingDevice::BuiltInDevice, true, + 1, 0)); return result; diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index 728f3e0c1..5bd613327 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -101,6 +101,7 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); qDebug("HackRFPlugin::enumSampleSources: enumerated HackRF device #%d", i); diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index e4c8475e7..9a92c8536 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -98,6 +98,7 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + limeSDRParams.m_nbRxChannels, j)); } } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp index 10711d61c..2f9847eec 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp @@ -76,6 +76,7 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); qDebug("PlutoSDRInputPlugin::enumSampleSources: enumerated PlutoSDR device #%d", i); diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index 8cc93407a..e96a7f6b5 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -60,6 +60,7 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); } return result; diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp index 9b4c7e989..00fa7a77f 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp @@ -63,6 +63,7 @@ PluginInterface::SamplingDevices SDRdaemonSourcePlugin::enumSampleSources() 0, PluginInterface::SamplingDevice::BuiltInDevice, true, + 1, 0)); return result; diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp index f2030a4e3..30902facc 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp +++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp @@ -80,6 +80,7 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources() i, PluginInterface::SamplingDevice::PhysicalDevice, true, + 1, 0)); } diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp index 6707723e6..f665965a7 100644 --- a/sdrbase/device/devicesinkapi.cpp +++ b/sdrbase/device/devicesinkapi.cpp @@ -27,6 +27,7 @@ DeviceSinkAPI::DeviceSinkAPI(int deviceTabIndex, m_deviceTabIndex(deviceTabIndex), m_deviceSinkEngine(deviceSinkEngine), m_sampleSinkSequence(0), + m_nbItems(1), m_itemIndex(0), m_pluginInterface(0), m_sampleSinkPluginInstanceUI(0), @@ -160,6 +161,11 @@ void DeviceSinkAPI::setSampleSinkSequence(int sequence) m_deviceSinkEngine->setSinkSequence(sequence); } +void DeviceSinkAPI::setNbItems(uint32_t nbItems) +{ + m_nbItems = nbItems; +} + void DeviceSinkAPI::setItemIndex(uint32_t index) { m_itemIndex = index; @@ -175,6 +181,38 @@ void DeviceSinkAPI::setSampleSinkPluginInstanceUI(PluginInstanceGUI *gui) m_sampleSinkPluginInstanceUI = gui; } +void DeviceSinkAPI::getDeviceEngineStateStr(QString& state) +{ + if (m_deviceSinkEngine) + { + switch(m_deviceSinkEngine->state()) + { + case DSPDeviceSinkEngine::StNotStarted: + state = "notStarted"; + break; + case DSPDeviceSinkEngine::StIdle: + state = "idle"; + break; + case DSPDeviceSinkEngine::StReady: + state = "ready"; + break; + case DSPDeviceSinkEngine::StRunning: + state = "running"; + break; + case DSPDeviceSinkEngine::StError: + state = "error"; + break; + default: + state = "notStarted"; + break; + } + } + else + { + state = "notStarted"; + } +} + void DeviceSinkAPI::loadSinkSettings(const Preset* preset) { if (preset->isSourcePreset()) diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index aebd8c67e..ed1957073 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -66,6 +66,7 @@ public: void setSampleSinkSerial(const QString& serial); void setSampleSinkDisplayName(const QString& serial); void setSampleSinkSequence(int sequence); + void setNbItems(uint32_t nbItems); void setItemIndex(uint32_t index); void setSampleSinkPluginInterface(PluginInterface *iface); void setSampleSinkPluginInstanceUI(PluginInstanceGUI *gui); @@ -75,9 +76,11 @@ public: const QString& getSampleSinkSerial() const { return m_sampleSinkSerial; } const QString& getSampleSinkDisplayName() const { return m_sampleSinkDisplayName; } uint32_t getSampleSinkSequence() const { return m_sampleSinkSequence; } + uint32_t getNbItems() const { return m_nbItems; } uint32_t getItemIndex() const { return m_itemIndex; } PluginInterface *getPluginInterface() { return m_pluginInterface; } PluginInstanceGUI *getSampleSinkPluginInstanceGUI() { return m_sampleSinkPluginInstanceUI; } + void getDeviceEngineStateStr(QString& state); void registerChannelInstance(const QString& channelName, PluginInstanceGUI* pluginGUI); void removeChannelInstance(PluginInstanceGUI* pluginGUI); @@ -111,7 +114,8 @@ protected: QString m_sampleSinkSerial; //!< The device serial number defined by the vendor QString m_sampleSinkDisplayName; //!< The human readable name identifying this instance uint32_t m_sampleSinkSequence; //!< The device sequence. >0 when more than one device of the same type is connected - uint32_t m_itemIndex; //!< The Rx stream index. Can be >0 for NxM devices (i.e. 0 or 1 for LimeSDR) + uint32_t m_nbItems; //!< Number of items or streams in the device. Can be >1 for NxM devices (i.e. 2 for LimeSDR) + uint32_t m_itemIndex; //!< The Tx stream index. Can be >0 for NxM devices (i.e. 0 or 1 for LimeSDR) PluginInterface* m_pluginInterface; PluginInstanceGUI* m_sampleSinkPluginInstanceUI; diff --git a/sdrbase/device/devicesourceapi.cpp b/sdrbase/device/devicesourceapi.cpp index fe058ceb4..5119296bb 100644 --- a/sdrbase/device/devicesourceapi.cpp +++ b/sdrbase/device/devicesourceapi.cpp @@ -27,6 +27,7 @@ DeviceSourceAPI::DeviceSourceAPI(int deviceTabIndex, m_deviceTabIndex(deviceTabIndex), m_deviceSourceEngine(deviceSourceEngine), m_sampleSourceSequence(0), + m_nbItems(1), m_itemIndex(0), m_pluginInterface(0), m_sampleSourcePluginInstanceUI(0), @@ -152,6 +153,11 @@ void DeviceSourceAPI::setSampleSourceSequence(int sequence) m_deviceSourceEngine->setSourceSequence(sequence); } +void DeviceSourceAPI::setNbItems(uint32_t nbItems) +{ + m_nbItems = nbItems; +} + void DeviceSourceAPI::setItemIndex(uint32_t index) { m_itemIndex = index; @@ -167,6 +173,38 @@ void DeviceSourceAPI::setSampleSourcePluginInstanceGUI(PluginInstanceGUI *gui) m_sampleSourcePluginInstanceUI = gui; } +void DeviceSourceAPI::getDeviceEngineStateStr(QString& state) +{ + if (m_deviceSourceEngine) + { + switch(m_deviceSourceEngine->state()) + { + case DSPDeviceSourceEngine::StNotStarted: + state = "notStarted"; + break; + case DSPDeviceSourceEngine::StIdle: + state = "idle"; + break; + case DSPDeviceSourceEngine::StReady: + state = "ready"; + break; + case DSPDeviceSourceEngine::StRunning: + state = "running"; + break; + case DSPDeviceSourceEngine::StError: + state = "error"; + break; + default: + state = "notStarted"; + break; + } + } + else + { + state = "notStarted"; + } +} + void DeviceSourceAPI::loadSourceSettings(const Preset* preset) { if (preset->isSourcePreset()) diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h index 516b0c61e..9e6f52867 100644 --- a/sdrbase/device/devicesourceapi.h +++ b/sdrbase/device/devicesourceapi.h @@ -66,6 +66,7 @@ public: void setSampleSourceSerial(const QString& serial); void setSampleSourceDisplayName(const QString& serial); void setSampleSourceSequence(int sequence); + void setNbItems(uint32_t nbItems); void setItemIndex(uint32_t index); void setSampleSourcePluginInterface(PluginInterface *iface); void setSampleSourcePluginInstanceGUI(PluginInstanceGUI *gui); @@ -75,9 +76,11 @@ public: const QString& getSampleSourceSerial() const { return m_sampleSourceSerial; } const QString& getSampleSourceDisplayName() const { return m_sampleSourceDisplayName; } uint32_t getSampleSourceSequence() const { return m_sampleSourceSequence; } + uint32_t getNbItems() const { return m_nbItems; } uint32_t getItemIndex() const { return m_itemIndex; } PluginInterface *getPluginInterface() { return m_pluginInterface; } PluginInstanceGUI *getSampleSourcePluginInstanceGUI() { return m_sampleSourcePluginInstanceUI; } + void getDeviceEngineStateStr(QString& state); void loadSourceSettings(const Preset* preset); void saveSourceSettings(Preset* preset); @@ -107,6 +110,7 @@ protected: QString m_sampleSourceSerial; //!< The device serial number defined by the vendor or a fake one (SDRplay) QString m_sampleSourceDisplayName; //!< The human readable name identifying this instance uint32_t m_sampleSourceSequence; //!< The device sequence. >0 when more than one device of the same type is connected + uint32_t m_nbItems; //!< Number of items or streams in the device. Can be >1 for NxM devices (i.e. 2 for LimeSDR) uint32_t m_itemIndex; //!< The Rx stream index. Can be >0 for NxM devices (i.e. 0 or 1 for LimeSDR) PluginInterface* m_pluginInterface; PluginInstanceGUI* m_sampleSourcePluginInstanceUI; diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index 822952fc1..9299f08fb 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -42,6 +42,7 @@ public: int sequence; //!< The device sequence. >0 when more than one device of the same type is connected SamplingDeviceType type; //!< The sampling device type for behavior information bool rxElseTx; //!< This is the Rx part else the Tx part of the device + int deviceNbItems; //!< Number of items (or streams) in the device. >1 for composite devices. int deviceItemIndex; //!< For composite devices this is the Rx or Tx stream index. -1 if not initialized int claimed; //!< This is the device set index if claimed else -1 @@ -52,6 +53,7 @@ public: int _sequence, SamplingDeviceType _type, bool _rxElseTx, + int _deviceNbItems, int _deviceItemIndex) : displayedName(_displayedName), hardwareId(_hardwareId), @@ -60,6 +62,7 @@ public: sequence(_sequence), type(_type), rxElseTx(_rxElseTx), + deviceNbItems(_deviceNbItems), deviceItemIndex(_deviceItemIndex), claimed(-1) { } diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 0e5f3c316..4e573951b 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -38,18 +38,26 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http if (path == WebAPIAdapterInterface::instanceSummaryURL) { - Swagger::SWGInstanceSummaryResponse normalResponse; - Swagger::SWGErrorResponse errorResponse; + if (request.getMethod() == "GET") + { + Swagger::SWGInstanceSummaryResponse normalResponse; + Swagger::SWGErrorResponse errorResponse; - int status = m_adapter->instanceSummary(normalResponse, errorResponse); + int status = m_adapter->instanceSummary(normalResponse, errorResponse); - if (status == 200) { - response.write(normalResponse.asJson().toUtf8()); - } else { - response.write(errorResponse.asJson().toUtf8()); + if (status == 200) { + response.write(normalResponse.asJson().toUtf8()); + } else { + response.write(errorResponse.asJson().toUtf8()); + } + + response.setStatus(status); + } + else + { + response.write("Invalid HTTP method"); + response.setStatus(405,"Invalid HTTP method"); } - - response.setStatus(status); } else { diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index c9f73ff25..4adb77666 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -162,6 +162,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); + m_deviceUIs.back()->m_deviceSourceAPI->setNbItems(samplingDevice.deviceItemIndex); m_deviceUIs.back()->m_deviceSourceAPI->setItemIndex(samplingDevice.deviceItemIndex); m_deviceUIs.back()->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); @@ -265,6 +266,7 @@ void MainWindow::addSourceDevice() int fileSourceDeviceIndex = DeviceEnumerator::instance()->getFileSourceDeviceIndex(); PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(fileSourceDeviceIndex); m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); + m_deviceUIs.back()->m_deviceSourceAPI->setNbItems(samplingDevice.deviceNbItems); m_deviceUIs.back()->m_deviceSourceAPI->setItemIndex(samplingDevice.deviceItemIndex); m_deviceUIs.back()->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); @@ -335,6 +337,7 @@ void MainWindow::addSinkDevice() int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); + m_deviceUIs.back()->m_deviceSinkAPI->setNbItems(samplingDevice.deviceNbItems); m_deviceUIs.back()->m_deviceSinkAPI->setItemIndex(samplingDevice.deviceItemIndex); m_deviceUIs.back()->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); @@ -933,6 +936,7 @@ void MainWindow::on_sampleSource_changed() PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex()); deviceUI->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); + deviceUI->m_deviceSourceAPI->setNbItems(samplingDevice.deviceNbItems); deviceUI->m_deviceSourceAPI->setItemIndex(samplingDevice.deviceItemIndex); deviceUI->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); deviceUI->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); @@ -1020,6 +1024,7 @@ void MainWindow::on_sampleSink_changed() PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex()); deviceUI->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); + deviceUI->m_deviceSinkAPI->setNbItems(samplingDevice.deviceNbItems); deviceUI->m_deviceSinkAPI->setItemIndex(samplingDevice.deviceItemIndex); deviceUI->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); deviceUI->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp index 195cabade..a294f7919 100644 --- a/sdrgui/webapi/webapiadaptergui.cpp +++ b/sdrgui/webapi/webapiadaptergui.cpp @@ -19,10 +19,18 @@ #include #include "mainwindow.h" -#include "webapiadaptergui.h" +#include "loggerwithfile.h" +#include "device/devicesourceapi.h" +#include "device/devicesinkapi.h" +#include "device/deviceuiset.h" +#include "dsp/devicesamplesource.h" +#include "dsp/devicesamplesink.h" + #include "SWGInstanceSummaryResponse.h" #include "SWGErrorResponse.h" +#include "webapiadaptergui.h" + WebAPIAdapterGUI::WebAPIAdapterGUI(MainWindow& mainWindow) : m_mainWindow(mainWindow) { @@ -38,8 +46,67 @@ int WebAPIAdapterGUI::instanceSummary( { *response.getVersion() = qApp->applicationVersion(); + + Swagger::SWGLoggingInfo *logging = response.getLogging(); + logging->init(); + logging->setDumpToFile(m_mainWindow.m_logger->getUseFileLogger()); + if (logging->getDumpToFile()) { + m_mainWindow.m_logger->getLogFileName(*logging->getFileName()); + m_mainWindow.m_logger->getFileMinMessageLevelStr(*logging->getFileLevel()); + } + m_mainWindow.m_logger->getConsoleMinMessageLevelStr(*logging->getConsoleLevel()); + Swagger::SWGDeviceSetList *deviceSetList = response.getDevicesetlist(); - deviceSetList->setDevicesetcount(0); + deviceSetList->init(); + deviceSetList->setDevicesetcount((int) m_mainWindow.m_deviceUIs.size()); + + std::vector::const_iterator it = m_mainWindow.m_deviceUIs.begin(); + + for (int i = 0; it != m_mainWindow.m_deviceUIs.end(); ++it, i++) + { + QList *deviceSet = deviceSetList->getDeviceSets(); + deviceSet->append(new Swagger::SWGDeviceSet()); + Swagger::SWGSamplingDevice *samplingDevice = deviceSet->back()->getSamplingDevice(); + samplingDevice->init(); + samplingDevice->setIndex(i); + samplingDevice->setTx((*it)->m_deviceSinkEngine != 0); + + if ((*it)->m_deviceSinkEngine) // Tx data + { + *samplingDevice->getHwType() = (*it)->m_deviceSinkAPI->getHardwareId(); + *samplingDevice->getSerial() = (*it)->m_deviceSinkAPI->getSampleSinkSerial(); + samplingDevice->setSequence((*it)->m_deviceSinkAPI->getSampleSinkSequence()); + samplingDevice->setNbStreams((*it)->m_deviceSinkAPI->getNbItems()); + samplingDevice->setStreamIndex((*it)->m_deviceSinkAPI->getItemIndex()); + (*it)->m_deviceSinkAPI->getDeviceEngineStateStr(*samplingDevice->getState()); + DeviceSampleSink *sampleSink = (*it)->m_deviceSinkEngine->getSink(); + + if (sampleSink) { + samplingDevice->setCenterFrequency(sampleSink->getCenterFrequency()); + samplingDevice->setBandwidth(sampleSink->getSampleRate()); + } + + deviceSet->back()->setChannelcount(0); + } + + if ((*it)->m_deviceSourceEngine) // Rx data + { + *samplingDevice->getHwType() = (*it)->m_deviceSourceAPI->getHardwareId(); + *samplingDevice->getSerial() = (*it)->m_deviceSourceAPI->getSampleSourceSerial(); + samplingDevice->setSequence((*it)->m_deviceSourceAPI->getSampleSourceSequence()); + samplingDevice->setNbStreams((*it)->m_deviceSourceAPI->getNbItems()); + samplingDevice->setStreamIndex((*it)->m_deviceSourceAPI->getItemIndex()); + (*it)->m_deviceSourceAPI->getDeviceEngineStateStr(*samplingDevice->getState()); + DeviceSampleSource *sampleSource = (*it)->m_deviceSourceEngine->getSource(); + + if (sampleSource) { + samplingDevice->setCenterFrequency(sampleSource->getCenterFrequency()); + samplingDevice->setBandwidth(sampleSource->getSampleRate()); + } + + deviceSet->back()->setChannelcount(0); + } + } return 200; } diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index b36dbf3c3..901285127 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -561,6 +561,7 @@ definitions: - serial - centerFrequency - bandwidth + - state properties: index: description: "Index in the list of device sets opened in this instance" @@ -590,6 +591,9 @@ definitions: bandwidth: description: "Bandwidth in Hz or complex S/s of baseband" type: integer + state: + description: "State: notStarted, idle, ready, running, error" + type: string Channel: description: "Channel summarized information" required: diff --git a/swagger/sdrangel/code/html2/.swagger-codegen/VERSION b/swagger/sdrangel/code/html2/.swagger-codegen/VERSION new file mode 100644 index 000000000..6b4d15773 --- /dev/null +++ b/swagger/sdrangel/code/html2/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3 \ No newline at end of file diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 14f1dfe12..e8f7bfde0 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -6,17 +6,14 @@ - - - - - - - - + + - - + -
+
- +
+
+
+

SDRangel

+
+
-
-
-
-

SDRangel

-
-
-
- - - - - -
- - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceAudioGet-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceAudioGet-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ +
+
+
+
- - - - - - - -
- - - - -
- - - - - - - - - - - -
- -
- - - - - - - - -
- -
-
-

instanceAudioPatch

-
-
- -
-
- -

-

Set audio devices

-

-
- -
/sdrangel/audio
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X patch -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/audio"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X PATCH "http://localhost:10010/sdrangel/audio"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -1706,15 +1554,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -1729,21 +1573,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-AudioDevicesSelect *body = ; // Select audio devices to use for this instance
+}
+
+ +
+
AudioDevicesSelect *body = ; // Select audio devices to use for this instance
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -1756,14 +1593,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var body = ; // {AudioDevicesSelect} Select audio devices to use for this instance
 
@@ -1776,21 +1612,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceAudioPatch(body, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -1814,17 +1647,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $body = ; // AudioDevicesSelect | Select audio devices to use for this instance
 
 try {
@@ -1833,37 +1663,62 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceAudioPatch: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $body = WWW::SwaggerClient::Object::AudioDevicesSelect->new(); # AudioDevicesSelect | Select audio devices to use for this instance + +eval { + my $result = $api_instance->instanceAudioPatch(body => $body); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceAudioPatch: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+body =  # AudioDevicesSelect | Select audio devices to use for this instance
+
+try: 
+    api_response = api_instance.instance_audio_patch(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceAudioPatch: %s\n" % e)
+
+ + +

Parameters

- - -

Parameters

- - - - - - -
Body parameters
- - - - - - - +
Body parameters
+
NameDescription
body *
+ + + + + - -
NameDescription
body * -
+ var view = new JSONSchemaView(schema,2,{isBodyParam: true}); + var result = $('#d2e199_instanceAudioPatch_body'); + result.empty(); + result.append(view.render()); +}); + +
- - -

Responses

- -

Status: 200 - Success

- - + +

Responses

+

Status: 200 - Success

+ - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceAudioPatch-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceAudioPatch-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
+
+

instanceChannels

+

+
+
+
+

+

Get a list of channel plugins available in this instance

+

+
+
/sdrangel/channels
+

+

Usage and SDK Samples

+

+ - - - }); - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceChannels

-
-
- -
-
- -

-

Get a list of channel plugins available in this instance

-

-
- -
/sdrangel/channels
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X get -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/channels?tx="
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X GET "http://localhost:10010/sdrangel/channels?tx="
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -2168,15 +1906,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -2191,21 +1925,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-Boolean *tx = true; // Set to true for Tx channels (optional)
+}
+
+ +
+
Boolean *tx = true; // Set to true for Tx channels (optional)
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -2218,14 +1945,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var opts = { 
   'tx': true // {Boolean} Set to true for Tx channels
@@ -2239,21 +1965,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceChannels(opts, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -2277,17 +2000,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $tx = true; // Boolean | Set to true for Tx channels
 
 try {
@@ -2296,311 +2016,216 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceChannels: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $tx = true; # Boolean | Set to true for Tx channels + +eval { + my $result = $api_instance->instanceChannels(tx => $tx); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceChannels: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+tx = true # Boolean | Set to true for Tx channels (optional)
+
+try: 
+    api_response = api_instance.instance_channels(tx=tx)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceChannels: %s\n" % e)
+
+ + +

Parameters

-

Parameters

- - - - - - - -
Query parameters
- - - - - - - +
Query parameters
+
NameDescription
tx
+ + + + + -
NameDescription
tx - -
+
+ Set to true for Tx channels +
+ + +
+ -

Responses

+

Responses

+

Status: 200 - Success

-

Status: 200 - Success

+ - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceChannels-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceChannels-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
+
+

instanceDVSerialPatch

+

+
+
+
+

+

Set or reset DV serial processing for AMBE frames decoding in digital voice modes

+

+
+
/sdrangel/dvserial
+

+

Usage and SDK Samples

+

+ - - - }); - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceDVSerialPatch

-
-
- -
-
- -

-

Set or reset DV serial processing for AMBE frames decoding in digital voice modes

-

-
- -
/sdrangel/dvserial
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X patch -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/dvserial?dvserial="
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X PATCH "http://localhost:10010/sdrangel/dvserial?dvserial="
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -2619,15 +2244,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -2642,21 +2263,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-Boolean *dvserial = true; // Set to true to set DV serial processing (optional)
+}
+
+ +
+
Boolean *dvserial = true; // Set to true to set DV serial processing (optional)
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -2669,14 +2283,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var opts = { 
   'dvserial': true // {Boolean} Set to true to set DV serial processing
@@ -2690,21 +2303,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceDVSerialPatch(opts, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -2728,17 +2338,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $dvserial = true; // Boolean | Set to true to set DV serial processing
 
 try {
@@ -2747,311 +2354,216 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceDVSerialPatch: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $dvserial = true; # Boolean | Set to true to set DV serial processing + +eval { + my $result = $api_instance->instanceDVSerialPatch(dvserial => $dvserial); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceDVSerialPatch: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+dvserial = true # Boolean | Set to true to set DV serial processing (optional)
+
+try: 
+    api_response = api_instance.instance_dv_serial_patch(dvserial=dvserial)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceDVSerialPatch: %s\n" % e)
+
+ + +

Parameters

-

Parameters

- - - - - - - -
Query parameters
- - - - - - - +
Query parameters
+
NameDescription
dvserial
+ + + + + -
NameDescription
dvserial - -
+
+ Set to true to set DV serial processing +
+ + +
+ -

Responses

+

Responses

+

Status: 200 - On success return list of devices or empty list if unset

-

Status: 200 - On success return list of devices or empty list if unset

+ - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceDVSerialPatch-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceDVSerialPatch-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceDeviceSetsDelete

-
-
- -
-
- -

-

Remove last device set

-

-
- -
/sdrangel/devicesets
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X delete -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/devicesets"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X DELETE "http://localhost:10010/sdrangel/devicesets"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -3069,15 +2581,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -3091,21 +2599,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-
+}
+
+ +
+

 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
 [apiInstance instanceDeviceSetsDeleteWithCompletionHandler: 
@@ -3117,14 +2618,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var callback = function(error, data, response) {
   if (error) {
@@ -3134,21 +2634,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceDeviceSetsDelete(callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -3171,17 +2668,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 
 try {
     $result = $api_instance->instanceDeviceSetsDelete();
@@ -3189,346 +2683,195 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceDeviceSetsDelete: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +eval { + my $result = $api_instance->instanceDeviceSetsDelete(); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceDeviceSetsDelete: $@\n"; +} +
+
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
 
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
 
+try: 
+    api_response = api_instance.instance_device_sets_delete()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceDeviceSetsDelete: %s\n" % e)
+
+ -

Parameters

+

Parameters

+

Responses

+

Status: 200 - On success return new list of device sets

+ -

Status: 200 - On success return new list of device sets

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 404 - No more device sets opened in this instance

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+ +

Status: 404 - No more device sets opened in this instance

+ + + +
+
+ +

Status: 500 - Error

+ + + +
+
+
+ +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceDeviceSetsDelete-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceDeviceSetsDelete-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
+
+

instanceDeviceSetsGet

+

+
+
+
+

+

Get summary information about device sets opened in the instance

+

+
+
/sdrangel/devicesets
+

+

Usage and SDK Samples

+

+ - - - }); - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceDeviceSetsGet

-
-
- -
-
- -

-

Get summary information about device sets opened in the instance

-

-
- -
/sdrangel/devicesets
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X get -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/devicesets"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X GET "http://localhost:10010/sdrangel/devicesets"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -3546,15 +2889,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -3568,21 +2907,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-
+}
+
+ +
+

 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
 [apiInstance instanceDeviceSetsGetWithCompletionHandler: 
@@ -3594,14 +2926,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var callback = function(error, data, response) {
   if (error) {
@@ -3611,21 +2942,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceDeviceSetsGet(callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -3648,17 +2976,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 
 try {
     $result = $api_instance->instanceDeviceSetsGet();
@@ -3666,270 +2991,187 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceDeviceSetsGet: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +eval { + my $result = $api_instance->instanceDeviceSetsGet(); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceDeviceSetsGet: $@\n"; +} +
+
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
 
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
 
+try: 
+    api_response = api_instance.instance_device_sets_get()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceDeviceSetsGet: %s\n" % e)
+
+ -

Parameters

+

Parameters

+

Responses

+

Status: 200 - On success return device set list

+ -

Status: 200 - On success return device set list

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceDeviceSetsGet-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceDeviceSetsGet-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceDeviceSetsPost

-
-
- -
-
- -

-

Add (append) a new device set

-

-
- -
/sdrangel/devicesets
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X post -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/devicesets?tx="
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X POST "http://localhost:10010/sdrangel/devicesets?tx="
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -3948,15 +3190,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -3971,21 +3209,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-Boolean *tx = true; // Set to true for a Tx device set (optional)
+}
+
+ +
+
Boolean *tx = true; // Set to true for a Tx device set (optional)
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -3998,14 +3229,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var opts = { 
   'tx': true // {Boolean} Set to true for a Tx device set
@@ -4019,21 +3249,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceDeviceSetsPost(opts, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -4057,17 +3284,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $tx = true; // Boolean | Set to true for a Tx device set
 
 try {
@@ -4076,311 +3300,216 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceDeviceSetsPost: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $tx = true; # Boolean | Set to true for a Tx device set + +eval { + my $result = $api_instance->instanceDeviceSetsPost(tx => $tx); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceDeviceSetsPost: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+tx = true # Boolean | Set to true for a Tx device set (optional)
+
+try: 
+    api_response = api_instance.instance_device_sets_post(tx=tx)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceDeviceSetsPost: %s\n" % e)
+
+ + +

Parameters

-

Parameters

- - - - - - - -
Query parameters
- - - - - - - +
Query parameters
+
NameDescription
tx
+ + + + + -
NameDescription
tx - -
+
+ Set to true for a Tx device set +
+ + +
+ -

Responses

+

Responses

+

Status: 200 - On success return new device set

-

Status: 200 - On success return new device set

+ - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceDeviceSetsPost-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceDeviceSetsPost-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
+
+

instanceDevices

+

+
+
+
+

+

Get a list of sampling devices that can be used to take part in a device set

+

+
+
/sdrangel/devices
+

+

Usage and SDK Samples

+

+ - - - }); - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceDevices

-
-
- -
-
- -

-

Get a list of sampling devices that can be used to take part in a device set

-

-
- -
/sdrangel/devices
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X get -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/devices?tx="
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X GET "http://localhost:10010/sdrangel/devices?tx="
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -4399,15 +3528,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -4422,21 +3547,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-Boolean *tx = true; // Set to true for Tx direction (optional)
+}
+
+ +
+
Boolean *tx = true; // Set to true for Tx direction (optional)
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -4449,14 +3567,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var opts = { 
   'tx': true // {Boolean} Set to true for Tx direction
@@ -4470,21 +3587,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceDevices(opts, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -4508,17 +3622,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $tx = true; // Boolean | Set to true for Tx direction
 
 try {
@@ -4527,311 +3638,216 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceDevices: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $tx = true; # Boolean | Set to true for Tx direction + +eval { + my $result = $api_instance->instanceDevices(tx => $tx); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceDevices: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+tx = true # Boolean | Set to true for Tx direction (optional)
+
+try: 
+    api_response = api_instance.instance_devices(tx=tx)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceDevices: %s\n" % e)
+
+ + +

Parameters

-

Parameters

- - - - - - - -
Query parameters
- - - - - - - +
Query parameters
+
NameDescription
tx
+ + + + + -
NameDescription
tx - -
+
+ Set to true for Tx direction +
+ + +
+ -

Responses

+

Responses

+

Status: 200 - Success

-

Status: 200 - Success

+ - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceDevices-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceDevices-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceLocationGet

-
-
- -
-
- -

-

Get instance geolocation information

-

-
- -
/sdrangel/location
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X get -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/location"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X GET "http://localhost:10010/sdrangel/location"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -4849,15 +3865,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -4871,21 +3883,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-
+}
+
+ +
+

 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
 [apiInstance instanceLocationGetWithCompletionHandler: 
@@ -4897,14 +3902,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var callback = function(error, data, response) {
   if (error) {
@@ -4914,21 +3918,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceLocationGet(callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -4951,17 +3952,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 
 try {
     $result = $api_instance->instanceLocationGet();
@@ -4969,270 +3967,187 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceLocationGet: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +eval { + my $result = $api_instance->instanceLocationGet(); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceLocationGet: $@\n"; +} +
+
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
 
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
 
+try: 
+    api_response = api_instance.instance_location_get()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceLocationGet: %s\n" % e)
+
+ -

Parameters

+

Parameters

+

Responses

+

Status: 200 - On success return location

+ -

Status: 200 - On success return location

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceLocationGet-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceLocationGet-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceLocationPut

-
-
- -
-
- -

-

Set instance geolocation information

-

-
- -
/sdrangel/location
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X put -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/location"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X PUT "http://localhost:10010/sdrangel/location"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -5251,15 +4166,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -5274,21 +4185,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-LocationInformation *body = ; // Location of instance in latitude and longitude
+}
+
+ +
+
LocationInformation *body = ; // Location of instance in latitude and longitude
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -5301,14 +4205,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var body = ; // {LocationInformation} Location of instance in latitude and longitude
 
@@ -5321,21 +4224,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceLocationPut(body, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -5359,17 +4259,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $body = ; // LocationInformation | Location of instance in latitude and longitude
 
 try {
@@ -5378,37 +4275,62 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceLocationPut: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $body = WWW::SwaggerClient::Object::LocationInformation->new(); # LocationInformation | Location of instance in latitude and longitude + +eval { + my $result = $api_instance->instanceLocationPut(body => $body); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceLocationPut: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+body =  # LocationInformation | Location of instance in latitude and longitude
+
+try: 
+    api_response = api_instance.instance_location_put(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceLocationPut: %s\n" % e)
+
+ + +

Parameters

- - -

Parameters

- - - - - - -
Body parameters
- - - - - - - +
Body parameters
+
NameDescription
body *
+ + + + + - -
NameDescription
body * -
+ var view = new JSONSchemaView(schema,2,{isBodyParam: true}); + var result = $('#d2e199_instanceLocationPut_body'); + result.empty(); + result.append(view.render()); +}); + +
- - -

Responses

- -

Status: 200 - On success return location

- - + +

Responses

+

Status: 200 - On success return location

+ - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 400 - Location invalid

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+ +

Status: 400 - Location invalid

+ + + +
+
+ +

Status: 500 - Error

+ + + +
+
+
+ +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceLocationPut-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceLocationPut-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceLoggingGet

-
-
- -
-
- -

-

Get logging information for this instance

-

-
- -
/sdrangel/logging
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X get -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/logging"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X GET "http://localhost:10010/sdrangel/logging"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -5788,15 +4525,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -5810,21 +4543,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-
+}
+
+ +
+

 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
 [apiInstance instanceLoggingGetWithCompletionHandler: 
@@ -5836,14 +4562,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var callback = function(error, data, response) {
   if (error) {
@@ -5853,21 +4578,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceLoggingGet(callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -5890,17 +4612,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 
 try {
     $result = $api_instance->instanceLoggingGet();
@@ -5908,270 +4627,187 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceLoggingGet: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +eval { + my $result = $api_instance->instanceLoggingGet(); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceLoggingGet: $@\n"; +} +
+
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
 
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
 
+try: 
+    api_response = api_instance.instance_logging_get()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceLoggingGet: %s\n" % e)
+
+ -

Parameters

+

Parameters

+

Responses

+

Status: 200 - Success

+ -

Status: 200 - Success

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceLoggingGet-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceLoggingGet-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
+
+

instanceLoggingPut

+

+
+
+
+

+

Change logging parmeters for this instance

+

+
+
/sdrangel/logging
+

+

Usage and SDK Samples

+

+ - - - }); - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceLoggingPut

-
-
- -
-
- -

-

Change logging parmeters for this instance

-

-
- -
/sdrangel/logging
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X put -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/logging"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X PUT "http://localhost:10010/sdrangel/logging"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -6190,15 +4826,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -6213,21 +4845,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-LoggingInfo *body = ; // Logging information
+}
+
+ +
+
LoggingInfo *body = ; // Logging information
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -6240,14 +4865,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var body = ; // {LoggingInfo} Logging information
 
@@ -6260,21 +4884,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceLoggingPut(body, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -6298,17 +4919,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $body = ; // LoggingInfo | Logging information
 
 try {
@@ -6317,37 +4935,62 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceLoggingPut: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $body = WWW::SwaggerClient::Object::LoggingInfo->new(); # LoggingInfo | Logging information + +eval { + my $result = $api_instance->instanceLoggingPut(body => $body); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceLoggingPut: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+body =  # LoggingInfo | Logging information
+
+try: 
+    api_response = api_instance.instance_logging_put(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceLoggingPut: %s\n" % e)
+
+ + +

Parameters

- - -

Parameters

- - - - - - -
Body parameters
- - - - - - - +
Body parameters
+
NameDescription
body *
+ + + + + - -
NameDescription
body * -
+ var view = new JSONSchemaView(schema,2,{isBodyParam: true}); + var result = $('#d2e199_instanceLoggingPut_body'); + result.empty(); + result.append(view.render()); +}); + +
- - -

Responses

- -

Status: 200 - Return new data on success

- - + +

Responses

+

Status: 200 - Return new data on success

+ - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 400 - Invallid data

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+ +

Status: 400 - Invallid data

+ + + +
+
+ +

Status: 500 - Error

+ + + +
+
+
+ +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instanceLoggingPut-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instanceLoggingPut-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instancePresetDelete

-
-
- -
-
- -

-

Deletes a preset

-

-
- -
/sdrangel/preset
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X delete -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/preset"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X DELETE "http://localhost:10010/sdrangel/preset"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -6728,15 +5186,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -6751,21 +5205,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-PresetIdentifier *body = ; // delete this preset
+}
+
+ +
+
PresetIdentifier *body = ; // delete this preset
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -6778,14 +5225,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var body = ; // {PresetIdentifier} delete this preset
 
@@ -6798,21 +5244,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instancePresetDelete(body, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -6836,17 +5279,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $body = ; // PresetIdentifier | delete this preset
 
 try {
@@ -6855,37 +5295,62 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instancePresetDelete: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $body = WWW::SwaggerClient::Object::PresetIdentifier->new(); # PresetIdentifier | delete this preset + +eval { + my $result = $api_instance->instancePresetDelete(body => $body); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instancePresetDelete: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+body =  # PresetIdentifier | delete this preset
+
+try: 
+    api_response = api_instance.instance_preset_delete(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instancePresetDelete: %s\n" % e)
+
+ + +

Parameters

- - -

Parameters

- - - - - - -
Body parameters
- - - - - - - +
Body parameters
+
NameDescription
body *
+ + + + + - -
NameDescription
body * -
+ var view = new JSONSchemaView(schema,2,{isBodyParam: true}); + var result = $('#d2e199_instancePresetDelete_body'); + result.empty(); + result.append(view.render()); +}); + +
- - -

Responses

- -

Status: 200 - On success return deleted preset identification

- - + +

Responses

+

Status: 200 - On success return deleted preset identification

+ - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 400 - Invalid frequency

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instancePresetDelete-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instancePresetDelete-schema-200'); - result.empty(); - result.append(view.render()); - }); +
+
+

Status: 404 - Preset not found

+ +
+
- }); - - - +

Status: 500 - Error

+ - - - - - - - - - - - - - -

Status: 400 - Invalid frequency

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 404 - Preset not found

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instancePresetGet

-
-
- -
-
- -

-

List all presets in the instance

-

-
- -
/sdrangel/preset
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X get -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/preset"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                                        var schema = schemaWrapper.schema;
+                                        if (schema.$ref != null) {
+                                          schema = defsParser.$refs.get(schema.$ref);
+                                        } else {
+                                          schemaWrapper.definitions = Object.assign({}, defs);
+                                          $RefParser.dereference(schemaWrapper).catch(function(err) {
+                                            console.log(err);
+                                          });
+                                        }
+
+                                        //console.log(JSON.stringify(schema));
+                                        var view = new JSONSchemaView(schema, 3);
+                                        $('#responses-instancePresetDelete-500-schema-data').val(stringify(schema));
+                                        var result = $('#responses-instancePresetDelete-500-schema-500');
+                                        result.empty();
+                                        result.append(view.render());
+                                      });
+                                    
+                                  
+ +
+
+ +

Status: 501 - Function not implemented

+ + + +
+
+ + + +
+
+
+
+

instancePresetGet

+

+
+
+
+

+

List all presets in the instance

+

+
+
/sdrangel/preset
+

+

Usage and SDK Samples

+

+ + +
+
+
curl -X GET "http://localhost:10010/sdrangel/preset"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -7262,15 +5553,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -7284,21 +5571,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-
+}
+
+ +
+

 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
 [apiInstance instancePresetGetWithCompletionHandler: 
@@ -7310,14 +5590,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var callback = function(error, data, response) {
   if (error) {
@@ -7327,21 +5606,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instancePresetGet(callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -7364,17 +5640,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 
 try {
     $result = $api_instance->instancePresetGet();
@@ -7382,270 +5655,187 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instancePresetGet: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +eval { + my $result = $api_instance->instancePresetGet(); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instancePresetGet: $@\n"; +} + +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
 
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
 
+try: 
+    api_response = api_instance.instance_preset_get()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instancePresetGet: %s\n" % e)
+
+ -

Parameters

+

Parameters

+

Responses

+

Status: 200 - On success return preset list

+ -

Status: 200 - On success return preset list

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 501 - Function not implemented

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instancePresetGet-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instancePresetGet-schema-0'); - result.empty(); - result.append(view.render()); - }); +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instancePresetPatch

-
-
- -
-
- -

-

Load a preset in a device set

-

-
- -
/sdrangel/preset
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X patch -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/preset"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X PATCH "http://localhost:10010/sdrangel/preset"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -7664,15 +5854,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -7687,21 +5873,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-PresetTransfer *body = ; // Load preset settings to the device set
+}
+
+ +
+
PresetTransfer *body = ; // Load preset settings to the device set
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -7714,14 +5893,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var body = ; // {PresetTransfer} Load preset settings to the device set
 
@@ -7734,21 +5912,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instancePresetPatch(body, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -7772,17 +5947,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $body = ; // PresetTransfer | Load preset settings to the device set
 
 try {
@@ -7791,37 +5963,62 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instancePresetPatch: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $body = WWW::SwaggerClient::Object::PresetTransfer->new(); # PresetTransfer | Load preset settings to the device set + +eval { + my $result = $api_instance->instancePresetPatch(body => $body); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instancePresetPatch: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+body =  # PresetTransfer | Load preset settings to the device set
+
+try: 
+    api_response = api_instance.instance_preset_patch(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instancePresetPatch: %s\n" % e)
+
+ + +

Parameters

- - -

Parameters

- - - - - - -
Body parameters
- - - - - - - +
Body parameters
+
NameDescription
body *
+ + + + + - -
NameDescription
body * -
+ var view = new JSONSchemaView(schema,2,{isBodyParam: true}); + var result = $('#d2e199_instancePresetPatch_body'); + result.empty(); + result.append(view.render()); +}); + +
- - -

Responses

- -

Status: 200 - On success return preset identification

- - + +

Responses

+

Status: 200 - On success return preset identification

+ - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 400 - Invalid frequency

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 404 - No preset or device set found

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+ +

Status: 400 - Invalid frequency

+ + + +
+
+ +

Status: 404 - No preset or device set found

+ + + +
+
+
+ +
+ +
+
+

Status: 500 - Error

+ +
+
+
+ +
+ +
+
+

Status: 501 - Function not implemented

- }); - - - + +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instancePresetPost

-
-
- -
-
- -

-

Create a new preset from a device set settings

-

-
- -
/sdrangel/preset
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X post -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/preset"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X POST "http://localhost:10010/sdrangel/preset"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -8202,15 +6257,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -8225,21 +6276,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-PresetTransfer *body = ; // save device set settings on a new preset
+}
+
+ +
+
PresetTransfer *body = ; // save device set settings on a new preset
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -8252,14 +6296,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var body = ; // {PresetTransfer} save device set settings on a new preset
 
@@ -8272,21 +6315,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instancePresetPost(body, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -8310,17 +6350,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $body = ; // PresetTransfer | save device set settings on a new preset
 
 try {
@@ -8329,37 +6366,62 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instancePresetPost: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $body = WWW::SwaggerClient::Object::PresetTransfer->new(); # PresetTransfer | save device set settings on a new preset + +eval { + my $result = $api_instance->instancePresetPost(body => $body); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instancePresetPost: $@\n"; +} +
+ +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+body =  # PresetTransfer | save device set settings on a new preset
+
+try: 
+    api_response = api_instance.instance_preset_post(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instancePresetPost: %s\n" % e)
+
+ + +

Parameters

- - -

Parameters

- - - - - - -
Body parameters
- - - - - - - +
Body parameters
+
NameDescription
body *
+ + + + + - -
NameDescription
body * -
+ var view = new JSONSchemaView(schema,2,{isBodyParam: true}); + var result = $('#d2e199_instancePresetPost_body'); + result.empty(); + result.append(view.render()); +}); + +
- - -

Responses

- -

Status: 200 - On success return preset identification

- - + +

Responses

+

Status: 200 - On success return preset identification

+ - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 400 - Invalid frequency

+ - var view = new JSONSchemaView(resolved.schema, 3); - $('#examples-Default-instancePresetPost-schema-data').val(JSON.stringify(resolved.schema)); - var result = $('#examples-Default-instancePresetPost-schema-200'); - result.empty(); - result.append(view.render()); - }); +
+
+

Status: 404 - Device set not found

+ +
+
- }); - - - +

Status: 409 - Preset already exists

+ +
+
+

Status: 500 - Error

+ - - - - - - - - - - -

Status: 400 - Invalid frequency

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 404 - Device set not found

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 409 - Preset already exists

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instancePresetPut

-
-
- -
-
- -

-

Save device set settings on a preset

-

-
- -
/sdrangel/preset
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X put -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel/preset"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                                        var schema = schemaWrapper.schema;
+                                        if (schema.$ref != null) {
+                                          schema = defsParser.$refs.get(schema.$ref);
+                                        } else {
+                                          schemaWrapper.definitions = Object.assign({}, defs);
+                                          $RefParser.dereference(schemaWrapper).catch(function(err) {
+                                            console.log(err);
+                                          });
+                                        }
+
+                                        //console.log(JSON.stringify(schema));
+                                        var view = new JSONSchemaView(schema, 3);
+                                        $('#responses-instancePresetPost-500-schema-data').val(stringify(schema));
+                                        var result = $('#responses-instancePresetPost-500-schema-500');
+                                        result.empty();
+                                        result.append(view.render());
+                                      });
+                                    
+                                  
+ +
+
+ +

Status: 501 - Function not implemented

+ + + +
+
+ + + +
+
+
+
+

instancePresetPut

+

+
+
+
+

+

Save device set settings on a preset

+

+
+
/sdrangel/preset
+

+

Usage and SDK Samples

+

+ + +
+
+
curl -X PUT "http://localhost:10010/sdrangel/preset"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -8813,15 +6633,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -8836,21 +6652,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-PresetTransfer *body = ; // save device set settings to the preset
+}
+
+ +
+
PresetTransfer *body = ; // save device set settings to the preset
 
 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
@@ -8863,14 +6672,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var body = ; // {PresetTransfer} save device set settings to the preset
 
@@ -8883,21 +6691,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instancePresetPut(body, callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -8921,17 +6726,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 $body = ; // PresetTransfer | save device set settings to the preset
 
 try {
@@ -8940,37 +6742,62 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instancePresetPut: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +my $body = WWW::SwaggerClient::Object::PresetTransfer->new(); # PresetTransfer | save device set settings to the preset + +eval { + my $result = $api_instance->instancePresetPut(body => $body); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instancePresetPut: $@\n"; +} + + +
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
+body =  # PresetTransfer | save device set settings to the preset
+
+try: 
+    api_response = api_instance.instance_preset_put(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instancePresetPut: %s\n" % e)
+
+ + +

Parameters

- - -

Parameters

- - - - - - -
Body parameters
- - - - - - - +
Body parameters
+
NameDescription
body *
+ + + + + - -
NameDescription
body * -
+ var view = new JSONSchemaView(schema,2,{isBodyParam: true}); + var result = $('#d2e199_instancePresetPut_body'); + result.empty(); + result.append(view.render()); +}); + +
- - -

Responses

- -

Status: 200 - On success return preset identification

- - + +

Responses

+

Status: 200 - On success return preset identification

+ - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 400 - Invalid frequency

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - -

Status: 404 - No preset or device set found

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+ +

Status: 400 - Invalid frequency

+ + + +
+
+ +

Status: 404 - No preset or device set found

+ + + +
+
+
+ +
+ +
+
+

Status: 500 - Error

+ +
+
+
+ +
+ +
+
+

Status: 501 - Function not implemented

- }); - - - + +
+
+ + +
+
+
- - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- -
-
-

instanceSummary

-
-
- -
-
- -

-

SDRangel instance summary

-

-
- -
/sdrangel
- -

-

Usage and SDK Samples

-

- - - -
-
-

-curl -X get -H "apiKey: [[apiKey]]" -H "apiSecret: [[apiSecret]]" "http://localhost:10010//sdrangel"
-
-
-
-
- -
-

-import io.swagger.client.*;
+                        
+
+
curl -X GET "http://localhost:10010/sdrangel"
+
+
+
import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import .DefaultApi;
+import io.swagger.client.api.DefaultApi;
 
 import java.io.File;
 import java.util.*;
@@ -9350,15 +7035,11 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
+}
+
-
-
- - -
-

-import .DefaultApi;
+                          
+
import io.swagger.client.api.DefaultApi;
 
 public class DefaultApiExample {
 
@@ -9372,21 +7053,14 @@ public class DefaultApiExample {
             e.printStackTrace();
         }
     }
-}
-
-                                                  
-
- - - - -
-

-
-
+}
+
+ +
+

 DefaultApi *apiInstance = [[DefaultApi alloc] init];
 
 [apiInstance instanceSummaryWithCompletionHandler: 
@@ -9398,14 +7072,13 @@ DefaultApi *apiInstance = [[DefaultApi alloc] init];
                                 NSLog(@"Error: %@", error);
                             }
                         }];
+
+
-
-
-
-

-var  = require('');
+                            
+
var SdRangel = require('sd_rangel');
 
-var api = new .DefaultApi()
+var api = new SdRangel.DefaultApi()
 
 var callback = function(error, data, response) {
   if (error) {
@@ -9415,21 +7088,18 @@ var callback = function(error, data, response) {
   }
 };
 api.instanceSummary(callback);
+
+
-
-
- - - -
-

-using System;
+                            
+                            
+
using System;
 using System.Diagnostics;
-using .Api;
-using .Client;
-using ;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
 
 namespace Example
 {
@@ -9452,17 +7122,14 @@ namespace Example
         }
     }
 }
+
+
-
-
- - -
-

-
+                              
<?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-$api_instance = new io.swagger.client\Api\DefaultApi();
+$api_instance = new Swagger\Client\Api\DefaultApi();
 
 try {
     $result = $api_instance->instanceSummary();
@@ -9470,235 +7137,1137 @@ try {
 } catch (Exception $e) {
     echo 'Exception when calling DefaultApi->instanceSummary: ', $e->getMessage(), PHP_EOL;
 }
+?>
+
- -
+
+
use Data::Dumper;
+use WWW::SwaggerClient::Configuration;
+use WWW::SwaggerClient::DefaultApi;
 
-                                            
+my $api_instance = WWW::SwaggerClient::DefaultApi->new(); +eval { + my $result = $api_instance->instanceSummary(); + print Dumper($result); +}; +if ($@) { + warn "Exception when calling DefaultApi->instanceSummary: $@\n"; +} +
+
+
from __future__ import print_statement
+import time
+import swagger_client
+from swagger_client.rest import ApiException
+from pprint import pprint
 
+# create an instance of the API class
+api_instance = swagger_client.DefaultApi()
 
+try: 
+    api_response = api_instance.instance_summary()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DefaultApi->instanceSummary: %s\n" % e)
+
+ -

Parameters

+

Parameters

+

Responses

+

Status: 200 - Success

+ -

Status: 200 - Success

- - - - - - - - - -
- - - -
- - - - -
- - +
+ +
+
+

Status: 500 - Error

+ - - - - }); - - - - - - - - - - - - - - - - - - - -

Status: 0 - Error

- - - - - - - - - -
- - - -
- - - - -
- - -
- - - - - - - -
- - - - -
- - - - - - - - - - - - - -
- - - + var schema = schemaWrapper.schema; + if (schema.$ref != null) { + schema = defsParser.$refs.get(schema.$ref); + } else { + schemaWrapper.definitions = Object.assign({}, defs); + $RefParser.dereference(schemaWrapper).catch(function(err) { + console.log(err); + }); + } + //console.log(JSON.stringify(schema)); + var view = new JSONSchemaView(schema, 3); + $('#responses-instanceSummary-500-schema-data').val(stringify(schema)); + var result = $('#responses-instanceSummary-500-schema-500'); + result.empty(); + result.append(view.render()); + }); + + + + + +

Status: 501 - Function not implemented

+ +
+
+ + +
+ + + + - + + + - - + + - - - - - + + - diff --git a/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp b/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp index d17837c92..b04eba307 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.cpp @@ -46,6 +46,7 @@ SWGSamplingDevice::init() { serial = new QString(""); center_frequency = 0L; bandwidth = 0; + state = new QString(""); } void @@ -65,6 +66,10 @@ SWGSamplingDevice::cleanup() { } + + if(state != nullptr) { + delete state; + } } SWGSamplingDevice* @@ -87,6 +92,7 @@ SWGSamplingDevice::fromJsonObject(QJsonObject &pJson) { ::Swagger::setValue(&serial, pJson["serial"], "QString", "QString"); ::Swagger::setValue(¢er_frequency, pJson["centerFrequency"], "qint64", ""); ::Swagger::setValue(&bandwidth, pJson["bandwidth"], "qint32", ""); + ::Swagger::setValue(&state, pJson["state"], "QString", "QString"); } QString @@ -121,6 +127,8 @@ SWGSamplingDevice::asJsonObject() { obj->insert("bandwidth", QJsonValue(bandwidth)); + toJsonValue(QString("state"), state, obj, QString("QString")); + return obj; } @@ -205,6 +213,15 @@ SWGSamplingDevice::setBandwidth(qint32 bandwidth) { this->bandwidth = bandwidth; } +QString* +SWGSamplingDevice::getState() { + return state; +} +void +SWGSamplingDevice::setState(QString* state) { + this->state = state; +} + } diff --git a/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.h b/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.h index 878117048..c033316a1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.h +++ b/swagger/sdrangel/code/qt5/client/SWGSamplingDevice.h @@ -69,6 +69,9 @@ public: qint32 getBandwidth(); void setBandwidth(qint32 bandwidth); + QString* getState(); + void setState(QString* state); + private: qint32 index; @@ -80,6 +83,7 @@ private: QString* serial; qint64 center_frequency; qint32 bandwidth; + QString* state; }; }