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

AMBE feature: cleanup of AMBE API support in Instance

pull/1257/head^2
f4exb 2022-05-24 23:36:04 +02:00
rodzic 8885864e79
commit bd4c633e9d
27 zmienionych plików z 44 dodań i 5564 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
plugins/feature/ambe/ambe.cpp
Wyświetl plik

@ -330,7 +330,7 @@ void AMBE::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response)
{
// serial
SWGSDRangel::SWGDVSerialDevices_2 *swgDVSerialDevices = response.getAmbeReport()->getSerial();
SWGSDRangel::SWGDVSerialDevices *swgDVSerialDevices = response.getAmbeReport()->getSerial();
swgDVSerialDevices->init();
QList<QString> qDeviceNames;
@ -347,7 +347,7 @@ void AMBE::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response)
// devices
SWGSDRangel::SWGAMBEDevices_2 *swgAMBEDevices = response.getAmbeReport()->getDevices();
SWGSDRangel::SWGAMBEDevices *swgAMBEDevices = response.getAmbeReport()->getDevices();
swgAMBEDevices->init();
qDeviceNames.clear();
@ -393,7 +393,7 @@ int AMBE::webapiActionsPost(
{
unknownAction = false;
bool updated = false;
SWGSDRangel::SWGAMBEDevices_2 *swgAMBEDevices = swgAMBEActions->getUpdateDevices();
SWGSDRangel::SWGAMBEDevices *swgAMBEDevices = swgAMBEActions->getUpdateDevices();
QList<SWGSDRangel::SWGAMBEDevice *> *ambeList = swgAMBEDevices->getAmbeDevices();
for (QList<SWGSDRangel::SWGAMBEDevice *>::const_iterator it = ambeList->begin(); it != ambeList->end(); ++it)

1862
sdrbase/resources/webapi/doc/html2/index.html
Wyświetl plik

Plik diff jest za duży Load Diff

4
sdrbase/resources/webapi/doc/swagger/include/AMBE.yaml
Wyświetl plik

@ -23,10 +23,10 @@ AMBEReport:
description: AMBE
properties:
serial:
description: List of available DV serial devices
description: List of AMBE serial devices in the system
$ref: "/doc/swagger/include/AMBE.yaml#/definitions/DVSerialDevices"
devices:
description: List of AMBE devices (serial or address) used for AMBE frames processing
description: List of AMBE devices or servers in use
$ref: "/doc/swagger/include/AMBE.yaml#/definitions/AMBEDevices"
AMBEActions:

139
sdrbase/resources/webapi/doc/swagger/swagger.yaml
Wyświetl plik

@ -454,100 +454,6 @@ paths:
"501":
$ref: "#/responses/Response_501"
/sdrangel/ambe/serial:
x-swagger-router-controller: instance
get:
description: get a list of available DV serial devices
operationId: instanceAMBESerialGet
tags:
- Instance
responses:
"200":
description: On success return list of device paths possibly empty
schema:
$ref: "#/definitions/DVSerialDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
/sdrangel/ambe/devices:
x-swagger-router-controller: instance
get:
description: get the list of AMBE devices (serial or address) used for AMBE frames decoding in digital voice modes
operationId: InstanceAMBEDevicesGet
tags:
- Instance
responses:
"200":
description: On success return list of devices possibly empty
schema:
$ref: "#/definitions/AMBEDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
put:
description: Replace the list of active devices
operationId: InstanceAMBEDevicesPut
tags:
- Instance
consumes:
- application/json
parameters:
- name: body
in: body
description: List of AMBE devices (serial or address)
required: true
schema:
$ref: "#/definitions/AMBEDevices"
responses:
"200":
description: On success return list of devices
schema:
$ref: "#/definitions/AMBEDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
delete:
description: Emtpy the active devices thus effectively closing down AMBE devices support
operationId: InstanceAMBEDevicesDelete
tags:
- Instance
responses:
"200":
description: Success.
schema:
$ref: "#/definitions/SuccessResponse"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
patch:
description: Add and/or delete devices to/from the active list
operationId: InstanceAMBEDevicesPatch
tags:
- Instance
consumes:
- application/json
parameters:
- name: body
in: body
description: List of AMBE devices (serial or address)
required: true
schema:
$ref: "#/definitions/AMBEDevices"
responses:
"200":
description: On success return list of devices
schema:
$ref: "#/definitions/AMBEDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
/sdrangel/presets:
x-swagger-router-controller: instance
get:
@ -3311,51 +3217,6 @@ definitions:
type: number
format: float
DVSerialDevices:
description: "List of DV serial devices available in the system"
required:
- nbDevices
properties:
nbDevices:
description: "Number of DV serial devices"
type: integer
dvSerialDevices:
description: "Device names of DV serial devices"
type: array
items:
$ref: "#/definitions/DVSerialDevice"
DVSerialDevice:
description: "DV serial device details"
properties:
deviceName:
description: "Name of the serial device in the system"
type: string
AMBEDevices:
description: "List of AMBE devices (serial or server address)"
required:
- nbDevices
properties:
nbDevices:
description: "Number of DV serial devices"
type: integer
ambeDevices:
description: "List of AMBE devices"
type: array
items:
$ref: "#/definitions/AMBEDevice"
AMBEDevice:
description: "AMBE devices active in the system"
properties:
deviceRef:
description: "Serial device name or server address"
type: string
delete:
description: "1 if device is to be removed from active list"
type: integer
LimeRFEDevices:
description: "List of LimeRFE devices (serial or server address)"
required:

179
sdrbase/webapi/webapiadapter.cpp
Wyświetl plik

@ -51,9 +51,6 @@
#include "SWGDeviceListItem.h"
#include "SWGAudioDevices.h"
#include "SWGLocationInformation.h"
#include "SWGDVSerialDevices.h"
#include "SWGDVSerialDevice.h"
#include "SWGAMBEDevices.h"
#include "SWGPresets.h"
#include "SWGPresetGroup.h"
#include "SWGPresetItem.h"
@ -753,182 +750,6 @@ int WebAPIAdapter::instanceLocationPut(
return 200;
}
int WebAPIAdapter::instanceDVSerialGet(
SWGSDRangel::SWGDVSerialDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
DSPEngine *dspEngine = DSPEngine::instance();
response.init();
std::vector<std::string> deviceNames;
dspEngine->getDVSerialNames(deviceNames);
response.setNbDevices((int) deviceNames.size());
QList<SWGSDRangel::SWGDVSerialDevice*> *deviceNamesList = response.getDvSerialDevices();
std::vector<std::string>::iterator it = deviceNames.begin();
while (it != deviceNames.end())
{
deviceNamesList->append(new SWGSDRangel::SWGDVSerialDevice);
deviceNamesList->back()->init();
*deviceNamesList->back()->getDeviceName() = QString::fromStdString(*it);
++it;
}
return 200;
}
int WebAPIAdapter::instanceDVSerialPatch(
bool dvserial,
SWGSDRangel::SWGDVSerialDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
DSPEngine *dspEngine = DSPEngine::instance();
dspEngine->setDVSerialSupport(dvserial);
MainCore::MsgDVSerial *msg = MainCore::MsgDVSerial::create(dvserial);
m_mainCore->m_mainMessageQueue->push(msg);
response.init();
if (dvserial)
{
std::vector<std::string> deviceNames;
dspEngine->getDVSerialNames(deviceNames);
response.setNbDevices((int) deviceNames.size());
QList<SWGSDRangel::SWGDVSerialDevice*> *deviceNamesList = response.getDvSerialDevices();
std::vector<std::string>::iterator it = deviceNames.begin();
while (it != deviceNames.end())
{
deviceNamesList->append(new SWGSDRangel::SWGDVSerialDevice);
deviceNamesList->back()->init();
*deviceNamesList->back()->getDeviceName() = QString::fromStdString(*it);
++it;
}
}
else
{
response.setNbDevices(0);
}
return 200;
}
int WebAPIAdapter::instanceAMBESerialGet(
SWGSDRangel::SWGDVSerialDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
DSPEngine *dspEngine = DSPEngine::instance();
response.init();
std::vector<std::string> deviceNames;
std::vector<QString> qDeviceNames;
dspEngine->getAMBEEngine()->scan(qDeviceNames);
for (std::vector<QString>::const_iterator it = qDeviceNames.begin(); it != qDeviceNames.end(); ++it) {
deviceNames.push_back(it->toStdString());
}
response.setNbDevices((int) deviceNames.size());
QList<SWGSDRangel::SWGDVSerialDevice*> *deviceNamesList = response.getDvSerialDevices();
std::vector<std::string>::iterator it = deviceNames.begin();
while (it != deviceNames.end())
{
deviceNamesList->append(new SWGSDRangel::SWGDVSerialDevice);
deviceNamesList->back()->init();
*deviceNamesList->back()->getDeviceName() = QString::fromStdString(*it);
++it;
}
return 200;
}
int WebAPIAdapter::instanceAMBEDevicesGet(
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
DSPEngine *dspEngine = DSPEngine::instance();
response.init();
std::vector<std::string> deviceNames;
dspEngine->getDVSerialNames(deviceNames);
response.setNbDevices((int) deviceNames.size());
QList<SWGSDRangel::SWGAMBEDevice*> *deviceNamesList = response.getAmbeDevices();
std::vector<std::string>::iterator it = deviceNames.begin();
while (it != deviceNames.end())
{
deviceNamesList->append(new SWGSDRangel::SWGAMBEDevice);
deviceNamesList->back()->init();
*deviceNamesList->back()->getDeviceRef() = QString::fromStdString(*it);
deviceNamesList->back()->setDelete(0);
++it;
}
return 200;
}
int WebAPIAdapter::instanceAMBEDevicesDelete(
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
DSPEngine *dspEngine = DSPEngine::instance();
dspEngine->getAMBEEngine()->releaseAll();
response.init();
*response.getMessage() = QString("All AMBE devices released");
return 200;
}
int WebAPIAdapter::instanceAMBEDevicesPut(
SWGSDRangel::SWGAMBEDevices& query,
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
DSPEngine *dspEngine = DSPEngine::instance();
dspEngine->getAMBEEngine()->releaseAll();
QList<SWGSDRangel::SWGAMBEDevice *> *ambeList = query.getAmbeDevices();
for (QList<SWGSDRangel::SWGAMBEDevice *>::const_iterator it = ambeList->begin(); it != ambeList->end(); ++it) {
dspEngine->getAMBEEngine()->registerController((*it)->getDeviceRef()->toStdString());
}
instanceAMBEDevicesGet(response, error);
return 200;
}
int WebAPIAdapter::instanceAMBEDevicesPatch(
SWGSDRangel::SWGAMBEDevices& query,
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
DSPEngine *dspEngine = DSPEngine::instance();
QList<SWGSDRangel::SWGAMBEDevice *> *ambeList = query.getAmbeDevices();
for (QList<SWGSDRangel::SWGAMBEDevice *>::const_iterator it = ambeList->begin(); it != ambeList->end(); ++it)
{
if ((*it)->getDelete()) {
dspEngine->getAMBEEngine()->releaseController((*it)->getDeviceRef()->toStdString());
} else {
dspEngine->getAMBEEngine()->registerController((*it)->getDeviceRef()->toStdString());
}
}
instanceAMBEDevicesGet(response, error);
return 200;
}
int WebAPIAdapter::instancePresetsGet(
SWGSDRangel::SWGPresets& response,
SWGSDRangel::SWGErrorResponse& error)

31
sdrbase/webapi/webapiadapter.h
Wyświetl plik

@ -115,37 +115,6 @@ public:
SWGSDRangel::SWGLocationInformation& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instanceDVSerialGet(
SWGSDRangel::SWGDVSerialDevices& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instanceDVSerialPatch(
bool dvserial,
SWGSDRangel::SWGDVSerialDevices& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instanceAMBESerialGet(
SWGSDRangel::SWGDVSerialDevices& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instanceAMBEDevicesGet(
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instanceAMBEDevicesPut(
SWGSDRangel::SWGAMBEDevices& query,
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instanceAMBEDevicesPatch(
SWGSDRangel::SWGAMBEDevices& query,
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instanceAMBEDevicesDelete(
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error);
virtual int instancePresetsGet(
SWGSDRangel::SWGPresets& response,
SWGSDRangel::SWGErrorResponse& error);

2
sdrbase/webapi/webapiadapterinterface.cpp
Wyświetl plik

@ -31,8 +31,6 @@ QString WebAPIAdapterInterface::instanceAudioOutputParametersURL = "/sdrangel/au
QString WebAPIAdapterInterface::instanceAudioInputCleanupURL = "/sdrangel/audio/input/cleanup";
QString WebAPIAdapterInterface::instanceAudioOutputCleanupURL = "/sdrangel/audio/output/cleanup";
QString WebAPIAdapterInterface::instanceLocationURL = "/sdrangel/location";
QString WebAPIAdapterInterface::instanceAMBESerialURL = "/sdrangel/ambe/serial";
QString WebAPIAdapterInterface::instanceAMBEDevicesURL = "/sdrangel/ambe/devices";
QString WebAPIAdapterInterface::instancePresetsURL = "/sdrangel/presets";
QString WebAPIAdapterInterface::instancePresetURL = "/sdrangel/preset";
QString WebAPIAdapterInterface::instancePresetFileURL = "/sdrangel/preset/file";

78
sdrbase/webapi/webapiadapterinterface.h
Wyświetl plik

@ -41,8 +41,6 @@ namespace SWGSDRangel
class SWGAudioInputDevice;
class SWGAudioOutputDevice;
class SWGLocationInformation;
class SWGDVSerialDevices;
class SWGAMBEDevices;
class SWGLimeRFEDevices;
class SWGLimeRFESettings;
class SWGLimeRFEPower;
@ -401,80 +399,6 @@ public:
return 501;
}
/**
* Handler of /sdrangel/ambe/serial (GET) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
* returns the Http status code (default 501: not implemented)
*/
virtual int instanceAMBESerialGet(
SWGSDRangel::SWGDVSerialDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) response;
error.init();
*error.getMessage() = QString("Function not implemented");
return 501;
}
/**
* Handler of /sdrangel/ambe/devices (GET) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
* returns the Http status code (default 501: not implemented)
*/
virtual int instanceAMBEDevicesGet(
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) response;
error.init();
*error.getMessage() = QString("Function not implemented");
return 501;
}
/**
* Handler of /sdrangel/ambe/devices (PUT) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
* returns the Http status code (default 501: not implemented)
*/
virtual int instanceAMBEDevicesPut(
SWGSDRangel::SWGAMBEDevices& query,
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) query;
(void) response;
error.init();
*error.getMessage() = QString("Function not implemented");
return 501;
}
/**
* Handler of /sdrangel/ambe/devices (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
* returns the Http status code (default 501: not implemented)
*/
virtual int instanceAMBEDevicesPatch(
SWGSDRangel::SWGAMBEDevices& query,
SWGSDRangel::SWGAMBEDevices& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) query;
(void) response;
error.init();
*error.getMessage() = QString("Function not implemented");
return 501;
}
/**
* Handler of /sdrangel/ambe/devices (DELETE) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
* returns the Http status code (default 501: not implemented)
*/
virtual int instanceAMBEDevicesDelete(
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) response;
error.init();
*error.getMessage() = QString("Function not implemented");
return 501;
}
/**
* Handler of /sdrangel/limerfe/serial (GET) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels
* returns the Http status code (default 501: not implemented)
@ -1770,8 +1694,6 @@ public:
static QString instanceAudioInputCleanupURL;
static QString instanceAudioOutputCleanupURL;
static QString instanceLocationURL;
static QString instanceAMBESerialURL;
static QString instanceAMBEDevicesURL;
static QString instancePresetsURL;
static QString instancePresetURL;
static QString instancePresetFileURL;

158
sdrbase/webapi/webapirequestmapper.cpp
Wyświetl plik

@ -33,7 +33,6 @@
#include "SWGInstanceFeaturesResponse.h"
#include "SWGAudioDevices.h"
#include "SWGLocationInformation.h"
#include "SWGDVSerialDevices.h"
#include "SWGAMBEDevices.h"
#include "SWGLimeRFEDevices.h"
#include "SWGLimeRFESettings.h"
@ -138,10 +137,6 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http
instanceAudioOutputCleanupService(request, response);
} else if (path == WebAPIAdapterInterface::instanceLocationURL) {
instanceLocationService(request, response);
} else if (path == WebAPIAdapterInterface::instanceAMBESerialURL) {
instanceAMBESerialService(request, response);
} else if (path == WebAPIAdapterInterface::instanceAMBEDevicesURL) {
instanceAMBEDevicesService(request, response);
} else if (path == WebAPIAdapterInterface::instancePresetsURL) {
instancePresetsService(request, response);
} else if (path == WebAPIAdapterInterface::instancePresetURL) {
@ -799,118 +794,6 @@ void WebAPIRequestMapper::instanceLocationService(qtwebapp::HttpRequest& request
}
}
void WebAPIRequestMapper::instanceAMBESerialService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
{
SWGSDRangel::SWGErrorResponse errorResponse;
response.setHeader("Content-Type", "application/json");
response.setHeader("Access-Control-Allow-Origin", "*");
if (request.getMethod() == "GET")
{
SWGSDRangel::SWGDVSerialDevices normalResponse;
int status = m_adapter->instanceAMBESerialGet(normalResponse, errorResponse);
response.setStatus(status);
if (status/100 == 2) {
response.write(normalResponse.asJson().toUtf8());
} else {
response.write(errorResponse.asJson().toUtf8());
}
}
else
{
response.setStatus(405,"Invalid HTTP method");
errorResponse.init();
*errorResponse.getMessage() = "Invalid HTTP method";
response.write(errorResponse.asJson().toUtf8());
}
}
void WebAPIRequestMapper::instanceAMBEDevicesService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
{
SWGSDRangel::SWGErrorResponse errorResponse;
response.setHeader("Content-Type", "application/json");
response.setHeader("Access-Control-Allow-Origin", "*");
if (request.getMethod() == "GET")
{
SWGSDRangel::SWGAMBEDevices normalResponse;
int status = m_adapter->instanceAMBEDevicesGet(normalResponse, errorResponse);
response.setStatus(status);
if (status/100 == 2) {
response.write(normalResponse.asJson().toUtf8());
} else {
response.write(errorResponse.asJson().toUtf8());
}
}
else if ((request.getMethod() == "PATCH") || (request.getMethod() == "PUT"))
{
SWGSDRangel::SWGAMBEDevices query;
SWGSDRangel::SWGAMBEDevices normalResponse;
QString jsonStr = request.getBody();
QJsonObject jsonObject;
if (parseJsonBody(jsonStr, jsonObject, response))
{
if (validateAMBEDevices(query, jsonObject))
{
int status;
if (request.getMethod() == "PATCH") {
status = m_adapter->instanceAMBEDevicesPatch(query, normalResponse, errorResponse);
} else {
status = m_adapter->instanceAMBEDevicesPut(query, normalResponse, errorResponse);
}
response.setStatus(status);
if (status/100 == 2) {
response.write(normalResponse.asJson().toUtf8());
} else {
response.write(errorResponse.asJson().toUtf8());
}
}
else
{
response.setStatus(400,"Invalid JSON request");
errorResponse.init();
*errorResponse.getMessage() = "Invalid JSON request";
response.write(errorResponse.asJson().toUtf8());
}
}
else
{
response.setStatus(400,"Invalid JSON format");
errorResponse.init();
*errorResponse.getMessage() = "Invalid JSON format";
response.write(errorResponse.asJson().toUtf8());
}
}
else if (request.getMethod() == "DELETE")
{
SWGSDRangel::SWGSuccessResponse normalResponse;
int status = m_adapter->instanceAMBEDevicesDelete(normalResponse, errorResponse);
response.setStatus(status);
if (status/100 == 2) {
response.write(normalResponse.asJson().toUtf8());
} else {
response.write(errorResponse.asJson().toUtf8());
}
}
else
{
response.setStatus(405,"Invalid HTTP method");
errorResponse.init();
*errorResponse.getMessage() = "Invalid HTTP method";
response.write(errorResponse.asJson().toUtf8());
}
}
void WebAPIRequestMapper::instancePresetsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)
{
SWGSDRangel::SWGErrorResponse errorResponse;
@ -4057,47 +3940,6 @@ bool WebAPIRequestMapper::validateAudioOutputDevice(
return true;
}
bool WebAPIRequestMapper::validateAMBEDevices(SWGSDRangel::SWGAMBEDevices& ambeDevices, QJsonObject& jsonObject)
{
if (jsonObject.contains("nbDevices"))
{
int nbDevices = jsonObject["nbDevices"].toInt();
if (jsonObject.contains("ambeDevices"))
{
QJsonArray ambeDevicesJson = jsonObject["ambeDevices"].toArray();
if (nbDevices != ambeDevicesJson.size()) {
return false;
}
ambeDevices.init();
ambeDevices.setNbDevices(nbDevices);
QList<SWGSDRangel::SWGAMBEDevice *> *ambeList = ambeDevices.getAmbeDevices();
for (int i = 0; i < nbDevices; i++)
{
QJsonObject ambeDeviceJson = ambeDevicesJson.at(i).toObject();
if (ambeDeviceJson.contains("deviceRef") && ambeDeviceJson.contains("delete"))
{
ambeList->push_back(new SWGSDRangel::SWGAMBEDevice());
ambeList->back()->init();
ambeList->back()->setDeviceRef(new QString(ambeDeviceJson["deviceRef"].toString()));
ambeList->back()->setDelete(ambeDeviceJson["delete"].toInt());
}
else
{
return false;
}
}
return true;
}
}
return false;
}
bool WebAPIRequestMapper::validateSpectrumSettings(SWGSDRangel::SWGGLSpectrum& spectrumSettings, QJsonObject& jsonObject, QStringList& spectrumSettingsKeys)
{
extractKeys(jsonObject, spectrumSettingsKeys);

4
sdrbase/webapi/webapirequestmapper.h
Wyświetl plik

@ -66,9 +66,6 @@ private:
void instanceAudioInputCleanupService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instanceAudioOutputCleanupService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instanceLocationService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instanceDVSerialService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instanceAMBESerialService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instanceAMBEDevicesService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instancePresetsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instancePresetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
void instancePresetFileService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response);
@ -126,7 +123,6 @@ private:
bool validateFeatureActions(SWGSDRangel::SWGFeatureActions& featureActions, QJsonObject& jsonObject, QStringList& featureActionsKeys);
bool validateAudioInputDevice(SWGSDRangel::SWGAudioInputDevice& audioInputDevice, QJsonObject& jsonObject, QStringList& audioInputDeviceKeys);
bool validateAudioOutputDevice(SWGSDRangel::SWGAudioOutputDevice& audioOutputDevice, QJsonObject& jsonObject, QStringList& audioOutputDeviceKeys);
bool validateAMBEDevices(SWGSDRangel::SWGAMBEDevices& ambeDevices, QJsonObject& jsonObject);
bool validateConfig(SWGSDRangel::SWGInstanceConfigResponse& config, QJsonObject& jsonObject, WebAPIAdapterInterface::ConfigKeys& configKeys);
bool validateWorkspaceInfo(SWGSDRangel::SWGWorkspaceInfo& workspaceInfo, QJsonObject& jsonObject);
bool validateConfigurationIdentifier(SWGSDRangel::SWGConfigurationIdentifier& configurationIdentifier);

139
swagger/sdrangel/api/swagger/swagger.yaml
Wyświetl plik

@ -454,100 +454,6 @@ paths:
"501":
$ref: "#/responses/Response_501"
/sdrangel/ambe/serial:
x-swagger-router-controller: instance
get:
description: get a list of available DV serial devices
operationId: instanceAMBESerialGet
tags:
- Instance
responses:
"200":
description: On success return list of device paths possibly empty
schema:
$ref: "#/definitions/DVSerialDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
/sdrangel/ambe/devices:
x-swagger-router-controller: instance
get:
description: get the list of AMBE devices (serial or address) used for AMBE frames decoding in digital voice modes
operationId: InstanceAMBEDevicesGet
tags:
- Instance
responses:
"200":
description: On success return list of devices possibly empty
schema:
$ref: "#/definitions/AMBEDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
put:
description: Replace the list of active devices
operationId: InstanceAMBEDevicesPut
tags:
- Instance
consumes:
- application/json
parameters:
- name: body
in: body
description: List of AMBE devices (serial or address)
required: true
schema:
$ref: "#/definitions/AMBEDevices"
responses:
"200":
description: On success return list of devices
schema:
$ref: "#/definitions/AMBEDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
delete:
description: Emtpy the active devices thus effectively closing down AMBE devices support
operationId: InstanceAMBEDevicesDelete
tags:
- Instance
responses:
"200":
description: Success.
schema:
$ref: "#/definitions/SuccessResponse"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
patch:
description: Add and/or delete devices to/from the active list
operationId: InstanceAMBEDevicesPatch
tags:
- Instance
consumes:
- application/json
parameters:
- name: body
in: body
description: List of AMBE devices (serial or address)
required: true
schema:
$ref: "#/definitions/AMBEDevices"
responses:
"200":
description: On success return list of devices
schema:
$ref: "#/definitions/AMBEDevices"
"500":
$ref: "#/responses/Response_500"
"501":
$ref: "#/responses/Response_501"
/sdrangel/presets:
x-swagger-router-controller: instance
get:
@ -3311,51 +3217,6 @@ definitions:
type: number
format: float
DVSerialDevices:
description: "List of DV serial devices available in the system"
required:
- nbDevices
properties:
nbDevices:
description: "Number of DV serial devices"
type: integer
dvSerialDevices:
description: "Device names of DV serial devices"
type: array
items:
$ref: "#/definitions/DVSerialDevice"
DVSerialDevice:
description: "DV serial device details"
properties:
deviceName:
description: "Name of the serial device in the system"
type: string
AMBEDevices:
description: "List of AMBE devices (serial or server address)"
required:
- nbDevices
properties:
nbDevices:
description: "Number of DV serial devices"
type: integer
ambeDevices:
description: "List of AMBE devices"
type: array
items:
$ref: "#/definitions/AMBEDevice"
AMBEDevice:
description: "AMBE devices active in the system"
properties:
deviceRef:
description: "Serial device name or server address"
type: string
delete:
description: "1 if device is to be removed from active list"
type: integer
LimeRFEDevices:
description: "List of LimeRFE devices (serial or server address)"
required:

1862
swagger/sdrangel/code/html2/index.html
Wyświetl plik

Plik diff jest za duży Load Diff

10
swagger/sdrangel/code/qt5/client/SWGAMBEActions.cpp
Wyświetl plik

@ -40,7 +40,7 @@ SWGAMBEActions::~SWGAMBEActions() {
void
SWGAMBEActions::init() {
update_devices = new SWGAMBEDevices_2();
update_devices = new SWGAMBEDevices();
m_update_devices_isSet = false;
remove_all = 0;
m_remove_all_isSet = false;
@ -65,7 +65,7 @@ SWGAMBEActions::fromJson(QString &json) {
void
SWGAMBEActions::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&update_devices, pJson["updateDevices"], "SWGAMBEDevices_2", "SWGAMBEDevices_2");
::SWGSDRangel::setValue(&update_devices, pJson["updateDevices"], "SWGAMBEDevices", "SWGAMBEDevices");
::SWGSDRangel::setValue(&remove_all, pJson["removeAll"], "qint32", "");
@ -86,7 +86,7 @@ QJsonObject*
SWGAMBEActions::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if((update_devices != nullptr) && (update_devices->isSet())){
toJsonValue(QString("updateDevices"), update_devices, obj, QString("SWGAMBEDevices_2"));
toJsonValue(QString("updateDevices"), update_devices, obj, QString("SWGAMBEDevices"));
}
if(m_remove_all_isSet){
obj->insert("removeAll", QJsonValue(remove_all));
@ -95,12 +95,12 @@ SWGAMBEActions::asJsonObject() {
return obj;
}
SWGAMBEDevices_2*
SWGAMBEDevices*
SWGAMBEActions::getUpdateDevices() {
return update_devices;
}
void
SWGAMBEActions::setUpdateDevices(SWGAMBEDevices_2* update_devices) {
SWGAMBEActions::setUpdateDevices(SWGAMBEDevices* update_devices) {
this->update_devices = update_devices;
this->m_update_devices_isSet = true;
}

8
swagger/sdrangel/code/qt5/client/SWGAMBEActions.h
Wyświetl plik

@ -22,7 +22,7 @@
#include <QJsonObject>
#include "SWGAMBEDevices_2.h"
#include "SWGAMBEDevices.h"
#include "SWGObject.h"
#include "export.h"
@ -42,8 +42,8 @@ public:
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGAMBEActions* fromJson(QString &jsonString) override;
SWGAMBEDevices_2* getUpdateDevices();
void setUpdateDevices(SWGAMBEDevices_2* update_devices);
SWGAMBEDevices* getUpdateDevices();
void setUpdateDevices(SWGAMBEDevices* update_devices);
qint32 getRemoveAll();
void setRemoveAll(qint32 remove_all);
@ -52,7 +52,7 @@ public:
virtual bool isSet() override;
private:
SWGAMBEDevices_2* update_devices;
SWGAMBEDevices* update_devices;
bool m_update_devices_isSet;
qint32 remove_all;

133
swagger/sdrangel/code/qt5/client/SWGAMBEDevice_2.cpp
Wyświetl plik

@ -1,133 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
#include "SWGAMBEDevice_2.h"
#include "SWGHelpers.h"
#include <QJsonDocument>
#include <QJsonArray>
#include <QObject>
#include <QDebug>
namespace SWGSDRangel {
SWGAMBEDevice_2::SWGAMBEDevice_2(QString* json) {
init();
this->fromJson(*json);
}
SWGAMBEDevice_2::SWGAMBEDevice_2() {
device_ref = nullptr;
m_device_ref_isSet = false;
_delete = 0;
m__delete_isSet = false;
}
SWGAMBEDevice_2::~SWGAMBEDevice_2() {
this->cleanup();
}
void
SWGAMBEDevice_2::init() {
device_ref = new QString("");
m_device_ref_isSet = false;
_delete = 0;
m__delete_isSet = false;
}
void
SWGAMBEDevice_2::cleanup() {
if(device_ref != nullptr) {
delete device_ref;
}
}
SWGAMBEDevice_2*
SWGAMBEDevice_2::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object();
this->fromJsonObject(jsonObject);
return this;
}
void
SWGAMBEDevice_2::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&device_ref, pJson["deviceRef"], "QString", "QString");
::SWGSDRangel::setValue(&_delete, pJson["delete"], "qint32", "");
}
QString
SWGAMBEDevice_2::asJson ()
{
QJsonObject* obj = this->asJsonObject();
QJsonDocument doc(*obj);
QByteArray bytes = doc.toJson();
delete obj;
return QString(bytes);
}
QJsonObject*
SWGAMBEDevice_2::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if(device_ref != nullptr && *device_ref != QString("")){
toJsonValue(QString("deviceRef"), device_ref, obj, QString("QString"));
}
if(m__delete_isSet){
obj->insert("delete", QJsonValue(_delete));
}
return obj;
}
QString*
SWGAMBEDevice_2::getDeviceRef() {
return device_ref;
}
void
SWGAMBEDevice_2::setDeviceRef(QString* device_ref) {
this->device_ref = device_ref;
this->m_device_ref_isSet = true;
}
qint32
SWGAMBEDevice_2::getDelete() {
return _delete;
}
void
SWGAMBEDevice_2::setDelete(qint32 _delete) {
this->_delete = _delete;
this->m__delete_isSet = true;
}
bool
SWGAMBEDevice_2::isSet(){
bool isObjectUpdated = false;
do{
if(device_ref && *device_ref != QString("")){
isObjectUpdated = true; break;
}
if(m__delete_isSet){
isObjectUpdated = true; break;
}
}while(false);
return isObjectUpdated;
}
}

65
swagger/sdrangel/code/qt5/client/SWGAMBEDevice_2.h
Wyświetl plik

@ -1,65 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
/*
* SWGAMBEDevice_2.h
*
* AMBE devices active in the system
*/
#ifndef SWGAMBEDevice_2_H_
#define SWGAMBEDevice_2_H_
#include <QJsonObject>
#include <QString>
#include "SWGObject.h"
#include "export.h"
namespace SWGSDRangel {
class SWG_API SWGAMBEDevice_2: public SWGObject {
public:
SWGAMBEDevice_2();
SWGAMBEDevice_2(QString* json);
virtual ~SWGAMBEDevice_2();
void init();
void cleanup();
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGAMBEDevice_2* fromJson(QString &jsonString) override;
QString* getDeviceRef();
void setDeviceRef(QString* device_ref);
qint32 getDelete();
void setDelete(qint32 _delete);
virtual bool isSet() override;
private:
QString* device_ref;
bool m_device_ref_isSet;
qint32 _delete;
bool m__delete_isSet;
};
}
#endif /* SWGAMBEDevice_2_H_ */

137
swagger/sdrangel/code/qt5/client/SWGAMBEDevices_2.cpp
Wyświetl plik

@ -1,137 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
#include "SWGAMBEDevices_2.h"
#include "SWGHelpers.h"
#include <QJsonDocument>
#include <QJsonArray>
#include <QObject>
#include <QDebug>
namespace SWGSDRangel {
SWGAMBEDevices_2::SWGAMBEDevices_2(QString* json) {
init();
this->fromJson(*json);
}
SWGAMBEDevices_2::SWGAMBEDevices_2() {
nb_devices = 0;
m_nb_devices_isSet = false;
ambe_devices = nullptr;
m_ambe_devices_isSet = false;
}
SWGAMBEDevices_2::~SWGAMBEDevices_2() {
this->cleanup();
}
void
SWGAMBEDevices_2::init() {
nb_devices = 0;
m_nb_devices_isSet = false;
ambe_devices = new QList<SWGAMBEDevice*>();
m_ambe_devices_isSet = false;
}
void
SWGAMBEDevices_2::cleanup() {
if(ambe_devices != nullptr) {
auto arr = ambe_devices;
for(auto o: *arr) {
delete o;
}
delete ambe_devices;
}
}
SWGAMBEDevices_2*
SWGAMBEDevices_2::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object();
this->fromJsonObject(jsonObject);
return this;
}
void
SWGAMBEDevices_2::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&nb_devices, pJson["nbDevices"], "qint32", "");
::SWGSDRangel::setValue(&ambe_devices, pJson["ambeDevices"], "QList", "SWGAMBEDevice");
}
QString
SWGAMBEDevices_2::asJson ()
{
QJsonObject* obj = this->asJsonObject();
QJsonDocument doc(*obj);
QByteArray bytes = doc.toJson();
delete obj;
return QString(bytes);
}
QJsonObject*
SWGAMBEDevices_2::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if(m_nb_devices_isSet){
obj->insert("nbDevices", QJsonValue(nb_devices));
}
if(ambe_devices && ambe_devices->size() > 0){
toJsonArray((QList<void*>*)ambe_devices, obj, "ambeDevices", "SWGAMBEDevice");
}
return obj;
}
qint32
SWGAMBEDevices_2::getNbDevices() {
return nb_devices;
}
void
SWGAMBEDevices_2::setNbDevices(qint32 nb_devices) {
this->nb_devices = nb_devices;
this->m_nb_devices_isSet = true;
}
QList<SWGAMBEDevice*>*
SWGAMBEDevices_2::getAmbeDevices() {
return ambe_devices;
}
void
SWGAMBEDevices_2::setAmbeDevices(QList<SWGAMBEDevice*>* ambe_devices) {
this->ambe_devices = ambe_devices;
this->m_ambe_devices_isSet = true;
}
bool
SWGAMBEDevices_2::isSet(){
bool isObjectUpdated = false;
do{
if(m_nb_devices_isSet){
isObjectUpdated = true; break;
}
if(ambe_devices && (ambe_devices->size() > 0)){
isObjectUpdated = true; break;
}
}while(false);
return isObjectUpdated;
}
}

