From 7b6bbe88f3a91738103eda92ad668c0e52233a6e Mon Sep 17 00:00:00 2001 From: srcejon Date: Sun, 7 Apr 2024 16:53:16 +0100 Subject: [PATCH] Regenerate swagger files --- sdrbase/resources/webapi/doc/html2/index.html | 13 +++++- .../doc/swagger/include/RadioClock.yaml | 9 +++- swagger/sdrangel/code/html2/index.html | 13 +++++- .../code/qt5/client/SWGRadioClockSettings.cpp | 46 +++++++++++++++++++ .../code/qt5/client/SWGRadioClockSettings.h | 12 +++++ 5 files changed, 88 insertions(+), 5 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index aa5313fcf..304040e07 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -12701,6 +12701,15 @@ margin-bottom: 20px; "format" : "int64", "description" : "channel center frequency shift from baseband center in Hz" }, + "frequencyMode" : { + "type" : "integer", + "description" : "(0 for Offset, 1 for Absolute)" + }, + "frequency" : { + "type" : "integer", + "format" : "int64", + "description" : "Channel center frequency" + }, "rfBandwidth" : { "type" : "number", "format" : "float", @@ -12712,7 +12721,7 @@ margin-bottom: 20px; }, "modulation" : { "type" : "integer", - "description" : "0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB" + "description" : "0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB, 4 - JJY" }, "timezone" : { "type" : "integer", @@ -58943,7 +58952,7 @@ except ApiException as e:
- Generated 2024-04-06T20:04:32.029+02:00 + Generated 2024-04-07T17:52:28.367+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml b/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml index 8acd20869..600ee71bb 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml @@ -5,6 +5,13 @@ RadioClockSettings: description: channel center frequency shift from baseband center in Hz type: integer format: int64 + frequencyMode: + description: (0 for Offset, 1 for Absolute) + type: integer + frequency: + description: Channel center frequency + type: integer + format: int64 rfBandwidth: description: channel RF bandwidth in Hz type: number @@ -13,7 +20,7 @@ RadioClockSettings: type: number format: float modulation: - description: 0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB + description: 0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB, 4 - JJY type: integer timezone: description: 0 - Broadcast, 1 - Local, 2 - UTC diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index aa5313fcf..304040e07 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -12701,6 +12701,15 @@ margin-bottom: 20px; "format" : "int64", "description" : "channel center frequency shift from baseband center in Hz" }, + "frequencyMode" : { + "type" : "integer", + "description" : "(0 for Offset, 1 for Absolute)" + }, + "frequency" : { + "type" : "integer", + "format" : "int64", + "description" : "Channel center frequency" + }, "rfBandwidth" : { "type" : "number", "format" : "float", @@ -12712,7 +12721,7 @@ margin-bottom: 20px; }, "modulation" : { "type" : "integer", - "description" : "0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB" + "description" : "0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB, 4 - JJY" }, "timezone" : { "type" : "integer", @@ -58943,7 +58952,7 @@ except ApiException as e:
- Generated 2024-04-06T20:04:32.029+02:00 + Generated 2024-04-07T17:52:28.367+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp index 5f85a1499..3d6a1e14c 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp @@ -30,6 +30,10 @@ SWGRadioClockSettings::SWGRadioClockSettings(QString* json) { SWGRadioClockSettings::SWGRadioClockSettings() { input_frequency_offset = 0L; m_input_frequency_offset_isSet = false; + frequency_mode = 0; + m_frequency_mode_isSet = false; + frequency = 0L; + m_frequency_isSet = false; rf_bandwidth = 0.0f; m_rf_bandwidth_isSet = false; threshold = 0.0f; @@ -70,6 +74,10 @@ void SWGRadioClockSettings::init() { input_frequency_offset = 0L; m_input_frequency_offset_isSet = false; + frequency_mode = 0; + m_frequency_mode_isSet = false; + frequency = 0L; + m_frequency_isSet = false; rf_bandwidth = 0.0f; m_rf_bandwidth_isSet = false; threshold = 0.0f; @@ -110,6 +118,8 @@ SWGRadioClockSettings::cleanup() { + + if(title != nullptr) { delete title; } @@ -145,6 +155,10 @@ void SWGRadioClockSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", ""); + ::SWGSDRangel::setValue(&frequency_mode, pJson["frequencyMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&frequency, pJson["frequency"], "qint64", ""); + ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "float", ""); ::SWGSDRangel::setValue(&threshold, pJson["threshold"], "float", ""); @@ -194,6 +208,12 @@ SWGRadioClockSettings::asJsonObject() { if(m_input_frequency_offset_isSet){ obj->insert("inputFrequencyOffset", QJsonValue(input_frequency_offset)); } + if(m_frequency_mode_isSet){ + obj->insert("frequencyMode", QJsonValue(frequency_mode)); + } + if(m_frequency_isSet){ + obj->insert("frequency", QJsonValue(frequency)); + } if(m_rf_bandwidth_isSet){ obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); } @@ -253,6 +273,26 @@ SWGRadioClockSettings::setInputFrequencyOffset(qint64 input_frequency_offset) { this->m_input_frequency_offset_isSet = true; } +qint32 +SWGRadioClockSettings::getFrequencyMode() { + return frequency_mode; +} +void +SWGRadioClockSettings::setFrequencyMode(qint32 frequency_mode) { + this->frequency_mode = frequency_mode; + this->m_frequency_mode_isSet = true; +} + +qint64 +SWGRadioClockSettings::getFrequency() { + return frequency; +} +void +SWGRadioClockSettings::setFrequency(qint64 frequency) { + this->frequency = frequency; + this->m_frequency_isSet = true; +} + float SWGRadioClockSettings::getRfBandwidth() { return rf_bandwidth; @@ -411,6 +451,12 @@ SWGRadioClockSettings::isSet(){ if(m_input_frequency_offset_isSet){ isObjectUpdated = true; break; } + if(m_frequency_mode_isSet){ + isObjectUpdated = true; break; + } + if(m_frequency_isSet){ + isObjectUpdated = true; break; + } if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h index 2f651135a..11983fad6 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h @@ -48,6 +48,12 @@ public: qint64 getInputFrequencyOffset(); void setInputFrequencyOffset(qint64 input_frequency_offset); + qint32 getFrequencyMode(); + void setFrequencyMode(qint32 frequency_mode); + + qint64 getFrequency(); + void setFrequency(qint64 frequency); + float getRfBandwidth(); void setRfBandwidth(float rf_bandwidth); @@ -100,6 +106,12 @@ private: qint64 input_frequency_offset; bool m_input_frequency_offset_isSet; + qint32 frequency_mode; + bool m_frequency_mode_isSet; + + qint64 frequency; + bool m_frequency_isSet; + float rf_bandwidth; bool m_rf_bandwidth_isSet;