diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 391a9fa1a..db44689f9 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3802,6 +3802,11 @@ margin-bottom: 20px; "format" : "float", "description" : "min power received in channel (dB)" }, + "channelPowerPulseDB" : { + "type" : "number", + "format" : "float", + "description" : "pulse power received in channel (dB)" + }, "channelSampleRate" : { "type" : "integer" } @@ -3860,7 +3865,7 @@ margin-bottom: 20px; "$ref" : "#/definitions/RollupState" } }, - "description" : "ChannelDemod" + "description" : "ChannelPower" }; defs.ChannelReport = { "required" : [ "direction" ], @@ -58860,7 +58865,7 @@ except ApiException as e:
- Generated 2024-03-13T15:31:43.924+01:00 + Generated 2024-03-13T16:45:40.518+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml index a56d9d975..068d62151 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml @@ -1,5 +1,5 @@ ChannelPowerSettings: - description: ChannelDemod + description: ChannelPower properties: inputFrequencyOffset: type: integer @@ -52,5 +52,9 @@ ChannelPowerReport: description: min power received in channel (dB) type: number format: float + channelPowerPulseDB: + description: pulse power received in channel (dB) + type: number + format: float channelSampleRate: type: integer diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 391a9fa1a..db44689f9 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3802,6 +3802,11 @@ margin-bottom: 20px; "format" : "float", "description" : "min power received in channel (dB)" }, + "channelPowerPulseDB" : { + "type" : "number", + "format" : "float", + "description" : "pulse power received in channel (dB)" + }, "channelSampleRate" : { "type" : "integer" } @@ -3860,7 +3865,7 @@ margin-bottom: 20px; "$ref" : "#/definitions/RollupState" } }, - "description" : "ChannelDemod" + "description" : "ChannelPower" }; defs.ChannelReport = { "required" : [ "direction" ], @@ -58860,7 +58865,7 @@ except ApiException as e:
- Generated 2024-03-13T15:31:43.924+01:00 + Generated 2024-03-13T16:45:40.518+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp index a9a08af3d..54c75727f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp @@ -34,6 +34,8 @@ SWGChannelPowerReport::SWGChannelPowerReport() { m_channel_power_max_db_isSet = false; channel_power_min_db = 0.0f; m_channel_power_min_db_isSet = false; + channel_power_pulse_db = 0.0f; + m_channel_power_pulse_db_isSet = false; channel_sample_rate = 0; m_channel_sample_rate_isSet = false; } @@ -50,6 +52,8 @@ SWGChannelPowerReport::init() { m_channel_power_max_db_isSet = false; channel_power_min_db = 0.0f; m_channel_power_min_db_isSet = false; + channel_power_pulse_db = 0.0f; + m_channel_power_pulse_db_isSet = false; channel_sample_rate = 0; m_channel_sample_rate_isSet = false; } @@ -60,6 +64,7 @@ SWGChannelPowerReport::cleanup() { + } SWGChannelPowerReport* @@ -79,6 +84,8 @@ SWGChannelPowerReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&channel_power_min_db, pJson["channelPowerMinDB"], "float", ""); + ::SWGSDRangel::setValue(&channel_power_pulse_db, pJson["channelPowerPulseDB"], "float", ""); + ::SWGSDRangel::setValue(&channel_sample_rate, pJson["channelSampleRate"], "qint32", ""); } @@ -106,6 +113,9 @@ SWGChannelPowerReport::asJsonObject() { if(m_channel_power_min_db_isSet){ obj->insert("channelPowerMinDB", QJsonValue(channel_power_min_db)); } + if(m_channel_power_pulse_db_isSet){ + obj->insert("channelPowerPulseDB", QJsonValue(channel_power_pulse_db)); + } if(m_channel_sample_rate_isSet){ obj->insert("channelSampleRate", QJsonValue(channel_sample_rate)); } @@ -143,6 +153,16 @@ SWGChannelPowerReport::setChannelPowerMinDb(float channel_power_min_db) { this->m_channel_power_min_db_isSet = true; } +float +SWGChannelPowerReport::getChannelPowerPulseDb() { + return channel_power_pulse_db; +} +void +SWGChannelPowerReport::setChannelPowerPulseDb(float channel_power_pulse_db) { + this->channel_power_pulse_db = channel_power_pulse_db; + this->m_channel_power_pulse_db_isSet = true; +} + qint32 SWGChannelPowerReport::getChannelSampleRate() { return channel_sample_rate; @@ -167,6 +187,9 @@ SWGChannelPowerReport::isSet(){ if(m_channel_power_min_db_isSet){ isObjectUpdated = true; break; } + if(m_channel_power_pulse_db_isSet){ + isObjectUpdated = true; break; + } if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h index 0f364f85d..e2793bebc 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h @@ -50,6 +50,9 @@ public: float getChannelPowerMinDb(); void setChannelPowerMinDb(float channel_power_min_db); + float getChannelPowerPulseDb(); + void setChannelPowerPulseDb(float channel_power_pulse_db); + qint32 getChannelSampleRate(); void setChannelSampleRate(qint32 channel_sample_rate); @@ -66,6 +69,9 @@ private: float channel_power_min_db; bool m_channel_power_min_db_isSet; + float channel_power_pulse_db; + bool m_channel_power_pulse_db_isSet; + qint32 channel_sample_rate; bool m_channel_sample_rate_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h index f580418c4..7db5edcc5 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h @@ -13,7 +13,7 @@ /* * SWGChannelPowerSettings.h * - * ChannelDemod + * ChannelPower */ #ifndef SWGChannelPowerSettings_H_