66
swagger/sdrangel/code/qt5/client/SWGAMBEDevices_2.h
Wyświetl plik

@ -1,66 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
/*
* SWGAMBEDevices_2.h
*
* List of AMBE devices (serial or server address)
*/
#ifndef SWGAMBEDevices_2_H_
#define SWGAMBEDevices_2_H_
#include <QJsonObject>
#include "SWGAMBEDevice.h"
#include <QList>
#include "SWGObject.h"
#include "export.h"
namespace SWGSDRangel {
class SWG_API SWGAMBEDevices_2: public SWGObject {
public:
SWGAMBEDevices_2();
SWGAMBEDevices_2(QString* json);
virtual ~SWGAMBEDevices_2();
void init();
void cleanup();
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGAMBEDevices_2* fromJson(QString &jsonString) override;
qint32 getNbDevices();
void setNbDevices(qint32 nb_devices);
QList<SWGAMBEDevice*>* getAmbeDevices();
void setAmbeDevices(QList<SWGAMBEDevice*>* ambe_devices);
virtual bool isSet() override;
private:
qint32 nb_devices;
bool m_nb_devices_isSet;
QList<SWGAMBEDevice*>* ambe_devices;
bool m_ambe_devices_isSet;
};
}
#endif /* SWGAMBEDevices_2_H_ */

