VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reverse API: RTL-SDR (4) and Test Source (2) input changes

This commit is contained in:
f4exb 2018-12-18 21:46:03 +01:00
parent 8e8eb191a3
commit 442f23ca91
14 changed files with 360 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -659,6 +659,18 @@ int RTLSDRInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getRtlSdrSettings()->getFileRecordName();
}
if (deviceSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getRtlSdrSettings()->getUseReverseApi() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getRtlSdrSettings()->getReverseApiAddress() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getRtlSdrSettings()->getReverseApiPort();
}
if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getRtlSdrSettings()->getReverseApiDeviceIndex();
}
MsgConfigureRTLSDR *msg = MsgConfigureRTLSDR::create(settings, force);
m_inputMessageQueue.push(msg);
@ -697,6 +709,17 @@ void RTLSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
} else {
response.getRtlSdrSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
}
response.getRtlSdrSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);
if (response.getRtlSdrSettings()->getReverseApiAddress()) {
*response.getRtlSdrSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress;
} else {
response.getRtlSdrSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress));
}
response.getRtlSdrSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getRtlSdrSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
}
int RTLSDRInput::webapiRunGet(

23
plugins/samplesource/testsource/testsourceinput.cpp
View File

@ -552,6 +552,18 @@ int TestSourceInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getTestSourceSettings()->getFileRecordName();
}
if (deviceSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort();
}
if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex();
}
MsgConfigureTestSource *msg = MsgConfigureTestSource::create(settings, force);
m_inputMessageQueue.push(msg);
@ -590,6 +602,17 @@ void TestSourceInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings&
} else {
response.getTestSourceSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
}
response.getTestSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);
if (response.getTestSourceSettings()->getReverseApiAddress()) {
*response.getTestSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress;
} else {
response.getTestSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress));
}
response.getTestSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getTestSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
}
void TestSourceInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const TestSourceSettings& settings, bool force)

30
sdrbase/resources/webapi/doc/html2/index.html
View File

@ -763,7 +763,7 @@ margin-bottom: 20px;
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronizw with reverse API (1 for yes, 0 for no)"
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
@ -3537,6 +3537,19 @@ margin-bottom: 20px;
},
"fileRecordName" : {
"type" : "string"
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
}
},
"description" : "RTLSDR"
@ -4308,6 +4321,19 @@ margin-bottom: 20px;
},
"fileRecordName" : {
"type" : "string"
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
}
},
"description" : "TestSource"
@ -23665,7 +23691,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2018-12-16T10:04:01.738+01:00
Generated 2018-12-18T21:38:21.986+01:00
</div>
</div>
</div>

2
sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml
View File

@ -34,7 +34,7 @@ AMDemodSettings:
description: Synchronous AM sidebands mode (DSB, USB, LSB)
type: integer
useReverseAPI:
description: Synchronizw with reverse API (1 for yes, 0 for no)
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string

9
sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
View File

@ -35,6 +35,15 @@ RtlSdrSettings:
type: integer
fileRecordName:
type: string
useReverseAPI:
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer
RtlSdrReport:
description: RTLSDR

9
sdrbase/resources/webapi/doc/swagger/include/TestSource.yaml
View File

@ -40,4 +40,13 @@ TestSourceSettings:
format: float
fileRecordName:
type: string
useReverseAPI:
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer

2
swagger/sdrangel/api/swagger/include/AMDemod.yaml
View File

@ -34,7 +34,7 @@ AMDemodSettings:
description: Synchronous AM sidebands mode (DSB, USB, LSB)
type: integer
useReverseAPI:
description: Synchronizw with reverse API (1 for yes, 0 for no)
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string

9
swagger/sdrangel/api/swagger/include/RtlSdr.yaml
View File

@ -35,6 +35,15 @@ RtlSdrSettings:
type: integer
fileRecordName:
type: string
useReverseAPI:
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer
RtlSdrReport:
description: RTLSDR

9
swagger/sdrangel/api/swagger/include/TestSource.yaml
View File

@ -40,4 +40,13 @@ TestSourceSettings:
format: float
fileRecordName:
type: string
useReverseAPI:
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer

30
swagger/sdrangel/code/html2/index.html
View File

@ -763,7 +763,7 @@ margin-bottom: 20px;
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronizw with reverse API (1 for yes, 0 for no)"
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
@ -3537,6 +3537,19 @@ margin-bottom: 20px;
},
"fileRecordName" : {
"type" : "string"
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
}
},
"description" : "RTLSDR"
@ -4308,6 +4321,19 @@ margin-bottom: 20px;
},
"fileRecordName" : {
"type" : "string"
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
}
},
"description" : "TestSource"
@ -23665,7 +23691,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2018-12-16T10:04:01.738+01:00
Generated 2018-12-18T21:38:21.986+01:00
</div>
</div>
</div>

