diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 044777b05..d406cb817 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -7278,6 +7278,10 @@ margin-bottom: 20px; "channelSampleRate" : { "type" : "integer" }, + "scanState" : { + "type" : "integer", + "description" : "(IDLE=0, START_SCAN=1, SCANNING=2, WAIT_FOR_END_TX=3, WAIT_FOR_RETRANSMISSION=4)" + }, "channelState" : { "type" : "array", "items" : { @@ -59115,7 +59119,7 @@ except ApiException as e:
- Generated 2024-06-21T10:02:32.986+02:00 + Generated 2024-06-21T11:03:53.536+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml index 760eee087..74a9ea49e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FreqScanner.yaml @@ -59,6 +59,9 @@ FreqScannerReport: properties: channelSampleRate: type: integer + scanState: + description: (IDLE=0, START_SCAN=1, SCANNING=2, WAIT_FOR_END_TX=3, WAIT_FOR_RETRANSMISSION=4) + type: integer channelState: type: array items: diff --git a/swagger/sdrangel/api/swagger/include/FreqScanner.yaml b/swagger/sdrangel/api/swagger/include/FreqScanner.yaml index c3e447160..bb8c76ebf 100644 --- a/swagger/sdrangel/api/swagger/include/FreqScanner.yaml +++ b/swagger/sdrangel/api/swagger/include/FreqScanner.yaml @@ -59,6 +59,9 @@ FreqScannerReport: properties: channelSampleRate: type: integer + scanState: + description: (IDLE=0, START_SCAN=1, SCANNING=2, WAIT_FOR_END_TX=3, WAIT_FOR_RETRANSMISSION=4) + type: integer channelState: type: array items: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 044777b05..d406cb817 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -7278,6 +7278,10 @@ margin-bottom: 20px; "channelSampleRate" : { "type" : "integer" }, + "scanState" : { + "type" : "integer", + "description" : "(IDLE=0, START_SCAN=1, SCANNING=2, WAIT_FOR_END_TX=3, WAIT_FOR_RETRANSMISSION=4)" + }, "channelState" : { "type" : "array", "items" : { @@ -59115,7 +59119,7 @@ except ApiException as e:
- Generated 2024-06-21T10:02:32.986+02:00 + Generated 2024-06-21T11:03:53.536+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.cpp index 41782ab84..6d1ab6fbf 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.cpp @@ -30,6 +30,8 @@ SWGFreqScannerReport::SWGFreqScannerReport(QString* json) { SWGFreqScannerReport::SWGFreqScannerReport() { channel_sample_rate = 0; m_channel_sample_rate_isSet = false; + scan_state = 0; + m_scan_state_isSet = false; channel_state = nullptr; m_channel_state_isSet = false; } @@ -42,6 +44,8 @@ void SWGFreqScannerReport::init() { channel_sample_rate = 0; m_channel_sample_rate_isSet = false; + scan_state = 0; + m_scan_state_isSet = false; channel_state = new QList(); m_channel_state_isSet = false; } @@ -49,6 +53,7 @@ SWGFreqScannerReport::init() { void SWGFreqScannerReport::cleanup() { + if(channel_state != nullptr) { auto arr = channel_state; for(auto o: *arr) { @@ -71,6 +76,8 @@ void SWGFreqScannerReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&channel_sample_rate, pJson["channelSampleRate"], "qint32", ""); + ::SWGSDRangel::setValue(&scan_state, pJson["scanState"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_state, pJson["channelState"], "QList", "SWGFreqScannerChannelState"); } @@ -92,6 +99,9 @@ SWGFreqScannerReport::asJsonObject() { if(m_channel_sample_rate_isSet){ obj->insert("channelSampleRate", QJsonValue(channel_sample_rate)); } + if(m_scan_state_isSet){ + obj->insert("scanState", QJsonValue(scan_state)); + } if(channel_state && channel_state->size() > 0){ toJsonArray((QList*)channel_state, obj, "channelState", "SWGFreqScannerChannelState"); } @@ -109,6 +119,16 @@ SWGFreqScannerReport::setChannelSampleRate(qint32 channel_sample_rate) { this->m_channel_sample_rate_isSet = true; } +qint32 +SWGFreqScannerReport::getScanState() { + return scan_state; +} +void +SWGFreqScannerReport::setScanState(qint32 scan_state) { + this->scan_state = scan_state; + this->m_scan_state_isSet = true; +} + QList* SWGFreqScannerReport::getChannelState() { return channel_state; @@ -127,6 +147,9 @@ SWGFreqScannerReport::isSet(){ if(m_channel_sample_rate_isSet){ isObjectUpdated = true; break; } + if(m_scan_state_isSet){ + isObjectUpdated = true; break; + } if(channel_state && (channel_state->size() > 0)){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.h b/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.h index 691c5838d..4a1eaebc4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGFreqScannerReport.h @@ -46,6 +46,9 @@ public: qint32 getChannelSampleRate(); void setChannelSampleRate(qint32 channel_sample_rate); + qint32 getScanState(); + void setScanState(qint32 scan_state); + QList* getChannelState(); void setChannelState(QList* channel_state); @@ -56,6 +59,9 @@ private: qint32 channel_sample_rate; bool m_channel_sample_rate_isSet; + qint32 scan_state; + bool m_scan_state_isSet; + QList* channel_state; bool m_channel_state_isSet;