20
swagger/sdrangel/code/qt5/client/SWGAMBEReport.cpp
Wyświetl plik

@ -40,9 +40,9 @@ SWGAMBEReport::~SWGAMBEReport() {
void
SWGAMBEReport::init() {
serial = new SWGDVSerialDevices_2();
serial = new SWGDVSerialDevices();
m_serial_isSet = false;
devices = new SWGAMBEDevices_2();
devices = new SWGAMBEDevices();
m_devices_isSet = false;
}
@ -67,9 +67,9 @@ SWGAMBEReport::fromJson(QString &json) {
void
SWGAMBEReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&serial, pJson["serial"], "SWGDVSerialDevices_2", "SWGDVSerialDevices_2");
::SWGSDRangel::setValue(&serial, pJson["serial"], "SWGDVSerialDevices", "SWGDVSerialDevices");
::SWGSDRangel::setValue(&devices, pJson["devices"], "SWGAMBEDevices_2", "SWGAMBEDevices_2");
::SWGSDRangel::setValue(&devices, pJson["devices"], "SWGAMBEDevices", "SWGAMBEDevices");
}
@ -88,31 +88,31 @@ QJsonObject*
SWGAMBEReport::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if((serial != nullptr) && (serial->isSet())){
toJsonValue(QString("serial"), serial, obj, QString("SWGDVSerialDevices_2"));
toJsonValue(QString("serial"), serial, obj, QString("SWGDVSerialDevices"));
}
if((devices != nullptr) && (devices->isSet())){
toJsonValue(QString("devices"), devices, obj, QString("SWGAMBEDevices_2"));
toJsonValue(QString("devices"), devices, obj, QString("SWGAMBEDevices"));
}
return obj;
}
SWGDVSerialDevices_2*
SWGDVSerialDevices*
SWGAMBEReport::getSerial() {
return serial;
}
void
SWGAMBEReport::setSerial(SWGDVSerialDevices_2* serial) {
SWGAMBEReport::setSerial(SWGDVSerialDevices* serial) {
this->serial = serial;
this->m_serial_isSet = true;
}
SWGAMBEDevices_2*
SWGAMBEDevices*
SWGAMBEReport::getDevices() {
return devices;
}
void
SWGAMBEReport::setDevices(SWGAMBEDevices_2* devices) {
SWGAMBEReport::setDevices(SWGAMBEDevices* devices) {
this->devices = devices;
this->m_devices_isSet = true;
}

16
swagger/sdrangel/code/qt5/client/SWGAMBEReport.h
Wyświetl plik

@ -22,8 +22,8 @@
#include <QJsonObject>
#include "SWGAMBEDevices_2.h"
#include "SWGDVSerialDevices_2.h"
#include "SWGAMBEDevices.h"
#include "SWGDVSerialDevices.h"
#include "SWGObject.h"
#include "export.h"
@ -43,20 +43,20 @@ public:
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGAMBEReport* fromJson(QString &jsonString) override;
SWGDVSerialDevices_2* getSerial();
void setSerial(SWGDVSerialDevices_2* serial);
SWGDVSerialDevices* getSerial();
void setSerial(SWGDVSerialDevices* serial);
SWGAMBEDevices_2* getDevices();
void setDevices(SWGAMBEDevices_2* devices);
SWGAMBEDevices* getDevices();
void setDevices(SWGAMBEDevices* devices);
virtual bool isSet() override;
private:
SWGDVSerialDevices_2* serial;
SWGDVSerialDevices* serial;
bool m_serial_isSet;
SWGAMBEDevices_2* devices;
SWGAMBEDevices* devices;
bool m_devices_isSet;
};

110
swagger/sdrangel/code/qt5/client/SWGDVSerialDevice_2.cpp
Wyświetl plik

@ -1,110 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
#include "SWGDVSerialDevice_2.h"
#include "SWGHelpers.h"
#include <QJsonDocument>
#include <QJsonArray>
#include <QObject>
#include <QDebug>
namespace SWGSDRangel {
SWGDVSerialDevice_2::SWGDVSerialDevice_2(QString* json) {
init();
this->fromJson(*json);
}
SWGDVSerialDevice_2::SWGDVSerialDevice_2() {
device_name = nullptr;
m_device_name_isSet = false;
}
SWGDVSerialDevice_2::~SWGDVSerialDevice_2() {
this->cleanup();
}
void
SWGDVSerialDevice_2::init() {
device_name = new QString("");
m_device_name_isSet = false;
}
void
SWGDVSerialDevice_2::cleanup() {
if(device_name != nullptr) {
delete device_name;
}
}
SWGDVSerialDevice_2*
SWGDVSerialDevice_2::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object();
this->fromJsonObject(jsonObject);
return this;
}
void
SWGDVSerialDevice_2::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&device_name, pJson["deviceName"], "QString", "QString");
}
QString
SWGDVSerialDevice_2::asJson ()
{
QJsonObject* obj = this->asJsonObject();
QJsonDocument doc(*obj);
QByteArray bytes = doc.toJson();
delete obj;
return QString(bytes);
}
QJsonObject*
SWGDVSerialDevice_2::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if(device_name != nullptr && *device_name != QString("")){
toJsonValue(QString("deviceName"), device_name, obj, QString("QString"));
}
return obj;
}
QString*
SWGDVSerialDevice_2::getDeviceName() {
return device_name;
}
void
SWGDVSerialDevice_2::setDeviceName(QString* device_name) {
this->device_name = device_name;
this->m_device_name_isSet = true;
}
bool
SWGDVSerialDevice_2::isSet(){
bool isObjectUpdated = false;
do{
if(device_name && *device_name != QString("")){
isObjectUpdated = true; break;
}
}while(false);
return isObjectUpdated;
}
}

