diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index b2a8aa53a..7699292f0 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -952,6 +952,14 @@ margin-bottom: 20px; "type" : "number", "format" : "float" }, + "amScalingFactor" : { + "type" : "integer", + "description" : "Factor in % to apply to detected signal scale" + }, + "amOffsetFactor" : { + "type" : "integer", + "description" : "Factor in % to apply to adjusted signal scale" + }, "intSampleRate" : { "type" : "integer" }, @@ -33463,7 +33471,7 @@ except ApiException as e:
- Generated 2020-06-27T10:35:39.014+02:00 + Generated 2020-07-01T19:58:14.874+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml index 0ac71d653..4e504057e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml @@ -39,6 +39,12 @@ ATVDemodSettings: fmDeviation: type: number format: float + amScalingFactor: + type: integer + description: Factor in % to apply to detected signal scale + amOffsetFactor: + type: integer + description: Factor in % to apply to adjusted signal scale intSampleRate: type: integer enmATVStandard: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index b2a8aa53a..7699292f0 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -952,6 +952,14 @@ margin-bottom: 20px; "type" : "number", "format" : "float" }, + "amScalingFactor" : { + "type" : "integer", + "description" : "Factor in % to apply to detected signal scale" + }, + "amOffsetFactor" : { + "type" : "integer", + "description" : "Factor in % to apply to adjusted signal scale" + }, "intSampleRate" : { "type" : "integer" }, @@ -33463,7 +33471,7 @@ except ApiException as e:
- Generated 2020-06-27T10:35:39.014+02:00 + Generated 2020-07-01T19:58:14.874+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp index afaa5b37e..9567054d2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp @@ -58,6 +58,10 @@ SWGATVDemodSettings::SWGATVDemodSettings() { m_flt_bfo_frequency_isSet = false; fm_deviation = 0.0f; m_fm_deviation_isSet = false; + am_scaling_factor = 0; + m_am_scaling_factor_isSet = false; + am_offset_factor = 0; + m_am_offset_factor_isSet = false; int_sample_rate = 0; m_int_sample_rate_isSet = false; enm_atv_standard = 0; @@ -134,6 +138,10 @@ SWGATVDemodSettings::init() { m_flt_bfo_frequency_isSet = false; fm_deviation = 0.0f; m_fm_deviation_isSet = false; + am_scaling_factor = 0; + m_am_scaling_factor_isSet = false; + am_offset_factor = 0; + m_am_offset_factor_isSet = false; int_sample_rate = 0; m_int_sample_rate_isSet = false; enm_atv_standard = 0; @@ -204,6 +212,8 @@ SWGATVDemodSettings::cleanup() { + + @@ -257,6 +267,10 @@ SWGATVDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&fm_deviation, pJson["fmDeviation"], "float", ""); + ::SWGSDRangel::setValue(&am_scaling_factor, pJson["amScalingFactor"], "qint32", ""); + + ::SWGSDRangel::setValue(&am_offset_factor, pJson["amOffsetFactor"], "qint32", ""); + ::SWGSDRangel::setValue(&int_sample_rate, pJson["intSampleRate"], "qint32", ""); ::SWGSDRangel::setValue(&enm_atv_standard, pJson["enmATVStandard"], "qint32", ""); @@ -356,6 +370,12 @@ SWGATVDemodSettings::asJsonObject() { if(m_fm_deviation_isSet){ obj->insert("fmDeviation", QJsonValue(fm_deviation)); } + if(m_am_scaling_factor_isSet){ + obj->insert("amScalingFactor", QJsonValue(am_scaling_factor)); + } + if(m_am_offset_factor_isSet){ + obj->insert("amOffsetFactor", QJsonValue(am_offset_factor)); + } if(m_int_sample_rate_isSet){ obj->insert("intSampleRate", QJsonValue(int_sample_rate)); } @@ -567,6 +587,26 @@ SWGATVDemodSettings::setFmDeviation(float fm_deviation) { this->m_fm_deviation_isSet = true; } +qint32 +SWGATVDemodSettings::getAmScalingFactor() { + return am_scaling_factor; +} +void +SWGATVDemodSettings::setAmScalingFactor(qint32 am_scaling_factor) { + this->am_scaling_factor = am_scaling_factor; + this->m_am_scaling_factor_isSet = true; +} + +qint32 +SWGATVDemodSettings::getAmOffsetFactor() { + return am_offset_factor; +} +void +SWGATVDemodSettings::setAmOffsetFactor(qint32 am_offset_factor) { + this->am_offset_factor = am_offset_factor; + this->m_am_offset_factor_isSet = true; +} + qint32 SWGATVDemodSettings::getIntSampleRate() { return int_sample_rate; @@ -807,6 +847,12 @@ SWGATVDemodSettings::isSet(){ if(m_fm_deviation_isSet){ isObjectUpdated = true; break; } + if(m_am_scaling_factor_isSet){ + isObjectUpdated = true; break; + } + if(m_am_offset_factor_isSet){ + isObjectUpdated = true; break; + } if(m_int_sample_rate_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h index b5107af63..dbd85baba 100644 --- a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h @@ -87,6 +87,12 @@ public: float getFmDeviation(); void setFmDeviation(float fm_deviation); + qint32 getAmScalingFactor(); + void setAmScalingFactor(qint32 am_scaling_factor); + + qint32 getAmOffsetFactor(); + void setAmOffsetFactor(qint32 am_offset_factor); + qint32 getIntSampleRate(); void setIntSampleRate(qint32 int_sample_rate); @@ -193,6 +199,12 @@ private: float fm_deviation; bool m_fm_deviation_isSet; + qint32 am_scaling_factor; + bool m_am_scaling_factor_isSet; + + qint32 am_offset_factor; + bool m_am_offset_factor_isSet; + qint32 int_sample_rate; bool m_int_sample_rate_isSet;