From 8462090038c3a67a5d8596fc4e8b9fc1c45d95bd Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 27 Oct 2020 06:19:13 +0100 Subject: [PATCH] AFC: REST API: added tracker adjustment period: generated code --- sdrbase/resources/webapi/doc/html2/index.html | 6 ++++- .../webapi/doc/swagger/include/AFC.yaml | 3 +++ swagger/sdrangel/code/html2/index.html | 6 ++++- .../code/qt5/client/SWGAFCSettings.cpp | 23 +++++++++++++++++++ .../sdrangel/code/qt5/client/SWGAFCSettings.h | 6 +++++ 5 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 977025a24..0b2415c55 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -747,6 +747,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "trackerAdjustPeriod" : { + "type" : "integer", + "description" : "Tracker channel frequency adjustment period in seconds" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -40048,7 +40052,7 @@ except ApiException as e:
- Generated 2020-10-27T06:01:09.347+01:00 + Generated 2020-10-27T06:18:18.403+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml index 4781ce38b..03a62f97c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml @@ -31,6 +31,9 @@ AFCSettings: descritpion: Frequency shift tolerance before tracker frequency is (re)adjusted type: integer format: int64 + trackerAdjustPeriod: + description: Tracker channel frequency adjustment period in seconds + type: integer useReverseAPI: description: Synchronize with reverse API (1 for yes, 0 for no) type: integer diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 977025a24..0b2415c55 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -747,6 +747,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "trackerAdjustPeriod" : { + "type" : "integer", + "description" : "Tracker channel frequency adjustment period in seconds" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -40048,7 +40052,7 @@ except ApiException as e:
- Generated 2020-10-27T06:01:09.347+01:00 + Generated 2020-10-27T06:18:18.403+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp index 012e3096c..9fb6546a8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp @@ -44,6 +44,8 @@ SWGAFCSettings::SWGAFCSettings() { m_target_frequency_isSet = false; freq_tolerance = 0L; m_freq_tolerance_isSet = false; + tracker_adjust_period = 0; + m_tracker_adjust_period_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = nullptr; @@ -78,6 +80,8 @@ SWGAFCSettings::init() { m_target_frequency_isSet = false; freq_tolerance = 0L; m_freq_tolerance_isSet = false; + tracker_adjust_period = 0; + m_tracker_adjust_period_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = new QString(""); @@ -103,6 +107,7 @@ SWGAFCSettings::cleanup() { + if(reverse_api_address != nullptr) { delete reverse_api_address; } @@ -138,6 +143,8 @@ SWGAFCSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&freq_tolerance, pJson["freqTolerance"], "qint64", ""); + ::SWGSDRangel::setValue(&tracker_adjust_period, pJson["trackerAdjustPeriod"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); @@ -188,6 +195,9 @@ SWGAFCSettings::asJsonObject() { if(m_freq_tolerance_isSet){ obj->insert("freqTolerance", QJsonValue(freq_tolerance)); } + if(m_tracker_adjust_period_isSet){ + obj->insert("trackerAdjustPeriod", QJsonValue(tracker_adjust_period)); + } if(m_use_reverse_api_isSet){ obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); } @@ -287,6 +297,16 @@ SWGAFCSettings::setFreqTolerance(qint64 freq_tolerance) { this->m_freq_tolerance_isSet = true; } +qint32 +SWGAFCSettings::getTrackerAdjustPeriod() { + return tracker_adjust_period; +} +void +SWGAFCSettings::setTrackerAdjustPeriod(qint32 tracker_adjust_period) { + this->tracker_adjust_period = tracker_adjust_period; + this->m_tracker_adjust_period_isSet = true; +} + qint32 SWGAFCSettings::getUseReverseApi() { return use_reverse_api; @@ -366,6 +386,9 @@ SWGAFCSettings::isSet(){ if(m_freq_tolerance_isSet){ isObjectUpdated = true; break; } + if(m_tracker_adjust_period_isSet){ + isObjectUpdated = true; break; + } if(m_use_reverse_api_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h index fe1cf6551..a05789594 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h @@ -66,6 +66,9 @@ public: qint64 getFreqTolerance(); void setFreqTolerance(qint64 freq_tolerance); + qint32 getTrackerAdjustPeriod(); + void setTrackerAdjustPeriod(qint32 tracker_adjust_period); + qint32 getUseReverseApi(); void setUseReverseApi(qint32 use_reverse_api); @@ -109,6 +112,9 @@ private: qint64 freq_tolerance; bool m_freq_tolerance_isSet; + qint32 tracker_adjust_period; + bool m_tracker_adjust_period_isSet; + qint32 use_reverse_api; bool m_use_reverse_api_isSet;