59
swagger/sdrangel/code/qt5/client/SWGDVSerialDevice_2.h
Wyświetl plik

@ -1,59 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
/*
* SWGDVSerialDevice_2.h
*
* DV serial device details
*/
#ifndef SWGDVSerialDevice_2_H_
#define SWGDVSerialDevice_2_H_
#include <QJsonObject>
#include <QString>
#include "SWGObject.h"
#include "export.h"
namespace SWGSDRangel {
class SWG_API SWGDVSerialDevice_2: public SWGObject {
public:
SWGDVSerialDevice_2();
SWGDVSerialDevice_2(QString* json);
virtual ~SWGDVSerialDevice_2();
void init();
void cleanup();
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDVSerialDevice_2* fromJson(QString &jsonString) override;
QString* getDeviceName();
void setDeviceName(QString* device_name);
virtual bool isSet() override;
private:
QString* device_name;
bool m_device_name_isSet;
};
}
#endif /* SWGDVSerialDevice_2_H_ */

137
swagger/sdrangel/code/qt5/client/SWGDVSerialDevices_2.cpp
Wyświetl plik

@ -1,137 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
#include "SWGDVSerialDevices_2.h"
#include "SWGHelpers.h"
#include <QJsonDocument>
#include <QJsonArray>
#include <QObject>
#include <QDebug>
namespace SWGSDRangel {
SWGDVSerialDevices_2::SWGDVSerialDevices_2(QString* json) {
init();
this->fromJson(*json);
}
SWGDVSerialDevices_2::SWGDVSerialDevices_2() {
nb_devices = 0;
m_nb_devices_isSet = false;
dv_serial_devices = nullptr;
m_dv_serial_devices_isSet = false;
}
SWGDVSerialDevices_2::~SWGDVSerialDevices_2() {
this->cleanup();
}
void
SWGDVSerialDevices_2::init() {
nb_devices = 0;
m_nb_devices_isSet = false;
dv_serial_devices = new QList<SWGDVSerialDevice*>();
m_dv_serial_devices_isSet = false;
}
void
SWGDVSerialDevices_2::cleanup() {
if(dv_serial_devices != nullptr) {
auto arr = dv_serial_devices;
for(auto o: *arr) {
delete o;
}
delete dv_serial_devices;
}
}
SWGDVSerialDevices_2*
SWGDVSerialDevices_2::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object();
this->fromJsonObject(jsonObject);
return this;
}
void
SWGDVSerialDevices_2::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&nb_devices, pJson["nbDevices"], "qint32", "");
::SWGSDRangel::setValue(&dv_serial_devices, pJson["dvSerialDevices"], "QList", "SWGDVSerialDevice");
}
QString
SWGDVSerialDevices_2::asJson ()
{
QJsonObject* obj = this->asJsonObject();
QJsonDocument doc(*obj);
QByteArray bytes = doc.toJson();
delete obj;
return QString(bytes);
}
QJsonObject*
SWGDVSerialDevices_2::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if(m_nb_devices_isSet){
obj->insert("nbDevices", QJsonValue(nb_devices));
}
if(dv_serial_devices && dv_serial_devices->size() > 0){
toJsonArray((QList<void*>*)dv_serial_devices, obj, "dvSerialDevices", "SWGDVSerialDevice");
}
return obj;
}
qint32
SWGDVSerialDevices_2::getNbDevices() {
return nb_devices;
}
void
SWGDVSerialDevices_2::setNbDevices(qint32 nb_devices) {
this->nb_devices = nb_devices;
this->m_nb_devices_isSet = true;
}
QList<SWGDVSerialDevice*>*
SWGDVSerialDevices_2::getDvSerialDevices() {
return dv_serial_devices;
}
void
SWGDVSerialDevices_2::setDvSerialDevices(QList<SWGDVSerialDevice*>* dv_serial_devices) {
this->dv_serial_devices = dv_serial_devices;
this->m_dv_serial_devices_isSet = true;
}
bool
SWGDVSerialDevices_2::isSet(){
bool isObjectUpdated = false;
do{
if(m_nb_devices_isSet){
isObjectUpdated = true; break;
}
if(dv_serial_devices && (dv_serial_devices->size() > 0)){
isObjectUpdated = true; break;
}
}while(false);
return isObjectUpdated;
}
}

