From b9c1568bac8a3c0083bba655c8be09e92a9846f8 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 27 Jun 2020 05:35:18 +0200 Subject: [PATCH] Frequency tracker: REST API: added tracking delta frequency in report. Generated code --- sdrbase/resources/webapi/doc/html2/index.html | 6 ++++- .../doc/swagger/include/FreqTracker.yaml | 3 +++ swagger/sdrangel/code/html2/index.html | 6 ++++- .../code/qt5/client/SWGFreqTrackerReport.cpp | 23 +++++++++++++++++++ .../code/qt5/client/SWGFreqTrackerReport.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 eced93a84..117a26235 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -4051,6 +4051,10 @@ margin-bottom: 20px; "format" : "float", "description" : "power received in channel (dB)" }, + "trackingDeltaFrequency" : { + "type" : "integer", + "description" : "difference between channel and PLL or FLL center frequency (Hz)" + }, "squelch" : { "type" : "integer", "description" : "squelch status (1 if open else 0)" @@ -37487,7 +37491,7 @@ except ApiException as e:
- Generated 2020-06-21T22:52:40.950+02:00 + Generated 2020-06-27T05:12:41.181+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml index 0462108eb..68a029cd5 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml @@ -63,6 +63,9 @@ FreqTrackerReport: description: power received in channel (dB) type: number format: float + trackingDeltaFrequency: + description: difference between channel and PLL or FLL center frequency (Hz) + type: integer squelch: description: squelch status (1 if open else 0) type: integer diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index eced93a84..117a26235 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -4051,6 +4051,10 @@ margin-bottom: 20px; "format" : "float", "description" : "power received in channel (dB)" }, + "trackingDeltaFrequency" : { + "type" : "integer", + "description" : "difference between channel and PLL or FLL center frequency (Hz)" + }, "squelch" : { "type" : "integer", "description" : "squelch status (1 if open else 0)" @@ -37487,7 +37491,7 @@ except ApiException as e:
- Generated 2020-06-21T22:52:40.950+02:00 + Generated 2020-06-27T05:12:41.181+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp index 0fa906a41..964f1b386 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.cpp @@ -30,6 +30,8 @@ SWGFreqTrackerReport::SWGFreqTrackerReport(QString* json) { SWGFreqTrackerReport::SWGFreqTrackerReport() { channel_power_db = 0.0f; m_channel_power_db_isSet = false; + tracking_delta_frequency = 0; + m_tracking_delta_frequency_isSet = false; squelch = 0; m_squelch_isSet = false; sample_rate = 0; @@ -46,6 +48,8 @@ void SWGFreqTrackerReport::init() { channel_power_db = 0.0f; m_channel_power_db_isSet = false; + tracking_delta_frequency = 0; + m_tracking_delta_frequency_isSet = false; squelch = 0; m_squelch_isSet = false; sample_rate = 0; @@ -60,6 +64,7 @@ SWGFreqTrackerReport::cleanup() { + } SWGFreqTrackerReport* @@ -75,6 +80,8 @@ void SWGFreqTrackerReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&channel_power_db, pJson["channelPowerDB"], "float", ""); + ::SWGSDRangel::setValue(&tracking_delta_frequency, pJson["trackingDeltaFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "qint32", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); @@ -100,6 +107,9 @@ SWGFreqTrackerReport::asJsonObject() { if(m_channel_power_db_isSet){ obj->insert("channelPowerDB", QJsonValue(channel_power_db)); } + if(m_tracking_delta_frequency_isSet){ + obj->insert("trackingDeltaFrequency", QJsonValue(tracking_delta_frequency)); + } if(m_squelch_isSet){ obj->insert("squelch", QJsonValue(squelch)); } @@ -123,6 +133,16 @@ SWGFreqTrackerReport::setChannelPowerDb(float channel_power_db) { this->m_channel_power_db_isSet = true; } +qint32 +SWGFreqTrackerReport::getTrackingDeltaFrequency() { + return tracking_delta_frequency; +} +void +SWGFreqTrackerReport::setTrackingDeltaFrequency(qint32 tracking_delta_frequency) { + this->tracking_delta_frequency = tracking_delta_frequency; + this->m_tracking_delta_frequency_isSet = true; +} + qint32 SWGFreqTrackerReport::getSquelch() { return squelch; @@ -161,6 +181,9 @@ SWGFreqTrackerReport::isSet(){ if(m_channel_power_db_isSet){ isObjectUpdated = true; break; } + if(m_tracking_delta_frequency_isSet){ + isObjectUpdated = true; break; + } if(m_squelch_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h index f29c4dfc7..349ae3608 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerReport.h @@ -44,6 +44,9 @@ public: float getChannelPowerDb(); void setChannelPowerDb(float channel_power_db); + qint32 getTrackingDeltaFrequency(); + void setTrackingDeltaFrequency(qint32 tracking_delta_frequency); + qint32 getSquelch(); void setSquelch(qint32 squelch); @@ -60,6 +63,9 @@ private: float channel_power_db; bool m_channel_power_db_isSet; + qint32 tracking_delta_frequency; + bool m_tracking_delta_frequency_isSet; + qint32 squelch; bool m_squelch_isSet;