From e1982f606897cca2619108000edb9f655374fc5f Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 20 Apr 2019 19:52:42 +0200 Subject: [PATCH] REST API: added missing fields for reverse API in UDPSink --- sdrbase/resources/webapi/doc/html2/index.html | 18 ++- .../webapi/doc/swagger/include/UDPSink.yaml | 32 ++++-- .../sdrangel/api/swagger/include/UDPSink.yaml | 32 ++++-- swagger/sdrangel/code/html2/index.html | 18 ++- .../code/qt5/client/SWGUDPSinkSettings.cpp | 107 ++++++++++++++++++ .../code/qt5/client/SWGUDPSinkSettings.h | 30 +++++ 6 files changed, 213 insertions(+), 24 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index bfd2941de..6ee87bfa3 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -5107,6 +5107,22 @@ margin-bottom: 20px; }, "title" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + }, + "reverseAPIChannelIndex" : { + "type" : "integer" } }, "description" : "UDPSink" @@ -24717,7 +24733,7 @@ except ApiException as e:
- Generated 2019-04-20T19:28:38.784+02:00 + Generated 2019-04-20T19:47:05.616+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml index 0e81847cb..5f4f1c94e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml @@ -16,7 +16,7 @@ UDPSinkSettings: type: integer channelMute: description: channel mute (1 if muted else 0) - type: integer + type: integer gain: type: number format: float @@ -28,34 +28,45 @@ UDPSinkSettings: type: integer squelchEnabled: description: squelch enable (1 if enabled else 0) - type: integer + type: integer agc: description: AGC enable (1 if enabled else 0) - type: integer + type: integer audioActive: description: Audio return enable (1 if enabled else 0) - type: integer + type: integer audioStereo: description: Audio return stereo (1 if stereo else 0) - type: integer + type: integer volume: - type: integer + type: integer udpAddress: description: destination UDP address (remote) type: string udpPort: description: destination UDP port (remote) type: integer - format: uint16 + format: uint16 audioPort: description: audio return UDP port (local) type: integer - format: uint16 + format: uint16 rgbColor: - type: integer + type: integer title: type: string - + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + reverseAPIChannelIndex: + type: integer + UDPSinkReport: description: UDPSink properties: @@ -72,4 +83,3 @@ UDPSinkReport: type: integer inputSampleRate: type: integer - \ No newline at end of file diff --git a/swagger/sdrangel/api/swagger/include/UDPSink.yaml b/swagger/sdrangel/api/swagger/include/UDPSink.yaml index 0e81847cb..5f4f1c94e 100644 --- a/swagger/sdrangel/api/swagger/include/UDPSink.yaml +++ b/swagger/sdrangel/api/swagger/include/UDPSink.yaml @@ -16,7 +16,7 @@ UDPSinkSettings: type: integer channelMute: description: channel mute (1 if muted else 0) - type: integer + type: integer gain: type: number format: float @@ -28,34 +28,45 @@ UDPSinkSettings: type: integer squelchEnabled: description: squelch enable (1 if enabled else 0) - type: integer + type: integer agc: description: AGC enable (1 if enabled else 0) - type: integer + type: integer audioActive: description: Audio return enable (1 if enabled else 0) - type: integer + type: integer audioStereo: description: Audio return stereo (1 if stereo else 0) - type: integer + type: integer volume: - type: integer + type: integer udpAddress: description: destination UDP address (remote) type: string udpPort: description: destination UDP port (remote) type: integer - format: uint16 + format: uint16 audioPort: description: audio return UDP port (local) type: integer - format: uint16 + format: uint16 rgbColor: - type: integer + type: integer title: type: string - + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + reverseAPIChannelIndex: + type: integer + UDPSinkReport: description: UDPSink properties: @@ -72,4 +83,3 @@ UDPSinkReport: type: integer inputSampleRate: type: integer - \ No newline at end of file diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index bfd2941de..6ee87bfa3 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -5107,6 +5107,22 @@ margin-bottom: 20px; }, "title" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + }, + "reverseAPIChannelIndex" : { + "type" : "integer" } }, "description" : "UDPSink" @@ -24717,7 +24733,7 @@ except ApiException as e:
- Generated 2019-04-20T19:28:38.784+02:00 + Generated 2019-04-20T19:47:05.616+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp index bf8572483..9a687b778 100644 --- a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp @@ -66,6 +66,16 @@ SWGUDPSinkSettings::SWGUDPSinkSettings() { m_rgb_color_isSet = false; title = nullptr; m_title_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; + reverse_api_channel_index = 0; + m_reverse_api_channel_index_isSet = false; } SWGUDPSinkSettings::~SWGUDPSinkSettings() { @@ -112,6 +122,16 @@ SWGUDPSinkSettings::init() { m_rgb_color_isSet = false; title = new QString(""); m_title_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; + reverse_api_channel_index = 0; + m_reverse_api_channel_index_isSet = false; } void @@ -139,6 +159,13 @@ SWGUDPSinkSettings::cleanup() { if(title != nullptr) { delete title; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + + } SWGUDPSinkSettings* @@ -190,6 +217,16 @@ SWGUDPSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + } QString @@ -263,6 +300,21 @@ SWGUDPSinkSettings::asJsonObject() { if(title != nullptr && *title != QString("")){ toJsonValue(QString("title"), title, obj, QString("QString")); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } + if(m_reverse_api_channel_index_isSet){ + obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); + } return obj; } @@ -457,6 +509,56 @@ SWGUDPSinkSettings::setTitle(QString* title) { this->m_title_isSet = true; } +qint32 +SWGUDPSinkSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGUDPSinkSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGUDPSinkSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGUDPSinkSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGUDPSinkSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGUDPSinkSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGUDPSinkSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGUDPSinkSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + +qint32 +SWGUDPSinkSettings::getReverseApiChannelIndex() { + return reverse_api_channel_index; +} +void +SWGUDPSinkSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) { + this->reverse_api_channel_index = reverse_api_channel_index; + this->m_reverse_api_channel_index_isSet = true; +} + bool SWGUDPSinkSettings::isSet(){ @@ -481,6 +583,11 @@ SWGUDPSinkSettings::isSet(){ if(m_audio_port_isSet){ isObjectUpdated = true; break;} if(m_rgb_color_isSet){ isObjectUpdated = true; break;} if(title != nullptr && *title != QString("")){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h index 465c5f62a..cc4873fe6 100644 --- a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h @@ -99,6 +99,21 @@ public: QString* getTitle(); void setTitle(QString* title); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + + qint32 getReverseApiChannelIndex(); + void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + virtual bool isSet() override; @@ -160,6 +175,21 @@ private: QString* title; bool m_title_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + + qint32 reverse_api_channel_index; + bool m_reverse_api_channel_index_isSet; + }; }