86
swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp
View File

@ -60,6 +60,14 @@ SWGRtlSdrSettings::SWGRtlSdrSettings() {
m_rf_bandwidth_isSet = false;
file_record_name = nullptr;
m_file_record_name_isSet = false;
use_reverse_api = 0;
m_use_reverse_api_isSet = false;
reverse_api_address = nullptr;
m_reverse_api_address_isSet = false;
reverse_api_port = 0;
m_reverse_api_port_isSet = false;
reverse_api_device_index = 0;
m_reverse_api_device_index_isSet = false;
}
SWGRtlSdrSettings::~SWGRtlSdrSettings() {
@ -100,6 +108,14 @@ SWGRtlSdrSettings::init() {
m_rf_bandwidth_isSet = false;
file_record_name = new QString("");
m_file_record_name_isSet = false;
use_reverse_api = 0;
m_use_reverse_api_isSet = false;
reverse_api_address = new QString("");
m_reverse_api_address_isSet = false;
reverse_api_port = 0;
m_reverse_api_port_isSet = false;
reverse_api_device_index = 0;
m_reverse_api_device_index_isSet = false;
}
void
@ -122,6 +138,12 @@ SWGRtlSdrSettings::cleanup() {
if(file_record_name != nullptr) {
delete file_record_name;
}
if(reverse_api_address != nullptr) {
delete reverse_api_address;
}
}
SWGRtlSdrSettings*
@ -167,6 +189,14 @@ SWGRtlSdrSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString");
::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
}
QString
@ -231,6 +261,18 @@ SWGRtlSdrSettings::asJsonObject() {
if(file_record_name != nullptr && *file_record_name != QString("")){
toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString"));
}
if(m_use_reverse_api_isSet){
obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
}
if(reverse_api_address != nullptr && *reverse_api_address != QString("")){
toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString"));
}
if(m_reverse_api_port_isSet){
obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
}
if(m_reverse_api_device_index_isSet){
obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
}
return obj;
}
@ -395,6 +437,46 @@ SWGRtlSdrSettings::setFileRecordName(QString* file_record_name) {
this->m_file_record_name_isSet = true;
}
qint32
SWGRtlSdrSettings::getUseReverseApi() {
return use_reverse_api;
}
void
SWGRtlSdrSettings::setUseReverseApi(qint32 use_reverse_api) {
this->use_reverse_api = use_reverse_api;
this->m_use_reverse_api_isSet = true;
}
QString*
SWGRtlSdrSettings::getReverseApiAddress() {
return reverse_api_address;
}
void
SWGRtlSdrSettings::setReverseApiAddress(QString* reverse_api_address) {
this->reverse_api_address = reverse_api_address;
this->m_reverse_api_address_isSet = true;
}
qint32
SWGRtlSdrSettings::getReverseApiPort() {
return reverse_api_port;
}
void
SWGRtlSdrSettings::setReverseApiPort(qint32 reverse_api_port) {
this->reverse_api_port = reverse_api_port;
this->m_reverse_api_port_isSet = true;
}
qint32
SWGRtlSdrSettings::getReverseApiDeviceIndex() {
return reverse_api_device_index;
}
void
SWGRtlSdrSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
this->reverse_api_device_index = reverse_api_device_index;
this->m_reverse_api_device_index_isSet = true;
}
bool
SWGRtlSdrSettings::isSet(){
@ -416,6 +498,10 @@ SWGRtlSdrSettings::isSet(){
if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}
if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
}while(false);
return isObjectUpdated;
}

24
swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h
View File

@ -90,6 +90,18 @@ public:
QString* getFileRecordName();
void setFileRecordName(QString* file_record_name);
qint32 getUseReverseApi();
void setUseReverseApi(qint32 use_reverse_api);
QString* getReverseApiAddress();
void setReverseApiAddress(QString* reverse_api_address);
qint32 getReverseApiPort();
void setReverseApiPort(qint32 reverse_api_port);
qint32 getReverseApiDeviceIndex();
void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
virtual bool isSet() override;
@ -142,6 +154,18 @@ private:
QString* file_record_name;
bool m_file_record_name_isSet;
qint32 use_reverse_api;
bool m_use_reverse_api_isSet;
QString* reverse_api_address;
bool m_reverse_api_address_isSet;
qint32 reverse_api_port;
bool m_reverse_api_port_isSet;
qint32 reverse_api_device_index;
bool m_reverse_api_device_index_isSet;
};
}

