diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 15bab9f4e..e602fe535 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -8234,6 +8234,34 @@ margin-bottom: 20px; }, "channelSampleRate" : { "type" : "integer" + }, + "ident" : { + "type" : "string" + }, + "deviation" : { + "type" : "number", + "format" : "float", + "description" : "deviation in degrees" + }, + "sdm" : { + "type" : "number", + "format" : "float", + "description" : "Sum of the Depth of Modulation in percent" + }, + "ddm" : { + "type" : "number", + "format" : "float", + "description" : "Difference in the Depth of Modulation in percent" + }, + "dm90" : { + "type" : "number", + "format" : "float", + "description" : "Depth of modulation of the 90Hz tone as a percentage of the carrier" + }, + "dm150" : { + "type" : "number", + "format" : "float", + "description" : "Depth of modulation of the 150Hz tone as percentage of the carrier" } }, "description" : "ILSDemod" @@ -59056,7 +59084,7 @@ except ApiException as e:
- Generated 2024-05-23T18:36:35.471+02:00 + Generated 2024-06-18T10:11:11.522+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ILSDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ILSDemod.yaml index 1a3decc8a..450a939c1 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ILSDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ILSDemod.yaml @@ -95,4 +95,26 @@ ILSDemodReport: format: float channelSampleRate: type: integer + ident: + type: string + deviation: + description: deviation in degrees + type: number + format: float + sdm: + description: Sum of the Depth of Modulation in percent + type: number + format: float + ddm: + description: Difference in the Depth of Modulation in percent + type: number + format: float + dm90: + description: Depth of modulation of the 90Hz tone as a percentage of the carrier + type: number + format: float + dm150: + description: Depth of modulation of the 150Hz tone as percentage of the carrier + type: number + format: float diff --git a/swagger/sdrangel/api/swagger/include/ILSDemod.yaml b/swagger/sdrangel/api/swagger/include/ILSDemod.yaml index 7b98f7b9a..f41090ddd 100644 --- a/swagger/sdrangel/api/swagger/include/ILSDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/ILSDemod.yaml @@ -95,4 +95,26 @@ ILSDemodReport: format: float channelSampleRate: type: integer + ident: + type: string + deviation: + description: deviation in degrees + type: number + format: float + sdm: + description: Sum of the Depth of Modulation in percent + type: number + format: float + ddm: + description: Difference in the Depth of Modulation in percent + type: number + format: float + dm90: + description: Depth of modulation of the 90Hz tone as a percentage of the carrier + type: number + format: float + dm150: + description: Depth of modulation of the 150Hz tone as percentage of the carrier + type: number + format: float diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 15bab9f4e..e602fe535 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -8234,6 +8234,34 @@ margin-bottom: 20px; }, "channelSampleRate" : { "type" : "integer" + }, + "ident" : { + "type" : "string" + }, + "deviation" : { + "type" : "number", + "format" : "float", + "description" : "deviation in degrees" + }, + "sdm" : { + "type" : "number", + "format" : "float", + "description" : "Sum of the Depth of Modulation in percent" + }, + "ddm" : { + "type" : "number", + "format" : "float", + "description" : "Difference in the Depth of Modulation in percent" + }, + "dm90" : { + "type" : "number", + "format" : "float", + "description" : "Depth of modulation of the 90Hz tone as a percentage of the carrier" + }, + "dm150" : { + "type" : "number", + "format" : "float", + "description" : "Depth of modulation of the 150Hz tone as percentage of the carrier" } }, "description" : "ILSDemod" @@ -59056,7 +59084,7 @@ except ApiException as e:
- Generated 2024-05-23T18:36:35.471+02:00 + Generated 2024-06-18T10:11:11.522+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.cpp b/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.cpp index 4fb7a9c16..75bde5ec2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.cpp @@ -32,6 +32,18 @@ SWGILSDemodReport::SWGILSDemodReport() { m_channel_power_db_isSet = false; channel_sample_rate = 0; m_channel_sample_rate_isSet = false; + ident = nullptr; + m_ident_isSet = false; + deviation = 0.0f; + m_deviation_isSet = false; + sdm = 0.0f; + m_sdm_isSet = false; + ddm = 0.0f; + m_ddm_isSet = false; + dm90 = 0.0f; + m_dm90_isSet = false; + dm150 = 0.0f; + m_dm150_isSet = false; } SWGILSDemodReport::~SWGILSDemodReport() { @@ -44,12 +56,32 @@ SWGILSDemodReport::init() { m_channel_power_db_isSet = false; channel_sample_rate = 0; m_channel_sample_rate_isSet = false; + ident = new QString(""); + m_ident_isSet = false; + deviation = 0.0f; + m_deviation_isSet = false; + sdm = 0.0f; + m_sdm_isSet = false; + ddm = 0.0f; + m_ddm_isSet = false; + dm90 = 0.0f; + m_dm90_isSet = false; + dm150 = 0.0f; + m_dm150_isSet = false; } void SWGILSDemodReport::cleanup() { + if(ident != nullptr) { + delete ident; + } + + + + + } SWGILSDemodReport* @@ -67,6 +99,18 @@ SWGILSDemodReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&channel_sample_rate, pJson["channelSampleRate"], "qint32", ""); + ::SWGSDRangel::setValue(&ident, pJson["ident"], "QString", "QString"); + + ::SWGSDRangel::setValue(&deviation, pJson["deviation"], "float", ""); + + ::SWGSDRangel::setValue(&sdm, pJson["sdm"], "float", ""); + + ::SWGSDRangel::setValue(&ddm, pJson["ddm"], "float", ""); + + ::SWGSDRangel::setValue(&dm90, pJson["dm90"], "float", ""); + + ::SWGSDRangel::setValue(&dm150, pJson["dm150"], "float", ""); + } QString @@ -89,6 +133,24 @@ SWGILSDemodReport::asJsonObject() { if(m_channel_sample_rate_isSet){ obj->insert("channelSampleRate", QJsonValue(channel_sample_rate)); } + if(ident != nullptr && *ident != QString("")){ + toJsonValue(QString("ident"), ident, obj, QString("QString")); + } + if(m_deviation_isSet){ + obj->insert("deviation", QJsonValue(deviation)); + } + if(m_sdm_isSet){ + obj->insert("sdm", QJsonValue(sdm)); + } + if(m_ddm_isSet){ + obj->insert("ddm", QJsonValue(ddm)); + } + if(m_dm90_isSet){ + obj->insert("dm90", QJsonValue(dm90)); + } + if(m_dm150_isSet){ + obj->insert("dm150", QJsonValue(dm150)); + } return obj; } @@ -113,6 +175,66 @@ SWGILSDemodReport::setChannelSampleRate(qint32 channel_sample_rate) { this->m_channel_sample_rate_isSet = true; } +QString* +SWGILSDemodReport::getIdent() { + return ident; +} +void +SWGILSDemodReport::setIdent(QString* ident) { + this->ident = ident; + this->m_ident_isSet = true; +} + +float +SWGILSDemodReport::getDeviation() { + return deviation; +} +void +SWGILSDemodReport::setDeviation(float deviation) { + this->deviation = deviation; + this->m_deviation_isSet = true; +} + +float +SWGILSDemodReport::getSdm() { + return sdm; +} +void +SWGILSDemodReport::setSdm(float sdm) { + this->sdm = sdm; + this->m_sdm_isSet = true; +} + +float +SWGILSDemodReport::getDdm() { + return ddm; +} +void +SWGILSDemodReport::setDdm(float ddm) { + this->ddm = ddm; + this->m_ddm_isSet = true; +} + +float +SWGILSDemodReport::getDm90() { + return dm90; +} +void +SWGILSDemodReport::setDm90(float dm90) { + this->dm90 = dm90; + this->m_dm90_isSet = true; +} + +float +SWGILSDemodReport::getDm150() { + return dm150; +} +void +SWGILSDemodReport::setDm150(float dm150) { + this->dm150 = dm150; + this->m_dm150_isSet = true; +} + bool SWGILSDemodReport::isSet(){ @@ -124,6 +246,24 @@ SWGILSDemodReport::isSet(){ if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break; } + if(ident && *ident != QString("")){ + isObjectUpdated = true; break; + } + if(m_deviation_isSet){ + isObjectUpdated = true; break; + } + if(m_sdm_isSet){ + isObjectUpdated = true; break; + } + if(m_ddm_isSet){ + isObjectUpdated = true; break; + } + if(m_dm90_isSet){ + isObjectUpdated = true; break; + } + if(m_dm150_isSet){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.h b/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.h index a8ac86315..8f8c8eca3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGILSDemodReport.h @@ -22,6 +22,7 @@ #include +#include #include "SWGObject.h" #include "export.h" @@ -47,6 +48,24 @@ public: qint32 getChannelSampleRate(); void setChannelSampleRate(qint32 channel_sample_rate); + QString* getIdent(); + void setIdent(QString* ident); + + float getDeviation(); + void setDeviation(float deviation); + + float getSdm(); + void setSdm(float sdm); + + float getDdm(); + void setDdm(float ddm); + + float getDm90(); + void setDm90(float dm90); + + float getDm150(); + void setDm150(float dm150); + virtual bool isSet() override; @@ -57,6 +76,24 @@ private: qint32 channel_sample_rate; bool m_channel_sample_rate_isSet; + QString* ident; + bool m_ident_isSet; + + float deviation; + bool m_deviation_isSet; + + float sdm; + bool m_sdm_isSet; + + float ddm; + bool m_ddm_isSet; + + float dm90; + bool m_dm90_isSet; + + float dm150; + bool m_dm150_isSet; + }; }