From b75eb08a9135ce77ee6ea0c3a5e4b2903c63c4d3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 6 Sep 2018 21:54:09 +0200 Subject: [PATCH] DaemonSource: pass device center frequency and baseband sample rate in the report --- plugins/channeltx/daemonsrc/daemonsrc.cpp | 2 + sdrbase/resources/webapi/doc/html2/index.html | 10 ++++- .../doc/swagger/include/DaemonSource.yaml | 6 +++ .../api/swagger/include/DaemonSource.yaml | 6 +++ swagger/sdrangel/code/html2/index.html | 10 ++++- .../code/qt5/client/SWGDaemonSourceReport.cpp | 42 +++++++++++++++++++ .../code/qt5/client/SWGDaemonSourceReport.h | 12 ++++++ 7 files changed, 86 insertions(+), 2 deletions(-) diff --git a/plugins/channeltx/daemonsrc/daemonsrc.cpp b/plugins/channeltx/daemonsrc/daemonsrc.cpp index 7904e3ace..52fefbf09 100644 --- a/plugins/channeltx/daemonsrc/daemonsrc.cpp +++ b/plugins/channeltx/daemonsrc/daemonsrc.cpp @@ -451,5 +451,7 @@ void DaemonSrc::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& respons response.getDaemonSourceReport()->setNbFecBlocks(m_currentMeta.m_nbFECBlocks); response.getDaemonSourceReport()->setCenterFreq(m_currentMeta.m_centerFrequency); response.getDaemonSourceReport()->setSampleRate(m_currentMeta.m_sampleRate); + response.getDaemonSourceReport()->setDeviceCenterFreq(m_deviceAPI->getSampleSink()->getCenterFrequency()/1000); + response.getDaemonSourceReport()->setDeviceSampleRate(m_deviceAPI->getSampleSink()->getSampleRate()); } diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index daaf4c9f7..d0824c2b9 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1742,6 +1742,14 @@ margin-bottom: 20px; "sampleRate" : { "type" : "integer", "description" : "Stream nominal sample rate in S/s" + }, + "deviceCenterFreq" : { + "type" : "integer", + "description" : "Device center frequency in kHz" + }, + "deviceSampleRate" : { + "type" : "integer", + "description" : "Device baseband sample rate in S/s" } }, "description" : "Daemon channel source report" @@ -28716,7 +28724,7 @@ except ApiException as e:
- Generated 2018-09-04T20:03:50.896+02:00 + Generated 2018-09-06T20:10:22.329+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DaemonSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/DaemonSource.yaml index c1d96de6a..36f13f348 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DaemonSource.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DaemonSource.yaml @@ -48,4 +48,10 @@ DaemonSourceReport: sampleRate: description: "Stream nominal sample rate in S/s" type: integer + deviceCenterFreq: + description: "Device center frequency in kHz" + type: integer + deviceSampleRate: + description: "Device baseband sample rate in S/s" + type: integer \ No newline at end of file diff --git a/swagger/sdrangel/api/swagger/include/DaemonSource.yaml b/swagger/sdrangel/api/swagger/include/DaemonSource.yaml index c1d96de6a..36f13f348 100644 --- a/swagger/sdrangel/api/swagger/include/DaemonSource.yaml +++ b/swagger/sdrangel/api/swagger/include/DaemonSource.yaml @@ -48,4 +48,10 @@ DaemonSourceReport: sampleRate: description: "Stream nominal sample rate in S/s" type: integer + deviceCenterFreq: + description: "Device center frequency in kHz" + type: integer + deviceSampleRate: + description: "Device baseband sample rate in S/s" + type: integer \ No newline at end of file diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index daaf4c9f7..d0824c2b9 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1742,6 +1742,14 @@ margin-bottom: 20px; "sampleRate" : { "type" : "integer", "description" : "Stream nominal sample rate in S/s" + }, + "deviceCenterFreq" : { + "type" : "integer", + "description" : "Device center frequency in kHz" + }, + "deviceSampleRate" : { + "type" : "integer", + "description" : "Device baseband sample rate in S/s" } }, "description" : "Daemon channel source report" @@ -28716,7 +28724,7 @@ except ApiException as e:
- Generated 2018-09-04T20:03:50.896+02:00 + Generated 2018-09-06T20:10:22.329+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.cpp b/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.cpp index b2ba885d2..91d991f52 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.cpp @@ -50,6 +50,10 @@ SWGDaemonSourceReport::SWGDaemonSourceReport() { m_center_freq_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; + device_center_freq = 0; + m_device_center_freq_isSet = false; + device_sample_rate = 0; + m_device_sample_rate_isSet = false; } SWGDaemonSourceReport::~SWGDaemonSourceReport() { @@ -80,6 +84,10 @@ SWGDaemonSourceReport::init() { m_center_freq_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; + device_center_freq = 0; + m_device_center_freq_isSet = false; + device_sample_rate = 0; + m_device_sample_rate_isSet = false; } void @@ -95,6 +103,8 @@ SWGDaemonSourceReport::cleanup() { + + } SWGDaemonSourceReport* @@ -130,6 +140,10 @@ SWGDaemonSourceReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); + ::SWGSDRangel::setValue(&device_center_freq, pJson["deviceCenterFreq"], "qint32", ""); + + ::SWGSDRangel::setValue(&device_sample_rate, pJson["deviceSampleRate"], "qint32", ""); + } QString @@ -179,6 +193,12 @@ SWGDaemonSourceReport::asJsonObject() { if(m_sample_rate_isSet){ obj->insert("sampleRate", QJsonValue(sample_rate)); } + if(m_device_center_freq_isSet){ + obj->insert("deviceCenterFreq", QJsonValue(device_center_freq)); + } + if(m_device_sample_rate_isSet){ + obj->insert("deviceSampleRate", QJsonValue(device_sample_rate)); + } return obj; } @@ -293,6 +313,26 @@ SWGDaemonSourceReport::setSampleRate(qint32 sample_rate) { this->m_sample_rate_isSet = true; } +qint32 +SWGDaemonSourceReport::getDeviceCenterFreq() { + return device_center_freq; +} +void +SWGDaemonSourceReport::setDeviceCenterFreq(qint32 device_center_freq) { + this->device_center_freq = device_center_freq; + this->m_device_center_freq_isSet = true; +} + +qint32 +SWGDaemonSourceReport::getDeviceSampleRate() { + return device_sample_rate; +} +void +SWGDaemonSourceReport::setDeviceSampleRate(qint32 device_sample_rate) { + this->device_sample_rate = device_sample_rate; + this->m_device_sample_rate_isSet = true; +} + bool SWGDaemonSourceReport::isSet(){ @@ -309,6 +349,8 @@ SWGDaemonSourceReport::isSet(){ if(m_nb_fec_blocks_isSet){ isObjectUpdated = true; break;} if(m_center_freq_isSet){ isObjectUpdated = true; break;} if(m_sample_rate_isSet){ isObjectUpdated = true; break;} + if(m_device_center_freq_isSet){ isObjectUpdated = true; break;} + if(m_device_sample_rate_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.h b/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.h index cce8823e6..5d9e63d44 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGDaemonSourceReport.h @@ -74,6 +74,12 @@ public: qint32 getSampleRate(); void setSampleRate(qint32 sample_rate); + qint32 getDeviceCenterFreq(); + void setDeviceCenterFreq(qint32 device_center_freq); + + qint32 getDeviceSampleRate(); + void setDeviceSampleRate(qint32 device_sample_rate); + virtual bool isSet() override; @@ -111,6 +117,12 @@ private: qint32 sample_rate; bool m_sample_rate_isSet; + qint32 device_center_freq; + bool m_device_center_freq_isSet; + + qint32 device_sample_rate; + bool m_device_sample_rate_isSet; + }; }