86
swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp
View File

@ -62,6 +62,14 @@ SWGTestSourceSettings::SWGTestSourceSettings() {
m_phase_imbalance_isSet = false;
file_record_name = nullptr;
m_file_record_name_isSet = false;
use_reverse_api = 0;
m_use_reverse_api_isSet = false;
reverse_api_address = nullptr;
m_reverse_api_address_isSet = false;
reverse_api_port = 0;
m_reverse_api_port_isSet = false;
reverse_api_device_index = 0;
m_reverse_api_device_index_isSet = false;
}
SWGTestSourceSettings::~SWGTestSourceSettings() {
@ -104,6 +112,14 @@ SWGTestSourceSettings::init() {
m_phase_imbalance_isSet = false;
file_record_name = new QString("");
m_file_record_name_isSet = false;
use_reverse_api = 0;
m_use_reverse_api_isSet = false;
reverse_api_address = new QString("");
m_reverse_api_address_isSet = false;
reverse_api_port = 0;
m_reverse_api_port_isSet = false;
reverse_api_device_index = 0;
m_reverse_api_device_index_isSet = false;
}
void
@ -127,6 +143,12 @@ SWGTestSourceSettings::cleanup() {
if(file_record_name != nullptr) {
delete file_record_name;
}
if(reverse_api_address != nullptr) {
delete reverse_api_address;
}
}
SWGTestSourceSettings*
@ -174,6 +196,14 @@ SWGTestSourceSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString");
::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
}
QString
@ -241,6 +271,18 @@ SWGTestSourceSettings::asJsonObject() {
if(file_record_name != nullptr && *file_record_name != QString("")){
toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString"));
}
if(m_use_reverse_api_isSet){
obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
}
if(reverse_api_address != nullptr && *reverse_api_address != QString("")){
toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString"));
}
if(m_reverse_api_port_isSet){
obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
}
if(m_reverse_api_device_index_isSet){
obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
}
return obj;
}
@ -415,6 +457,46 @@ SWGTestSourceSettings::setFileRecordName(QString* file_record_name) {
this->m_file_record_name_isSet = true;
}
qint32
SWGTestSourceSettings::getUseReverseApi() {
return use_reverse_api;
}
void
SWGTestSourceSettings::setUseReverseApi(qint32 use_reverse_api) {
this->use_reverse_api = use_reverse_api;
this->m_use_reverse_api_isSet = true;
}
QString*
SWGTestSourceSettings::getReverseApiAddress() {
return reverse_api_address;
}
void
SWGTestSourceSettings::setReverseApiAddress(QString* reverse_api_address) {
this->reverse_api_address = reverse_api_address;
this->m_reverse_api_address_isSet = true;
}
qint32
SWGTestSourceSettings::getReverseApiPort() {
return reverse_api_port;
}
void
SWGTestSourceSettings::setReverseApiPort(qint32 reverse_api_port) {
this->reverse_api_port = reverse_api_port;
this->m_reverse_api_port_isSet = true;
}
qint32
SWGTestSourceSettings::getReverseApiDeviceIndex() {
return reverse_api_device_index;
}
void
SWGTestSourceSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
this->reverse_api_device_index = reverse_api_device_index;
this->m_reverse_api_device_index_isSet = true;
}
bool
SWGTestSourceSettings::isSet(){
@ -437,6 +519,10 @@ SWGTestSourceSettings::isSet(){
if(m_q_factor_isSet){ isObjectUpdated = true; break;}
if(m_phase_imbalance_isSet){ isObjectUpdated = true; break;}
if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;}
if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;}
if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;}
if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;}
if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;}
}while(false);
return isObjectUpdated;
}

24
swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.h
View File

@ -93,6 +93,18 @@ public:
QString* getFileRecordName();
void setFileRecordName(QString* file_record_name);
qint32 getUseReverseApi();
void setUseReverseApi(qint32 use_reverse_api);
QString* getReverseApiAddress();
void setReverseApiAddress(QString* reverse_api_address);
qint32 getReverseApiPort();
void setReverseApiPort(qint32 reverse_api_port);
qint32 getReverseApiDeviceIndex();
void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
virtual bool isSet() override;
@ -148,6 +160,18 @@ private:
QString* file_record_name;
bool m_file_record_name_isSet;
qint32 use_reverse_api;
bool m_use_reverse_api_isSet;
QString* reverse_api_address;
bool m_reverse_api_address_isSet;
qint32 reverse_api_port;
bool m_reverse_api_port_isSet;
qint32 reverse_api_device_index;
bool m_reverse_api_device_index_isSet;
};
}