From 4a3a3a26593fe4f99f1025b1d4ba387489024887 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 27 Aug 2020 09:54:51 +0200 Subject: [PATCH] Remote Input: multicast: REST API generated code --- sdrbase/resources/webapi/doc/html2/index.html | 9 +++- .../doc/swagger/include/RemoteInput.yaml | 8 ++++ swagger/sdrangel/code/html2/index.html | 9 +++- .../qt5/client/SWGRemoteInputSettings.cpp | 48 +++++++++++++++++++ .../code/qt5/client/SWGRemoteInputSettings.h | 12 +++++ 5 files changed, 84 insertions(+), 2 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 40d126c29..e235468df 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -5481,6 +5481,13 @@ margin-bottom: 20px; "dataPort" : { "type" : "integer" }, + "multicastAddress" : { + "type" : "string" + }, + "multicastJoin" : { + "type" : "integer", + "description" : "Joim multicast group * 0 - leave group * 1 - join group\n" + }, "dcBlock" : { "type" : "integer" }, @@ -33312,7 +33319,7 @@ except ApiException as e:
- Generated 2020-08-25T00:09:04.978+02:00 + Generated 2020-08-27T07:43:19.609+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml index a35e4dbb3..2f6c14bac 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml @@ -9,6 +9,14 @@ RemoteInputSettings: type: string dataPort: type: integer + multicastAddress: + type: string + multicastJoin: + type: integer + description: > + Joim multicast group + * 0 - leave group + * 1 - join group dcBlock: type: integer iqCorrection: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 40d126c29..e235468df 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -5481,6 +5481,13 @@ margin-bottom: 20px; "dataPort" : { "type" : "integer" }, + "multicastAddress" : { + "type" : "string" + }, + "multicastJoin" : { + "type" : "integer", + "description" : "Joim multicast group * 0 - leave group * 1 - join group\n" + }, "dcBlock" : { "type" : "integer" }, @@ -33312,7 +33319,7 @@ except ApiException as e:
- Generated 2020-08-25T00:09:04.978+02:00 + Generated 2020-08-27T07:43:19.609+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp index c25e26ef5..71fdda251 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.cpp @@ -36,6 +36,10 @@ SWGRemoteInputSettings::SWGRemoteInputSettings() { m_data_address_isSet = false; data_port = 0; m_data_port_isSet = false; + multicast_address = nullptr; + m_multicast_address_isSet = false; + multicast_join = 0; + m_multicast_join_isSet = false; dc_block = 0; m_dc_block_isSet = false; iq_correction = 0; @@ -64,6 +68,10 @@ SWGRemoteInputSettings::init() { m_data_address_isSet = false; data_port = 0; m_data_port_isSet = false; + multicast_address = new QString(""); + m_multicast_address_isSet = false; + multicast_join = 0; + m_multicast_join_isSet = false; dc_block = 0; m_dc_block_isSet = false; iq_correction = 0; @@ -88,6 +96,10 @@ SWGRemoteInputSettings::cleanup() { delete data_address; } + if(multicast_address != nullptr) { + delete multicast_address; + } + @@ -117,6 +129,10 @@ SWGRemoteInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&data_port, pJson["dataPort"], "qint32", ""); + ::SWGSDRangel::setValue(&multicast_address, pJson["multicastAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&multicast_join, pJson["multicastJoin"], "qint32", ""); + ::SWGSDRangel::setValue(&dc_block, pJson["dcBlock"], "qint32", ""); ::SWGSDRangel::setValue(&iq_correction, pJson["iqCorrection"], "qint32", ""); @@ -157,6 +173,12 @@ SWGRemoteInputSettings::asJsonObject() { if(m_data_port_isSet){ obj->insert("dataPort", QJsonValue(data_port)); } + if(multicast_address != nullptr && *multicast_address != QString("")){ + toJsonValue(QString("multicastAddress"), multicast_address, obj, QString("QString")); + } + if(m_multicast_join_isSet){ + obj->insert("multicastJoin", QJsonValue(multicast_join)); + } if(m_dc_block_isSet){ obj->insert("dcBlock", QJsonValue(dc_block)); } @@ -219,6 +241,26 @@ SWGRemoteInputSettings::setDataPort(qint32 data_port) { this->m_data_port_isSet = true; } +QString* +SWGRemoteInputSettings::getMulticastAddress() { + return multicast_address; +} +void +SWGRemoteInputSettings::setMulticastAddress(QString* multicast_address) { + this->multicast_address = multicast_address; + this->m_multicast_address_isSet = true; +} + +qint32 +SWGRemoteInputSettings::getMulticastJoin() { + return multicast_join; +} +void +SWGRemoteInputSettings::setMulticastJoin(qint32 multicast_join) { + this->multicast_join = multicast_join; + this->m_multicast_join_isSet = true; +} + qint32 SWGRemoteInputSettings::getDcBlock() { return dc_block; @@ -296,6 +338,12 @@ SWGRemoteInputSettings::isSet(){ if(m_data_port_isSet){ isObjectUpdated = true; break; } + if(multicast_address && *multicast_address != QString("")){ + isObjectUpdated = true; break; + } + if(m_multicast_join_isSet){ + isObjectUpdated = true; break; + } if(m_dc_block_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.h index 10a07ea0e..699e62ab9 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteInputSettings.h @@ -54,6 +54,12 @@ public: qint32 getDataPort(); void setDataPort(qint32 data_port); + QString* getMulticastAddress(); + void setMulticastAddress(QString* multicast_address); + + qint32 getMulticastJoin(); + void setMulticastJoin(qint32 multicast_join); + qint32 getDcBlock(); void setDcBlock(qint32 dc_block); @@ -88,6 +94,12 @@ private: qint32 data_port; bool m_data_port_isSet; + QString* multicast_address; + bool m_multicast_address_isSet; + + qint32 multicast_join; + bool m_multicast_join_isSet; + qint32 dc_block; bool m_dc_block_isSet;