diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 038c51178..aa5313fcf 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3819,6 +3819,15 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "frequencyMode" : { + "type" : "integer", + "description" : "(0 for Offset, 1 for Absolute)" + }, + "frequency" : { + "type" : "integer", + "format" : "int64", + "description" : "Channel center frequency" + }, "rfBandwidth" : { "type" : "number", "format" : "float" @@ -58934,7 +58943,7 @@ except ApiException as e:
- Generated 2024-04-04T16:23:36.765+02:00 + Generated 2024-04-06T20:04:32.029+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml index 068d62151..ce8c6cdde 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml @@ -4,6 +4,13 @@ ChannelPowerSettings: inputFrequencyOffset: type: integer format: int64 + frequencyMode: + description: (0 for Offset, 1 for Absolute) + type: integer + frequency: + description: Channel center frequency + type: integer + format: int64 rfBandwidth: type: number format: float diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 038c51178..aa5313fcf 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3819,6 +3819,15 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "frequencyMode" : { + "type" : "integer", + "description" : "(0 for Offset, 1 for Absolute)" + }, + "frequency" : { + "type" : "integer", + "format" : "int64", + "description" : "Channel center frequency" + }, "rfBandwidth" : { "type" : "number", "format" : "float" @@ -58934,7 +58943,7 @@ except ApiException as e:
- Generated 2024-04-04T16:23:36.765+02:00 + Generated 2024-04-06T20:04:32.029+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp index e2d31e2aa..5a1d0b1f3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp @@ -30,6 +30,10 @@ SWGChannelPowerSettings::SWGChannelPowerSettings(QString* json) { SWGChannelPowerSettings::SWGChannelPowerSettings() { 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; pulse_threshold = 0.0f; @@ -66,6 +70,10 @@ void SWGChannelPowerSettings::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; pulse_threshold = 0.0f; @@ -101,6 +109,8 @@ SWGChannelPowerSettings::cleanup() { + + if(title != nullptr) { delete title; } @@ -133,6 +143,10 @@ void SWGChannelPowerSettings::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(&pulse_threshold, pJson["pulseThreshold"], "float", ""); @@ -178,6 +192,12 @@ SWGChannelPowerSettings::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)); } @@ -231,6 +251,26 @@ SWGChannelPowerSettings::setInputFrequencyOffset(qint64 input_frequency_offset) this->m_input_frequency_offset_isSet = true; } +qint32 +SWGChannelPowerSettings::getFrequencyMode() { + return frequency_mode; +} +void +SWGChannelPowerSettings::setFrequencyMode(qint32 frequency_mode) { + this->frequency_mode = frequency_mode; + this->m_frequency_mode_isSet = true; +} + +qint64 +SWGChannelPowerSettings::getFrequency() { + return frequency; +} +void +SWGChannelPowerSettings::setFrequency(qint64 frequency) { + this->frequency = frequency; + this->m_frequency_isSet = true; +} + float SWGChannelPowerSettings::getRfBandwidth() { return rf_bandwidth; @@ -369,6 +409,12 @@ SWGChannelPowerSettings::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/SWGChannelPowerSettings.h b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h index 7db5edcc5..4f01a5dc5 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h @@ -47,6 +47,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); @@ -93,6 +99,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;