66
swagger/sdrangel/code/qt5/client/SWGDVSerialDevices_2.h
Wyświetl plik

@ -1,66 +0,0 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
/*
* SWGDVSerialDevices_2.h
*
* List of DV serial devices available in the system
*/
#ifndef SWGDVSerialDevices_2_H_
#define SWGDVSerialDevices_2_H_
#include <QJsonObject>
#include "SWGDVSerialDevice.h"
#include <QList>
#include "SWGObject.h"
#include "export.h"
namespace SWGSDRangel {
class SWG_API SWGDVSerialDevices_2: public SWGObject {
public:
SWGDVSerialDevices_2();
SWGDVSerialDevices_2(QString* json);
virtual ~SWGDVSerialDevices_2();
void init();
void cleanup();
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDVSerialDevices_2* fromJson(QString &jsonString) override;
qint32 getNbDevices();
void setNbDevices(qint32 nb_devices);
QList<SWGDVSerialDevice*>* getDvSerialDevices();
void setDvSerialDevices(QList<SWGDVSerialDevice*>* dv_serial_devices);
virtual bool isSet() override;
private:
qint32 nb_devices;
bool m_nb_devices_isSet;
QList<SWGDVSerialDevice*>* dv_serial_devices;
bool m_dv_serial_devices_isSet;
};
}
#endif /* SWGDVSerialDevices_2_H_ */

