diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index db232a860..8b9783808 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -2592,6 +2592,9 @@ margin-bottom: 20px; "pllLock" : { "type" : "integer" }, + "dmrBPKey" : { + "type" : "integer" + }, "rgbColor" : { "type" : "integer" }, @@ -33392,7 +33395,7 @@ except ApiException as e:
- Generated 2020-04-02T04:52:29.862+02:00 + Generated 2020-06-15T13:39:42.927+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml index c98268263..185cf113c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml @@ -37,6 +37,8 @@ DSDDemodSettings: type: integer pllLock: type: integer + dmrBPKey: + type: integer rgbColor: type: integer title: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index db232a860..8b9783808 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -2592,6 +2592,9 @@ margin-bottom: 20px; "pllLock" : { "type" : "integer" }, + "dmrBPKey" : { + "type" : "integer" + }, "rgbColor" : { "type" : "integer" }, @@ -33392,7 +33395,7 @@ except ApiException as e:
- Generated 2020-04-02T04:52:29.862+02:00 + Generated 2020-06-15T13:39:42.927+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp index ff8c4b9b3..eca8c9aaf 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp @@ -58,6 +58,8 @@ SWGDSDDemodSettings::SWGDSDDemodSettings() { m_tdma_stereo_isSet = false; pll_lock = 0; m_pll_lock_isSet = false; + dmr_bp_key = 0; + m_dmr_bp_key_isSet = false; rgb_color = 0; m_rgb_color_isSet = false; title = nullptr; @@ -122,6 +124,8 @@ SWGDSDDemodSettings::init() { m_tdma_stereo_isSet = false; pll_lock = 0; m_pll_lock_isSet = false; + dmr_bp_key = 0; + m_dmr_bp_key_isSet = false; rgb_color = 0; m_rgb_color_isSet = false; title = new QString(""); @@ -168,6 +172,7 @@ SWGDSDDemodSettings::cleanup() { + if(title != nullptr) { delete title; } @@ -229,6 +234,8 @@ SWGDSDDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&pll_lock, pJson["pllLock"], "qint32", ""); + ::SWGSDRangel::setValue(&dmr_bp_key, pJson["dmrBPKey"], "qint32", ""); + ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); @@ -316,6 +323,9 @@ SWGDSDDemodSettings::asJsonObject() { if(m_pll_lock_isSet){ obj->insert("pllLock", QJsonValue(pll_lock)); } + if(m_dmr_bp_key_isSet){ + obj->insert("dmrBPKey", QJsonValue(dmr_bp_key)); + } if(m_rgb_color_isSet){ obj->insert("rgbColor", QJsonValue(rgb_color)); } @@ -509,6 +519,16 @@ SWGDSDDemodSettings::setPllLock(qint32 pll_lock) { this->m_pll_lock_isSet = true; } +qint32 +SWGDSDDemodSettings::getDmrBpKey() { + return dmr_bp_key; +} +void +SWGDSDDemodSettings::setDmrBpKey(qint32 dmr_bp_key) { + this->dmr_bp_key = dmr_bp_key; + this->m_dmr_bp_key_isSet = true; +} + qint32 SWGDSDDemodSettings::getRgbColor() { return rgb_color; @@ -689,6 +709,9 @@ SWGDSDDemodSettings::isSet(){ if(m_pll_lock_isSet){ isObjectUpdated = true; break; } + if(m_dmr_bp_key_isSet){ + isObjectUpdated = true; break; + } if(m_rgb_color_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h index f9749fc5f..6b467bd97 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h @@ -87,6 +87,9 @@ public: qint32 getPllLock(); void setPllLock(qint32 pll_lock); + qint32 getDmrBpKey(); + void setDmrBpKey(qint32 dmr_bp_key); + qint32 getRgbColor(); void setRgbColor(qint32 rgb_color); @@ -175,6 +178,9 @@ private: qint32 pll_lock; bool m_pll_lock_isSet; + qint32 dmr_bp_key; + bool m_dmr_bp_key_isSet; + qint32 rgb_color; bool m_rgb_color_isSet;