diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 84c12df34..eced93a84 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1186,6 +1186,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "bandIndex" : { "type" : "integer" }, @@ -1298,6 +1302,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1673,6 +1681,10 @@ margin-bottom: 20px; "iqCorrection" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1813,6 +1825,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1886,6 +1902,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "txCenterFrequency" : { "type" : "integer", "format" : "int64" @@ -3581,6 +3601,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -3676,6 +3700,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -4351,6 +4379,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -4856,6 +4888,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5024,6 +5060,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "ncoEnableRx" : { "type" : "integer", "description" : "Boolean 1 to enable TSP NCO and mixing else 0" @@ -5770,6 +5810,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5891,6 +5935,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -6655,6 +6703,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "rfBandwidth" : { "type" : "integer" }, @@ -6764,6 +6816,10 @@ margin-bottom: 20px; "basebandGain" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -7255,6 +7311,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -8386,6 +8446,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "LMS power mode (0 save max to 7 perf max)" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -8511,6 +8575,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "Antenna selected (enum value from XTRXMIMOSettings::RxAntenna):\n * 0 - RXANT_LO low range\n * 1 - RXANT_WI wide range\n * 2 - RXANT_HI high range\n" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "lpfBWRx0" : { "type" : "integer", "description" : "LMS analog lowpass filter bandwidth (Hz) for Rx channel 0" @@ -37419,7 +37487,7 @@ except ApiException as e:
- Generated 2020-06-17T01:13:04.761+02:00 + Generated 2020-06-21T22:52:40.950+02:00
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 84c12df34..eced93a84 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1186,6 +1186,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "bandIndex" : { "type" : "integer" }, @@ -1298,6 +1302,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1673,6 +1681,10 @@ margin-bottom: 20px; "iqCorrection" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1813,6 +1825,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1886,6 +1902,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "txCenterFrequency" : { "type" : "integer", "format" : "int64" @@ -3581,6 +3601,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -3676,6 +3700,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -4351,6 +4379,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -4856,6 +4888,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5024,6 +5060,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "ncoEnableRx" : { "type" : "integer", "description" : "Boolean 1 to enable TSP NCO and mixing else 0" @@ -5770,6 +5810,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5891,6 +5935,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -6655,6 +6703,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "rfBandwidth" : { "type" : "integer" }, @@ -6764,6 +6816,10 @@ margin-bottom: 20px; "basebandGain" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -7255,6 +7311,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -8386,6 +8446,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "LMS power mode (0 save max to 7 perf max)" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -8511,6 +8575,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "Antenna selected (enum value from XTRXMIMOSettings::RxAntenna):\n * 0 - RXANT_LO low range\n * 1 - RXANT_WI wide range\n * 2 - RXANT_HI high range\n" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "lpfBWRx0" : { "type" : "integer", "description" : "LMS analog lowpass filter bandwidth (Hz) for Rx channel 0" @@ -37419,7 +37487,7 @@ except ApiException as e:
- Generated 2020-06-17T01:13:04.761+02:00 + Generated 2020-06-21T22:52:40.950+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp index 90ca7c07f..c3c40cb71 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp @@ -40,6 +40,8 @@ SWGAirspyHFSettings::SWGAirspyHFSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; band_index = 0; m_band_index_isSet = false; file_record_name = nullptr; @@ -86,6 +88,8 @@ SWGAirspyHFSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; band_index = 0; m_band_index_isSet = false; file_record_name = new QString(""); @@ -123,6 +127,7 @@ SWGAirspyHFSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -164,6 +169,8 @@ SWGAirspyHFSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&band_index, pJson["bandIndex"], "qint32", ""); ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); @@ -224,6 +231,9 @@ SWGAirspyHFSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_band_index_isSet){ obj->insert("bandIndex", QJsonValue(band_index)); } @@ -327,6 +337,16 @@ SWGAirspyHFSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGAirspyHFSettings::getIqOrder() { + return iq_order; +} +void +SWGAirspyHFSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGAirspyHFSettings::getBandIndex() { return band_index; @@ -480,6 +500,9 @@ SWGAirspyHFSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_band_index_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h index cdd2ef4dc..1b96a8d45 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h @@ -60,6 +60,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getBandIndex(); void setBandIndex(qint32 band_index); @@ -121,6 +124,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 band_index; bool m_band_index_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp index 363238ef1..daa7b2fc5 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp @@ -58,6 +58,8 @@ SWGAirspySettings::SWGAirspySettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -106,6 +108,8 @@ SWGAirspySettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_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; @@ -135,6 +139,7 @@ SWGAirspySettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -187,6 +192,8 @@ SWGAirspySettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -258,6 +265,9 @@ SWGAirspySettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -427,6 +437,16 @@ SWGAirspySettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGAirspySettings::getIqOrder() { + return iq_order; +} +void +SWGAirspySettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGAirspySettings::getFileRecordName() { return file_record_name; @@ -527,6 +547,9 @@ SWGAirspySettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h index c297b9c72..9267ce28f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h @@ -87,6 +87,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -151,6 +154,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp index e7275a5fc..8fe44e2b5 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp @@ -54,6 +54,8 @@ SWGBladeRF1InputSettings::SWGBladeRF1InputSettings() { m_dc_block_isSet = false; iq_correction = 0; m_iq_correction_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -98,6 +100,8 @@ SWGBladeRF1InputSettings::init() { m_dc_block_isSet = false; iq_correction = 0; m_iq_correction_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; @@ -125,6 +129,7 @@ SWGBladeRF1InputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -173,6 +178,8 @@ SWGBladeRF1InputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&iq_correction, pJson["iqCorrection"], "qint32", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -238,6 +245,9 @@ SWGBladeRF1InputSettings::asJsonObject() { if(m_iq_correction_isSet){ obj->insert("iqCorrection", QJsonValue(iq_correction)); } + 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")); } @@ -387,6 +397,16 @@ SWGBladeRF1InputSettings::setIqCorrection(qint32 iq_correction) { this->m_iq_correction_isSet = true; } +qint32 +SWGBladeRF1InputSettings::getIqOrder() { + return iq_order; +} +void +SWGBladeRF1InputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGBladeRF1InputSettings::getFileRecordName() { return file_record_name; @@ -481,6 +501,9 @@ SWGBladeRF1InputSettings::isSet(){ if(m_iq_correction_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h index 8b8d6fb80..397d69086 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h @@ -81,6 +81,9 @@ public: qint32 getIqCorrection(); void setIqCorrection(qint32 iq_correction); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -139,6 +142,9 @@ private: qint32 iq_correction; bool m_iq_correction_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp index 841f66a27..5e8e9be2a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp @@ -54,6 +54,8 @@ SWGBladeRF2InputSettings::SWGBladeRF2InputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -98,6 +100,8 @@ SWGBladeRF2InputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_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; @@ -125,6 +129,7 @@ SWGBladeRF2InputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -173,6 +178,8 @@ SWGBladeRF2InputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -238,6 +245,9 @@ SWGBladeRF2InputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -387,6 +397,16 @@ SWGBladeRF2InputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGBladeRF2InputSettings::getIqOrder() { + return iq_order; +} +void +SWGBladeRF2InputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGBladeRF2InputSettings::getFileRecordName() { return file_record_name; @@ -481,6 +501,9 @@ SWGBladeRF2InputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h index 810ec366e..a926ae572 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h @@ -81,6 +81,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -139,6 +142,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp index a397b7f23..570509c0a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp @@ -58,6 +58,8 @@ SWGBladeRF2MIMOSettings::SWGBladeRF2MIMOSettings() { m_rx_transverter_mode_isSet = false; rx_transverter_delta_frequency = 0L; m_rx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; tx_center_frequency = 0L; m_tx_center_frequency_isSet = false; log2_interp = 0; @@ -124,6 +126,8 @@ SWGBladeRF2MIMOSettings::init() { m_rx_transverter_mode_isSet = false; rx_transverter_delta_frequency = 0L; m_rx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; tx_center_frequency = 0L; m_tx_center_frequency_isSet = false; log2_interp = 0; @@ -178,6 +182,7 @@ SWGBladeRF2MIMOSettings::cleanup() { + if(file_record_name != nullptr) { @@ -232,6 +237,8 @@ SWGBladeRF2MIMOSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&rx_transverter_delta_frequency, pJson["rxTransverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&tx_center_frequency, pJson["txCenterFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&log2_interp, pJson["log2Interp"], "qint32", ""); @@ -321,6 +328,9 @@ SWGBladeRF2MIMOSettings::asJsonObject() { if(m_rx_transverter_delta_frequency_isSet){ obj->insert("rxTransverterDeltaFrequency", QJsonValue(rx_transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_tx_center_frequency_isSet){ obj->insert("txCenterFrequency", QJsonValue(tx_center_frequency)); } @@ -517,6 +527,16 @@ SWGBladeRF2MIMOSettings::setRxTransverterDeltaFrequency(qint64 rx_transverter_de this->m_rx_transverter_delta_frequency_isSet = true; } +qint32 +SWGBladeRF2MIMOSettings::getIqOrder() { + return iq_order; +} +void +SWGBladeRF2MIMOSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint64 SWGBladeRF2MIMOSettings::getTxCenterFrequency() { return tx_center_frequency; @@ -707,6 +727,9 @@ SWGBladeRF2MIMOSettings::isSet(){ if(m_rx_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_tx_center_frequency_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h index 13434ba0b..253601dbc 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h @@ -87,6 +87,9 @@ public: qint64 getRxTransverterDeltaFrequency(); void setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint64 getTxCenterFrequency(); void setTxCenterFrequency(qint64 tx_center_frequency); @@ -178,6 +181,9 @@ private: qint64 rx_transverter_delta_frequency; bool m_rx_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint64 tx_center_frequency; bool m_tx_center_frequency_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp index bf68c9dca..4edc8423b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp @@ -58,6 +58,8 @@ SWGFCDProPlusSettings::SWGFCDProPlusSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -106,6 +108,8 @@ SWGFCDProPlusSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_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; @@ -135,6 +139,7 @@ SWGFCDProPlusSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -187,6 +192,8 @@ SWGFCDProPlusSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -258,6 +265,9 @@ SWGFCDProPlusSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -427,6 +437,16 @@ SWGFCDProPlusSettings::setTransverterDeltaFrequency(qint64 transverter_delta_fre this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGFCDProPlusSettings::getIqOrder() { + return iq_order; +} +void +SWGFCDProPlusSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGFCDProPlusSettings::getFileRecordName() { return file_record_name; @@ -527,6 +547,9 @@ SWGFCDProPlusSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h index 8c5128ce9..861129583 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h @@ -87,6 +87,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -151,6 +154,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp index 209381f4a..d97693cb3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp @@ -76,6 +76,8 @@ SWGFCDProSettings::SWGFCDProSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -142,6 +144,8 @@ SWGFCDProSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_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; @@ -178,6 +182,7 @@ SWGFCDProSettings::cleanup() { + if(file_record_name != nullptr) { @@ -250,6 +255,8 @@ SWGFCDProSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -348,6 +355,9 @@ SWGFCDProSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -607,6 +617,16 @@ SWGFCDProSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGFCDProSettings::getIqOrder() { + return iq_order; +} +void +SWGFCDProSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGFCDProSettings::getFileRecordName() { return file_record_name; @@ -734,6 +754,9 @@ SWGFCDProSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h index dd49b8663..5c6a2aa3a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h @@ -114,6 +114,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -205,6 +208,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp index b2e66a3af..9bc9b2232 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp @@ -58,6 +58,8 @@ SWGHackRFInputSettings::SWGHackRFInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = nullptr; @@ -104,6 +106,8 @@ SWGHackRFInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = new QString(""); @@ -134,6 +138,7 @@ SWGHackRFInputSettings::cleanup() { + if(reverse_api_address != nullptr) { delete reverse_api_address; } @@ -182,6 +187,8 @@ SWGHackRFInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); @@ -251,6 +258,9 @@ SWGHackRFInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_use_reverse_api_isSet){ obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); } @@ -417,6 +427,16 @@ SWGHackRFInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_fr this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGHackRFInputSettings::getIqOrder() { + return iq_order; +} +void +SWGHackRFInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGHackRFInputSettings::getUseReverseApi() { return use_reverse_api; @@ -507,6 +527,9 @@ SWGHackRFInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_use_reverse_api_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h index 8e3427460..1dc7296f4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h @@ -87,6 +87,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getUseReverseApi(); void setUseReverseApi(qint32 use_reverse_api); @@ -148,6 +151,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 use_reverse_api; bool m_use_reverse_api_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp index 88442e6e8..9ee00ca07 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp @@ -70,6 +70,8 @@ SWGLimeSdrInputSettings::SWGLimeSdrInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; gpio_dir = 0; @@ -134,6 +136,8 @@ SWGLimeSdrInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; gpio_dir = 0; @@ -171,6 +175,7 @@ SWGLimeSdrInputSettings::cleanup() { + if(file_record_name != nullptr) { @@ -239,6 +244,8 @@ SWGLimeSdrInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&gpio_dir, pJson["gpioDir"], "qint32", ""); @@ -332,6 +339,9 @@ SWGLimeSdrInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -567,6 +577,16 @@ SWGLimeSdrInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_f this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGLimeSdrInputSettings::getIqOrder() { + return iq_order; +} +void +SWGLimeSdrInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGLimeSdrInputSettings::getFileRecordName() { return file_record_name; @@ -705,6 +725,9 @@ SWGLimeSdrInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h index 9fa1fefb2..89452f374 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h @@ -105,6 +105,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -193,6 +196,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.cpp index f96d64d0e..91641bfb7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.cpp @@ -62,6 +62,8 @@ SWGLimeSdrMIMOSettings::SWGLimeSdrMIMOSettings() { m_rx_transverter_mode_isSet = false; rx_transverter_delta_frequency = 0L; m_rx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; nco_enable_rx = 0; m_nco_enable_rx_isSet = false; nco_frequency_rx = 0; @@ -178,6 +180,8 @@ SWGLimeSdrMIMOSettings::init() { m_rx_transverter_mode_isSet = false; rx_transverter_delta_frequency = 0L; m_rx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; nco_enable_rx = 0; m_nco_enable_rx_isSet = false; nco_frequency_rx = 0; @@ -312,6 +316,7 @@ SWGLimeSdrMIMOSettings::cleanup() { + } @@ -361,6 +366,8 @@ SWGLimeSdrMIMOSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&rx_transverter_delta_frequency, pJson["rxTransverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&nco_enable_rx, pJson["ncoEnableRx"], "qint32", ""); ::SWGSDRangel::setValue(&nco_frequency_rx, pJson["ncoFrequencyRx"], "qint32", ""); @@ -502,6 +509,9 @@ SWGLimeSdrMIMOSettings::asJsonObject() { if(m_rx_transverter_delta_frequency_isSet){ obj->insert("rxTransverterDeltaFrequency", QJsonValue(rx_transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_nco_enable_rx_isSet){ obj->insert("ncoEnableRx", QJsonValue(nco_enable_rx)); } @@ -787,6 +797,16 @@ SWGLimeSdrMIMOSettings::setRxTransverterDeltaFrequency(qint64 rx_transverter_del this->m_rx_transverter_delta_frequency_isSet = true; } +qint32 +SWGLimeSdrMIMOSettings::getIqOrder() { + return iq_order; +} +void +SWGLimeSdrMIMOSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGLimeSdrMIMOSettings::getNcoEnableRx() { return nco_enable_rx; @@ -1213,6 +1233,9 @@ SWGLimeSdrMIMOSettings::isSet(){ if(m_rx_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_nco_enable_rx_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.h b/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.h index 7d0caab42..bc3966590 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrMIMOSettings.h @@ -93,6 +93,9 @@ public: qint64 getRxTransverterDeltaFrequency(); void setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getNcoEnableRx(); void setNcoEnableRx(qint32 nco_enable_rx); @@ -259,6 +262,9 @@ private: qint64 rx_transverter_delta_frequency; bool m_rx_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 nco_enable_rx; bool m_nco_enable_rx_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp index 1e67616a8..1d48c7f64 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp @@ -46,6 +46,8 @@ SWGPerseusSettings::SWGPerseusSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; attenuator = 0; @@ -84,6 +86,8 @@ SWGPerseusSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; attenuator = 0; @@ -109,6 +113,7 @@ SWGPerseusSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -150,6 +155,8 @@ SWGPerseusSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&attenuator, pJson["attenuator"], "qint32", ""); @@ -205,6 +212,9 @@ SWGPerseusSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -317,6 +327,16 @@ SWGPerseusSettings::setTransverterDeltaFrequency(qint64 transverter_delta_freque this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGPerseusSettings::getIqOrder() { + return iq_order; +} +void +SWGPerseusSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGPerseusSettings::getFileRecordName() { return file_record_name; @@ -409,6 +429,9 @@ SWGPerseusSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h index a1460fe68..65e4f3faa 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h @@ -69,6 +69,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -118,6 +121,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp index 8f1684bfc..f3c13d024 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp @@ -68,6 +68,8 @@ SWGPlutoSdrInputSettings::SWGPlutoSdrInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -126,6 +128,8 @@ SWGPlutoSdrInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_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; @@ -159,6 +163,7 @@ SWGPlutoSdrInputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; @@ -222,6 +227,8 @@ SWGPlutoSdrInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -308,6 +315,9 @@ SWGPlutoSdrInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -527,6 +537,16 @@ SWGPlutoSdrInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGPlutoSdrInputSettings::getIqOrder() { + return iq_order; +} +void +SWGPlutoSdrInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGPlutoSdrInputSettings::getFileRecordName() { return file_record_name; @@ -642,6 +662,9 @@ SWGPlutoSdrInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h index d969de903..b75ae7c42 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h @@ -102,6 +102,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -181,6 +184,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp index 5153e5db4..810fb48f3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp @@ -56,6 +56,8 @@ SWGRtlSdrSettings::SWGRtlSdrSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; rf_bandwidth = 0; m_rf_bandwidth_isSet = false; file_record_name = nullptr; @@ -104,6 +106,8 @@ SWGRtlSdrSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; rf_bandwidth = 0; m_rf_bandwidth_isSet = false; file_record_name = new QString(""); @@ -135,6 +139,7 @@ SWGRtlSdrSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -185,6 +190,8 @@ SWGRtlSdrSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "qint32", ""); ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); @@ -255,6 +262,9 @@ SWGRtlSdrSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_rf_bandwidth_isSet){ obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); } @@ -417,6 +427,16 @@ SWGRtlSdrSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGRtlSdrSettings::getIqOrder() { + return iq_order; +} +void +SWGRtlSdrSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGRtlSdrSettings::getRfBandwidth() { return rf_bandwidth; @@ -524,6 +544,9 @@ SWGRtlSdrSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h index 72ebb91b9..8b714cb4f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h @@ -84,6 +84,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getRfBandwidth(); void setRfBandwidth(qint32 rf_bandwidth); @@ -148,6 +151,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 rf_bandwidth; bool m_rf_bandwidth_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp index 14259465f..582d0eb3a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp @@ -58,6 +58,8 @@ SWGSDRPlaySettings::SWGSDRPlaySettings() { m_mixer_amp_on_isSet = false; baseband_gain = 0; m_baseband_gain_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -106,6 +108,8 @@ SWGSDRPlaySettings::init() { m_mixer_amp_on_isSet = false; baseband_gain = 0; m_baseband_gain_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; @@ -135,6 +139,7 @@ SWGSDRPlaySettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -187,6 +192,8 @@ SWGSDRPlaySettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&baseband_gain, pJson["basebandGain"], "qint32", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -258,6 +265,9 @@ SWGSDRPlaySettings::asJsonObject() { if(m_baseband_gain_isSet){ obj->insert("basebandGain", QJsonValue(baseband_gain)); } + 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")); } @@ -427,6 +437,16 @@ SWGSDRPlaySettings::setBasebandGain(qint32 baseband_gain) { this->m_baseband_gain_isSet = true; } +qint32 +SWGSDRPlaySettings::getIqOrder() { + return iq_order; +} +void +SWGSDRPlaySettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGSDRPlaySettings::getFileRecordName() { return file_record_name; @@ -527,6 +547,9 @@ SWGSDRPlaySettings::isSet(){ if(m_baseband_gain_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h index e2e93e9b9..b426c7a22 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h @@ -87,6 +87,9 @@ public: qint32 getBasebandGain(); void setBasebandGain(qint32 baseband_gain); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -151,6 +154,9 @@ private: qint32 baseband_gain; bool m_baseband_gain_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp index 330278914..6fb664ea2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp @@ -46,6 +46,8 @@ SWGSoapySDRInputSettings::SWGSoapySDRInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; antenna = nullptr; @@ -106,6 +108,8 @@ SWGSoapySDRInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; antenna = new QString(""); @@ -153,6 +157,7 @@ SWGSoapySDRInputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -235,6 +240,8 @@ SWGSoapySDRInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&antenna, pJson["antenna"], "QString", "QString"); @@ -312,6 +319,9 @@ SWGSoapySDRInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + 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")); } @@ -457,6 +467,16 @@ SWGSoapySDRInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGSoapySDRInputSettings::getIqOrder() { + return iq_order; +} +void +SWGSoapySDRInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGSoapySDRInputSettings::getFileRecordName() { return file_record_name; @@ -659,6 +679,9 @@ SWGSoapySDRInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h index 76193a2ec..e0aac531d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h @@ -72,6 +72,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -154,6 +157,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp index d1f290f3c..f5243c521 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp @@ -64,6 +64,8 @@ SWGXtrxInputSettings::SWGXtrxInputSettings() { m_ext_clock_freq_isSet = false; pwrmode = 0; 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; @@ -118,6 +120,8 @@ SWGXtrxInputSettings::init() { m_ext_clock_freq_isSet = false; pwrmode = 0; 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; @@ -150,6 +154,7 @@ SWGXtrxInputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -208,6 +213,8 @@ SWGXtrxInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&pwrmode, pJson["pwrmode"], "qint32", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -288,6 +295,9 @@ SWGXtrxInputSettings::asJsonObject() { if(m_pwrmode_isSet){ obj->insert("pwrmode", QJsonValue(pwrmode)); } + 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")); } @@ -487,6 +497,16 @@ SWGXtrxInputSettings::setPwrmode(qint32 pwrmode) { this->m_pwrmode_isSet = true; } +qint32 +SWGXtrxInputSettings::getIqOrder() { + return iq_order; +} +void +SWGXtrxInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGXtrxInputSettings::getFileRecordName() { return file_record_name; @@ -596,6 +616,9 @@ SWGXtrxInputSettings::isSet(){ if(m_pwrmode_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h index 21c6b6fb2..29e7fa0a0 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h @@ -96,6 +96,9 @@ public: qint32 getPwrmode(); void setPwrmode(qint32 pwrmode); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -169,6 +172,9 @@ private: qint32 pwrmode; bool m_pwrmode_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp index 8850db736..61d2745f0 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.cpp @@ -64,6 +64,8 @@ SWGXtrxMIMOSettings::SWGXtrxMIMOSettings() { m_nco_frequency_rx_isSet = false; antenna_path_rx = 0; m_antenna_path_rx_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; lpf_bw_rx0 = 0; m_lpf_bw_rx0_isSet = false; gain_rx0 = 0; @@ -162,6 +164,8 @@ SWGXtrxMIMOSettings::init() { m_nco_frequency_rx_isSet = false; antenna_path_rx = 0; m_antenna_path_rx_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; lpf_bw_rx0 = 0; m_lpf_bw_rx0_isSet = false; gain_rx0 = 0; @@ -267,6 +271,7 @@ SWGXtrxMIMOSettings::cleanup() { + } @@ -318,6 +323,8 @@ SWGXtrxMIMOSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&antenna_path_rx, pJson["antennaPathRx"], "qint32", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&lpf_bw_rx0, pJson["lpfBWRx0"], "qint32", ""); ::SWGSDRangel::setValue(&gain_rx0, pJson["gainRx0"], "qint32", ""); @@ -442,6 +449,9 @@ SWGXtrxMIMOSettings::asJsonObject() { if(m_antenna_path_rx_isSet){ obj->insert("antennaPathRx", QJsonValue(antenna_path_rx)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_lpf_bw_rx0_isSet){ obj->insert("lpfBWRx0", QJsonValue(lpf_bw_rx0)); } @@ -707,6 +717,16 @@ SWGXtrxMIMOSettings::setAntennaPathRx(qint32 antenna_path_rx) { this->m_antenna_path_rx_isSet = true; } +qint32 +SWGXtrxMIMOSettings::getIqOrder() { + return iq_order; +} +void +SWGXtrxMIMOSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGXtrxMIMOSettings::getLpfBwRx0() { return lpf_bw_rx0; @@ -1036,6 +1056,9 @@ SWGXtrxMIMOSettings::isSet(){ if(m_antenna_path_rx_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_lpf_bw_rx0_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h index 558a870c1..166d4bbb8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxMIMOSettings.h @@ -96,6 +96,9 @@ public: qint32 getAntennaPathRx(); void setAntennaPathRx(qint32 antenna_path_rx); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getLpfBwRx0(); void setLpfBwRx0(qint32 lpf_bw_rx0); @@ -235,6 +238,9 @@ private: qint32 antenna_path_rx; bool m_antenna_path_rx_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 lpf_bw_rx0; bool m_lpf_bw_rx0_isSet;