266
swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp
Wyświetl plik

@ -28,272 +28,6 @@ SWGInstanceApi::SWGInstanceApi(QString host, QString basePath) {
this->basePath = basePath;
}
void
SWGInstanceApi::instanceAMBEDevicesDelete() {
QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/sdrangel/ambe/devices");
SWGHttpRequestWorker *worker = new SWGHttpRequestWorker();
SWGHttpRequestInput input(fullPath, "DELETE");
foreach(QString key, this->defaultHeaders.keys()) {
input.headers.insert(key, this->defaultHeaders.value(key));
}
connect(worker,
&SWGHttpRequestWorker::on_execution_finished,
this,
&SWGInstanceApi::instanceAMBEDevicesDeleteCallback);
worker->execute(&input);
}
void
SWGInstanceApi::instanceAMBEDevicesDeleteCallback(SWGHttpRequestWorker * worker) {
QString msg;
QString error_str = worker->error_str;
QNetworkReply::NetworkError error_type = worker->error_type;
if (worker->error_type == QNetworkReply::NoError) {
msg = QString("Success! %1 bytes").arg(worker->response.length());
}
else {
msg = "Error: " + worker->error_str;
}
QString json(worker->response);
SWGSuccessResponse* output = static_cast<SWGSuccessResponse*>(create(json, QString("SWGSuccessResponse")));
worker->deleteLater();
if (worker->error_type == QNetworkReply::NoError) {
emit instanceAMBEDevicesDeleteSignal(output);
} else {
emit instanceAMBEDevicesDeleteSignalE(output, error_type, error_str);
emit instanceAMBEDevicesDeleteSignalEFull(worker, error_type, error_str);
}
}
void
SWGInstanceApi::instanceAMBEDevicesGet() {
QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/sdrangel/ambe/devices");
SWGHttpRequestWorker *worker = new SWGHttpRequestWorker();
SWGHttpRequestInput input(fullPath, "GET");
foreach(QString key, this->defaultHeaders.keys()) {
input.headers.insert(key, this->defaultHeaders.value(key));
}
connect(worker,
&SWGHttpRequestWorker::on_execution_finished,
this,
&SWGInstanceApi::instanceAMBEDevicesGetCallback);
worker->execute(&input);
}
void
SWGInstanceApi::instanceAMBEDevicesGetCallback(SWGHttpRequestWorker * worker) {
QString msg;
QString error_str = worker->error_str;
QNetworkReply::NetworkError error_type = worker->error_type;
if (worker->error_type == QNetworkReply::NoError) {
msg = QString("Success! %1 bytes").arg(worker->response.length());
}
else {
msg = "Error: " + worker->error_str;
}
QString json(worker->response);
SWGAMBEDevices* output = static_cast<SWGAMBEDevices*>(create(json, QString("SWGAMBEDevices")));
worker->deleteLater();
if (worker->error_type == QNetworkReply::NoError) {
emit instanceAMBEDevicesGetSignal(output);
} else {
emit instanceAMBEDevicesGetSignalE(output, error_type, error_str);
emit instanceAMBEDevicesGetSignalEFull(worker, error_type, error_str);
}
}
void
SWGInstanceApi::instanceAMBEDevicesPatch(SWGAMBEDevices& body) {
QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/sdrangel/ambe/devices");
SWGHttpRequestWorker *worker = new SWGHttpRequestWorker();
SWGHttpRequestInput input(fullPath, "PATCH");
QString output = body.asJson();
input.request_body.append(output.toUtf8());
foreach(QString key, this->defaultHeaders.keys()) {
input.headers.insert(key, this->defaultHeaders.value(key));
}
connect(worker,
&SWGHttpRequestWorker::on_execution_finished,
this,
&SWGInstanceApi::instanceAMBEDevicesPatchCallback);
worker->execute(&input);
}
void
SWGInstanceApi::instanceAMBEDevicesPatchCallback(SWGHttpRequestWorker * worker) {
QString msg;
QString error_str = worker->error_str;
QNetworkReply::NetworkError error_type = worker->error_type;
if (worker->error_type == QNetworkReply::NoError) {
msg = QString("Success! %1 bytes").arg(worker->response.length());
}
else {
msg = "Error: " + worker->error_str;
}
QString json(worker->response);
SWGAMBEDevices* output = static_cast<SWGAMBEDevices*>(create(json, QString("SWGAMBEDevices")));
worker->deleteLater();
if (worker->error_type == QNetworkReply::NoError) {
emit instanceAMBEDevicesPatchSignal(output);
} else {
emit instanceAMBEDevicesPatchSignalE(output, error_type, error_str);
emit instanceAMBEDevicesPatchSignalEFull(worker, error_type, error_str);
}
}
void
SWGInstanceApi::instanceAMBEDevicesPut(SWGAMBEDevices& body) {
QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/sdrangel/ambe/devices");
SWGHttpRequestWorker *worker = new SWGHttpRequestWorker();
SWGHttpRequestInput input(fullPath, "PUT");
QString output = body.asJson();
input.request_body.append(output.toUtf8());
foreach(QString key, this->defaultHeaders.keys()) {
input.headers.insert(key, this->defaultHeaders.value(key));
}
connect(worker,
&SWGHttpRequestWorker::on_execution_finished,
this,
&SWGInstanceApi::instanceAMBEDevicesPutCallback);
worker->execute(&input);
}
void
SWGInstanceApi::instanceAMBEDevicesPutCallback(SWGHttpRequestWorker * worker) {
QString msg;
QString error_str = worker->error_str;
QNetworkReply::NetworkError error_type = worker->error_type;
if (worker->error_type == QNetworkReply::NoError) {
msg = QString("Success! %1 bytes").arg(worker->response.length());
}
else {
msg = "Error: " + worker->error_str;
}
QString json(worker->response);
SWGAMBEDevices* output = static_cast<SWGAMBEDevices*>(create(json, QString("SWGAMBEDevices")));
worker->deleteLater();
if (worker->error_type == QNetworkReply::NoError) {
emit instanceAMBEDevicesPutSignal(output);
} else {
emit instanceAMBEDevicesPutSignalE(output, error_type, error_str);
emit instanceAMBEDevicesPutSignalEFull(worker, error_type, error_str);
}
}
void
SWGInstanceApi::instanceAMBESerialGet() {
QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/sdrangel/ambe/serial");
SWGHttpRequestWorker *worker = new SWGHttpRequestWorker();
SWGHttpRequestInput input(fullPath, "GET");
foreach(QString key, this->defaultHeaders.keys()) {
input.headers.insert(key, this->defaultHeaders.value(key));
}
connect(worker,
&SWGHttpRequestWorker::on_execution_finished,
this,
&SWGInstanceApi::instanceAMBESerialGetCallback);
worker->execute(&input);
}
void
SWGInstanceApi::instanceAMBESerialGetCallback(SWGHttpRequestWorker * worker) {
QString msg;
QString error_str = worker->error_str;
QNetworkReply::NetworkError error_type = worker->error_type;
if (worker->error_type == QNetworkReply::NoError) {
msg = QString("Success! %1 bytes").arg(worker->response.length());
}
else {
msg = "Error: " + worker->error_str;
}
QString json(worker->response);
SWGDVSerialDevices* output = static_cast<SWGDVSerialDevices*>(create(json, QString("SWGDVSerialDevices")));
worker->deleteLater();
if (worker->error_type == QNetworkReply::NoError) {
emit instanceAMBESerialGetSignal(output);
} else {
emit instanceAMBESerialGetSignalE(output, error_type, error_str);
emit instanceAMBESerialGetSignalEFull(worker, error_type, error_str);
}
}
void
SWGInstanceApi::instanceAudioGet() {
QString fullPath;

27
swagger/sdrangel/code/qt5/client/SWGInstanceApi.h
Wyświetl plik

@ -15,7 +15,6 @@
#include "SWGHttpRequest.h"
#include "SWGAMBEDevices.h"
#include "SWGAudioDevices.h"
#include "SWGAudioInputDevice.h"
#include "SWGAudioOutputDevice.h"
@ -23,7 +22,6 @@
#include "SWGConfigurationIdentifier.h"
#include "SWGConfigurationImportExport.h"
#include "SWGConfigurations.h"
#include "SWGDVSerialDevices.h"
#include "SWGDeviceSetList.h"
#include "SWGErrorResponse.h"
#include "SWGFeaturePresetIdentifier.h"
@ -58,11 +56,6 @@ public:
QString basePath;
QMap<QString, QString> defaultHeaders;
void instanceAMBEDevicesDelete();
void instanceAMBEDevicesGet();
void instanceAMBEDevicesPatch(SWGAMBEDevices& body);
void instanceAMBEDevicesPut(SWGAMBEDevices& body);
void instanceAMBESerialGet();
void instanceAudioGet();
void instanceAudioInputCleanupPatch();
void instanceAudioInputDelete(SWGAudioInputDevice& body);
@ -105,11 +98,6 @@ public:
void instanceSummary();
private:
void instanceAMBEDevicesDeleteCallback (SWGHttpRequestWorker * worker);
void instanceAMBEDevicesGetCallback (SWGHttpRequestWorker * worker);
void instanceAMBEDevicesPatchCallback (SWGHttpRequestWorker * worker);
void instanceAMBEDevicesPutCallback (SWGHttpRequestWorker * worker);
void instanceAMBESerialGetCallback (SWGHttpRequestWorker * worker);
void instanceAudioGetCallback (SWGHttpRequestWorker * worker);
void instanceAudioInputCleanupPatchCallback (SWGHttpRequestWorker * worker);
void instanceAudioInputDeleteCallback (SWGHttpRequestWorker * worker);
@ -152,11 +140,6 @@ private:
void instanceSummaryCallback (SWGHttpRequestWorker * worker);
signals:
void instanceAMBEDevicesDeleteSignal(SWGSuccessResponse* summary);
void instanceAMBEDevicesGetSignal(SWGAMBEDevices* summary);
void instanceAMBEDevicesPatchSignal(SWGAMBEDevices* summary);
void instanceAMBEDevicesPutSignal(SWGAMBEDevices* summary);
void instanceAMBESerialGetSignal(SWGDVSerialDevices* summary);
void instanceAudioGetSignal(SWGAudioDevices* summary);
void instanceAudioInputCleanupPatchSignal(SWGSuccessResponse* summary);
void instanceAudioInputDeleteSignal(SWGAudioInputDevice* summary);
@ -198,11 +181,6 @@ signals:
void instancePresetPutSignal(SWGPresetIdentifier* summary);
void instanceSummarySignal(SWGInstanceSummaryResponse* summary);
void instanceAMBEDevicesDeleteSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBEDevicesGetSignalE(SWGAMBEDevices* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBEDevicesPatchSignalE(SWGAMBEDevices* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBEDevicesPutSignalE(SWGAMBEDevices* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBESerialGetSignalE(SWGDVSerialDevices* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAudioGetSignalE(SWGAudioDevices* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAudioInputCleanupPatchSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAudioInputDeleteSignalE(SWGAudioInputDevice* summary, QNetworkReply::NetworkError error_type, QString& error_str);
@ -244,11 +222,6 @@ signals:
void instancePresetPutSignalE(SWGPresetIdentifier* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceSummarySignalE(SWGInstanceSummaryResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBEDevicesDeleteSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBEDevicesGetSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBEDevicesPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBEDevicesPutSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAMBESerialGetSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAudioGetSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAudioInputCleanupPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void instanceAudioInputDeleteSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);

24
swagger/sdrangel/code/qt5/client/SWGModelFactory.h
Wyświetl plik

@ -27,9 +27,7 @@
#include "SWGAISSettings.h"
#include "SWGAMBEActions.h"
#include "SWGAMBEDevice.h"
#include "SWGAMBEDevice_2.h"
#include "SWGAMBEDevices.h"
#include "SWGAMBEDevices_2.h"
#include "SWGAMBEReport.h"
#include "SWGAMBESettings.h"
#include "SWGAMDemodReport.h"
@ -99,9 +97,7 @@
#include "SWGDSDDemodReport.h"
#include "SWGDSDDemodSettings.h"
#include "SWGDVSerialDevice.h"
#include "SWGDVSerialDevice_2.h"
#include "SWGDVSerialDevices.h"
#include "SWGDVSerialDevices_2.h"
#include "SWGDemodAnalyzerSettings.h"
#include "SWGDeviceActions.h"
#include "SWGDeviceConfig.h"
@ -401,21 +397,11 @@ namespace SWGSDRangel {
obj->init();
return obj;
}
if(QString("SWGAMBEDevice_2").compare(type) == 0) {
SWGAMBEDevice_2 *obj = new SWGAMBEDevice_2();
obj->init();
return obj;
}
if(QString("SWGAMBEDevices").compare(type) == 0) {
SWGAMBEDevices *obj = new SWGAMBEDevices();
obj->init();
return obj;
}
if(QString("SWGAMBEDevices_2").compare(type) == 0) {
SWGAMBEDevices_2 *obj = new SWGAMBEDevices_2();
obj->init();
return obj;
}
if(QString("SWGAMBEReport").compare(type) == 0) {
SWGAMBEReport *obj = new SWGAMBEReport();
obj->init();
@ -761,21 +747,11 @@ namespace SWGSDRangel {
obj->init();
return obj;
}
if(QString("SWGDVSerialDevice_2").compare(type) == 0) {
SWGDVSerialDevice_2 *obj = new SWGDVSerialDevice_2();
obj->init();
return obj;
}
if(QString("SWGDVSerialDevices").compare(type) == 0) {
SWGDVSerialDevices *obj = new SWGDVSerialDevices();
obj->init();
return obj;
}
if(QString("SWGDVSerialDevices_2").compare(type) == 0) {
SWGDVSerialDevices_2 *obj = new SWGDVSerialDevices_2();
obj->init();
return obj;
}
if(QString("SWGDemodAnalyzerSettings").compare(type) == 0) {
SWGDemodAnalyzerSettings *obj = new SWGDemodAnalyzerSettings();
obj->init();