diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 4b3f7183c..18c58b2e3 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -6144,6 +6144,9 @@ margin-bottom: 20px; }, "devicesetlist" : { "$ref" : "#/definitions/DeviceSetList" + }, + "featuresetlist" : { + "$ref" : "#/definitions/FeatureSetList" } }, "description" : "Summarized information about this SDRangel instance" @@ -48108,7 +48111,7 @@ except ApiException as e:
- Generated 2021-08-28T23:40:46.879+02:00 + Generated 2021-08-31T23:36:40.361+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 61ce0eafc..e5b69abfb 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -2366,6 +2366,8 @@ definitions: $ref: "#/definitions/LoggingInfo" devicesetlist: $ref: "#/definitions/DeviceSetList" + featuresetlist: + $ref: "#/definitions/FeatureSetList" InstanceConfigResponse: description: Preferences, Presets and Commands of the MainSettings saved by Qt diff --git a/sdrbase/webapi/webapiadapter.cpp b/sdrbase/webapi/webapiadapter.cpp index decb7055f..d052922c8 100644 --- a/sdrbase/webapi/webapiadapter.cpp +++ b/sdrbase/webapi/webapiadapter.cpp @@ -122,6 +122,9 @@ int WebAPIAdapter::instanceSummary( SWGSDRangel::SWGDeviceSetList *deviceSetList = response.getDevicesetlist(); getDeviceSetList(deviceSetList); + SWGSDRangel::SWGFeatureSetList *featureSetList = response.getFeaturesetlist(); + getFeatureSetList(featureSetList); + return 200; } diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index 76fe48fff..f93f606a1 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -2366,6 +2366,8 @@ definitions: $ref: "#/definitions/LoggingInfo" devicesetlist: $ref: "#/definitions/DeviceSetList" + featuresetlist: + $ref: "#/definitions/FeatureSetList" InstanceConfigResponse: description: Preferences, Presets and Commands of the MainSettings saved by Qt diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 4b3f7183c..18c58b2e3 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -6144,6 +6144,9 @@ margin-bottom: 20px; }, "devicesetlist" : { "$ref" : "#/definitions/DeviceSetList" + }, + "featuresetlist" : { + "$ref" : "#/definitions/FeatureSetList" } }, "description" : "Summarized information about this SDRangel instance" @@ -48108,7 +48111,7 @@ except ApiException as e:
- Generated 2021-08-28T23:40:46.879+02:00 + Generated 2021-08-31T23:36:40.361+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp index 97548851d..49a1928c3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp @@ -48,6 +48,8 @@ SWGInstanceSummaryResponse::SWGInstanceSummaryResponse() { m_logging_isSet = false; devicesetlist = nullptr; m_devicesetlist_isSet = false; + featuresetlist = nullptr; + m_featuresetlist_isSet = false; } SWGInstanceSummaryResponse::~SWGInstanceSummaryResponse() { @@ -76,6 +78,8 @@ SWGInstanceSummaryResponse::init() { m_logging_isSet = false; devicesetlist = new SWGDeviceSetList(); m_devicesetlist_isSet = false; + featuresetlist = new SWGFeatureSetList(); + m_featuresetlist_isSet = false; } void @@ -104,6 +108,9 @@ SWGInstanceSummaryResponse::cleanup() { if(devicesetlist != nullptr) { delete devicesetlist; } + if(featuresetlist != nullptr) { + delete featuresetlist; + } } SWGInstanceSummaryResponse* @@ -137,6 +144,8 @@ SWGInstanceSummaryResponse::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&devicesetlist, pJson["devicesetlist"], "SWGDeviceSetList", "SWGDeviceSetList"); + ::SWGSDRangel::setValue(&featuresetlist, pJson["featuresetlist"], "SWGFeatureSetList", "SWGFeatureSetList"); + } QString @@ -183,6 +192,9 @@ SWGInstanceSummaryResponse::asJsonObject() { if((devicesetlist != nullptr) && (devicesetlist->isSet())){ toJsonValue(QString("devicesetlist"), devicesetlist, obj, QString("SWGDeviceSetList")); } + if((featuresetlist != nullptr) && (featuresetlist->isSet())){ + toJsonValue(QString("featuresetlist"), featuresetlist, obj, QString("SWGFeatureSetList")); + } return obj; } @@ -287,6 +299,16 @@ SWGInstanceSummaryResponse::setDevicesetlist(SWGDeviceSetList* devicesetlist) { this->m_devicesetlist_isSet = true; } +SWGFeatureSetList* +SWGInstanceSummaryResponse::getFeaturesetlist() { + return featuresetlist; +} +void +SWGInstanceSummaryResponse::setFeaturesetlist(SWGFeatureSetList* featuresetlist) { + this->featuresetlist = featuresetlist; + this->m_featuresetlist_isSet = true; +} + bool SWGInstanceSummaryResponse::isSet(){ @@ -322,6 +344,9 @@ SWGInstanceSummaryResponse::isSet(){ if(devicesetlist && devicesetlist->isSet()){ isObjectUpdated = true; break; } + if(featuresetlist && featuresetlist->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h index fdf7dd003..43a56f7a1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h @@ -23,6 +23,7 @@ #include "SWGDeviceSetList.h" +#include "SWGFeatureSetList.h" #include "SWGLoggingInfo.h" #include @@ -74,6 +75,9 @@ public: SWGDeviceSetList* getDevicesetlist(); void setDevicesetlist(SWGDeviceSetList* devicesetlist); + SWGFeatureSetList* getFeaturesetlist(); + void setFeaturesetlist(SWGFeatureSetList* featuresetlist); + virtual bool isSet() override; @@ -108,6 +112,9 @@ private: SWGDeviceSetList* devicesetlist; bool m_devicesetlist_isSet; + SWGFeatureSetList* featuresetlist; + bool m_featuresetlist_isSet; + }; }