VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 17:28:50 -05:00
Code Issues Projects Releases Wiki Activity

REST API: implement reverse API settings (1). Bump version

Browse Source
This commit is contained in:
f4exb 2019-01-10 22:35:38 +01:00
parent 68e109193f
commit 6e0be2d122
12 changed files with 100 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/main.cpp
View File

@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
*/ */
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangel"); QCoreApplication::setApplicationName("SDRangel");
QCoreApplication::setApplicationVersion("4.4.0"); QCoreApplication::setApplicationVersion("4.4.1");
#if QT_VERSION >= 0x050600 #if QT_VERSION >= 0x050600
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps

2
appbench/main.cpp
View File

@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelBench"); QCoreApplication::setApplicationName("SDRangelBench");
QCoreApplication::setApplicationVersion("4.4.0"); QCoreApplication::setApplicationVersion("4.4.1");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

2
appsrv/main.cpp
View File

@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelSrv"); QCoreApplication::setApplicationName("SDRangelSrv");
QCoreApplication::setApplicationVersion("4.4.0"); QCoreApplication::setApplicationVersion("4.4.1");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

23
plugins/samplesource/airspy/airspyinput.cpp
View File

@ -704,6 +704,18 @@ int AirspyInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("fileRecordName")) { if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getAirspySettings()->getFileRecordName(); settings.m_fileRecordName = *response.getAirspySettings()->getFileRecordName();
} }
if (deviceSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress();
}
if (deviceSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort();
}
if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex();
}
MsgConfigureAirspy *msg = MsgConfigureAirspy::create(settings, force); MsgConfigureAirspy *msg = MsgConfigureAirspy::create(settings, force);
m_inputMessageQueue.push(msg); m_inputMessageQueue.push(msg);
@ -752,6 +764,17 @@ void AirspyInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
} else { } else {
response.getAirspySettings()->setFileRecordName(new QString(settings.m_fileRecordName)); response.getAirspySettings()->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 AirspyInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) void AirspyInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)

2
plugins/samplesource/airspy/airspyplugin.cpp
View File

@ -32,7 +32,7 @@ const int AirspyPlugin::m_maxDevices = 32;
const PluginDescriptor AirspyPlugin::m_pluginDescriptor = { const PluginDescriptor AirspyPlugin::m_pluginDescriptor = {
QString("Airspy Input"), QString("Airspy Input"),
QString("4.3.2"), QString("4.4.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

23
plugins/samplesource/airspyhf/airspyhfinput.cpp
View File

@ -572,6 +572,18 @@ int AirspyHFInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("fileRecordName")) { if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getAirspyHfSettings()->getFileRecordName(); settings.m_fileRecordName = *response.getAirspyHfSettings()->getFileRecordName();
} }
if (deviceSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress();
}
if (deviceSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort();
}
if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex();
}
MsgConfigureAirspyHF *msg = MsgConfigureAirspyHF::create(settings, force); MsgConfigureAirspyHF *msg = MsgConfigureAirspyHF::create(settings, force);
m_inputMessageQueue.push(msg); m_inputMessageQueue.push(msg);
@ -601,6 +613,17 @@ void AirspyHFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r
} else { } else {
response.getAirspyHfSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); response.getAirspyHfSettings()->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 AirspyHFInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) void AirspyHFInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)

2
plugins/samplesource/airspyhf/airspyhfplugin.cpp
View File

@ -30,7 +30,7 @@
const PluginDescriptor AirspyHFPlugin::m_pluginDescriptor = { const PluginDescriptor AirspyHFPlugin::m_pluginDescriptor = {
QString("AirspyHF Input"), QString("AirspyHF Input"),
QString("4.3.2"), QString("4.4.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

23
plugins/samplesource/bladerf1input/bladerf1input.cpp
View File

@ -641,6 +641,17 @@ void Bladerf1Input::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r
} else { } else {
response.getBladeRf1InputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); response.getBladeRf1InputSettings()->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);
} }
int Bladerf1Input::webapiSettingsPutPatch( int Bladerf1Input::webapiSettingsPutPatch(
@ -694,6 +705,18 @@ int Bladerf1Input::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("fileRecordName")) { if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName(); settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName();
} }
if (deviceSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress();
}
if (deviceSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort();
}
if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex();
}
MsgConfigureBladerf1 *msg = MsgConfigureBladerf1::create(settings, force); MsgConfigureBladerf1 *msg = MsgConfigureBladerf1::create(settings, force);
m_inputMessageQueue.push(msg); m_inputMessageQueue.push(msg);

2
plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp
View File

@ -30,7 +30,7 @@
const PluginDescriptor Blderf1InputPlugin::m_pluginDescriptor = { const PluginDescriptor Blderf1InputPlugin::m_pluginDescriptor = {
QString("BladeRF1 Input"), QString("BladeRF1 Input"),
QString("4.3.2"), QString("4.4.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

23
plugins/samplesource/bladerf2input/bladerf2input.cpp
View File

@ -1094,6 +1094,18 @@ int BladeRF2Input::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("fileRecordName")) { if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName(); settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName();
} }
if (deviceSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0;
}
if (deviceSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress();
}
if (deviceSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort();
}
if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex();
}
MsgConfigureBladeRF2 *msg = MsgConfigureBladeRF2::create(settings, force); MsgConfigureBladeRF2 *msg = MsgConfigureBladeRF2::create(settings, force);
m_inputMessageQueue.push(msg); m_inputMessageQueue.push(msg);
@ -1138,6 +1150,17 @@ void BladeRF2Input::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r
} else { } else {
response.getBladeRf2InputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); response.getBladeRf2InputSettings()->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 BladeRF2Input::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) void BladeRF2Input::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)

2
plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp
View File

@ -30,7 +30,7 @@
const PluginDescriptor Blderf2InputPlugin::m_pluginDescriptor = { const PluginDescriptor Blderf2InputPlugin::m_pluginDescriptor = {
QString("BladeRF2 Input"), QString("BladeRF2 Input"),
QString("4.3.2"), QString("4.4.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

2
plugins/samplesource/testsource/testsourceplugin.cpp
View File

@ -29,7 +29,7 @@
const PluginDescriptor TestSourcePlugin::m_pluginDescriptor = { const PluginDescriptor TestSourcePlugin::m_pluginDescriptor = {
QString("Test Source input"), QString("Test Source input"),
QString("4.3.2"), QString("4.4.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,