diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index e53ddd04b..dce3bcbbc 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -8457,6 +8457,9 @@ margin-bottom: 20px; "type" : "integer", "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" }, + "fileRecordName" : { + "type" : "string" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -8518,9 +8521,6 @@ margin-bottom: 20px; "type" : "integer", "description" : "Frequency (Hz) of external clock source" }, - "fileRecordName" : { - "type" : "string" - }, "gpioDir" : { "type" : "integer", "description" : "8 bit GPIO pin direction LSB first 0 input, 1 output" @@ -37491,7 +37491,7 @@ except ApiException as e:
- Generated 2020-07-09T19:58:44.252+02:00 + Generated 2020-07-09T20:03:50.125+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml b/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml index e3320cb8a..7bdcab75f 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml @@ -58,6 +58,8 @@ XtrxInputSettings: IQ samples order * 0 - Q then I (swapped) * 1 - I then Q (straight) + fileRecordName: + type: string useReverseAPI: description: Synchronize with reverse API (1 for yes, 0 for no) type: integer @@ -167,8 +169,6 @@ XtrxMIMOSettings: extClockFreq: description: Frequency (Hz) of external clock source type: integer - fileRecordName: - type: string gpioDir: description: 8 bit GPIO pin direction LSB first 0 input, 1 output type: integer diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index e53ddd04b..dce3bcbbc 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -8457,6 +8457,9 @@ margin-bottom: 20px; "type" : "integer", "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" }, + "fileRecordName" : { + "type" : "string" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -8518,9 +8521,6 @@ margin-bottom: 20px; "type" : "integer", "description" : "Frequency (Hz) of external clock source" }, - "fileRecordName" : { - "type" : "string" - }, "gpioDir" : { "type" : "integer", "description" : "8 bit GPIO pin direction LSB first 0 input, 1 output" @@ -37491,7 +37491,7 @@ except ApiException as e:
- Generated 2020-07-09T19:58:44.252+02:00 + Generated 2020-07-09T20:03:50.125+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp index c535e3785..f5243c521 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp @@ -66,6 +66,8 @@ SWGXtrxInputSettings::SWGXtrxInputSettings() { m_pwrmode_isSet = false; iq_order = 0; m_iq_order_isSet = false; + file_record_name = nullptr; + m_file_record_name_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = nullptr; @@ -120,6 +122,8 @@ SWGXtrxInputSettings::init() { m_pwrmode_isSet = false; iq_order = 0; m_iq_order_isSet = false; + file_record_name = new QString(""); + m_file_record_name_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = new QString(""); @@ -151,6 +155,9 @@ SWGXtrxInputSettings::cleanup() { + if(file_record_name != nullptr) { + delete file_record_name; + } if(reverse_api_address != nullptr) { delete reverse_api_address; @@ -208,6 +215,8 @@ SWGXtrxInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); @@ -289,6 +298,9 @@ SWGXtrxInputSettings::asJsonObject() { if(m_iq_order_isSet){ obj->insert("iqOrder", QJsonValue(iq_order)); } + if(file_record_name != nullptr && *file_record_name != QString("")){ + toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); + } if(m_use_reverse_api_isSet){ obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); } @@ -495,6 +507,16 @@ SWGXtrxInputSettings::setIqOrder(qint32 iq_order) { this->m_iq_order_isSet = true; } +QString* +SWGXtrxInputSettings::getFileRecordName() { + return file_record_name; +} +void +SWGXtrxInputSettings::setFileRecordName(QString* file_record_name) { + this->file_record_name = file_record_name; + this->m_file_record_name_isSet = true; +} + qint32 SWGXtrxInputSettings::getUseReverseApi() { return use_reverse_api; @@ -597,6 +619,9 @@ SWGXtrxInputSettings::isSet(){ if(m_iq_order_isSet){ isObjectUpdated = true; break; } + if(file_record_name && *file_record_name != QString("")){ + isObjectUpdated = true; break; + } if(m_use_reverse_api_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h index 864e18b75..29e7fa0a0 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h @@ -99,6 +99,9 @@ public: qint32 getIqOrder(); void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); + void setFileRecordName(QString* file_record_name); + qint32 getUseReverseApi(); void setUseReverseApi(qint32 use_reverse_api); @@ -172,6 +175,9 @@ private: qint32 iq_order; bool m_iq_order_isSet; + QString* file_record_name; + bool m_file_record_name_isSet; + qint32 use_reverse_api; bool m_use_reverse_api_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp index 61d2745f0..8e0f0ade8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp @@ -32,8 +32,6 @@ SWGXtrxMIMOSettings::SWGXtrxMIMOSettings() { m_ext_clock_isSet = false; ext_clock_freq = 0; m_ext_clock_freq_isSet = false; - file_record_name = nullptr; - m_file_record_name_isSet = false; gpio_dir = 0; m_gpio_dir_isSet = false; gpio_pins = 0; @@ -132,8 +130,6 @@ SWGXtrxMIMOSettings::init() { m_ext_clock_isSet = false; ext_clock_freq = 0; m_ext_clock_freq_isSet = false; - file_record_name = new QString(""); - m_file_record_name_isSet = false; gpio_dir = 0; m_gpio_dir_isSet = false; gpio_pins = 0; @@ -226,9 +222,6 @@ void SWGXtrxMIMOSettings::cleanup() { - if(file_record_name != nullptr) { - delete file_record_name; - } @@ -291,8 +284,6 @@ SWGXtrxMIMOSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&ext_clock_freq, pJson["extClockFreq"], "qint32", ""); - ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); - ::SWGSDRangel::setValue(&gpio_dir, pJson["gpioDir"], "qint32", ""); ::SWGSDRangel::setValue(&gpio_pins, pJson["gpioPins"], "qint32", ""); @@ -401,9 +392,6 @@ SWGXtrxMIMOSettings::asJsonObject() { if(m_ext_clock_freq_isSet){ obj->insert("extClockFreq", QJsonValue(ext_clock_freq)); } - if(file_record_name != nullptr && *file_record_name != QString("")){ - toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); - } if(m_gpio_dir_isSet){ obj->insert("gpioDir", QJsonValue(gpio_dir)); } @@ -557,16 +545,6 @@ SWGXtrxMIMOSettings::setExtClockFreq(qint32 ext_clock_freq) { this->m_ext_clock_freq_isSet = true; } -QString* -SWGXtrxMIMOSettings::getFileRecordName() { - return file_record_name; -} -void -SWGXtrxMIMOSettings::setFileRecordName(QString* file_record_name) { - this->file_record_name = file_record_name; - this->m_file_record_name_isSet = true; -} - qint32 SWGXtrxMIMOSettings::getGpioDir() { return gpio_dir; @@ -1008,9 +986,6 @@ SWGXtrxMIMOSettings::isSet(){ if(m_ext_clock_freq_isSet){ isObjectUpdated = true; break; } - if(file_record_name && *file_record_name != QString("")){ - isObjectUpdated = true; break; - } if(m_gpio_dir_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h index 166d4bbb8..882cab235 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h @@ -48,9 +48,6 @@ public: qint32 getExtClockFreq(); void setExtClockFreq(qint32 ext_clock_freq); - QString* getFileRecordName(); - void setFileRecordName(QString* file_record_name); - qint32 getGpioDir(); void setGpioDir(qint32 gpio_dir); @@ -190,9 +187,6 @@ private: qint32 ext_clock_freq; bool m_ext_clock_freq_isSet; - QString* file_record_name; - bool m_file_record_name_isSet; - qint32 gpio_dir; bool m_gpio_dir_isSet;