VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 22:45:05 -04:00
Code Issues Projects Releases Wiki Activity

File record default file name fix (3): web API

Browse Source
This commit is contained in:
f4exb
2018-05-09 18:59:39 +02:00
parent 775b2a270d
commit 625f0eb72c
21 changed files with 221 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspyhf/airspyhfinput.cpp
+9
View File
@@ -527,6 +527,9 @@ int AirspyHFInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("bandIndex")) {
settings.m_bandIndex = response.getAirspyHfSettings()->getBandIndex() != 0;
}
if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getAirspyHfSettings()->getFileRecordName();
}
MsgConfigureAirspyHF *msg = MsgConfigureAirspyHF::create(settings, force);
m_inputMessageQueue.push(msg);
@@ -550,6 +553,12 @@ void AirspyHFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r
response.getAirspyHfSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
response.getAirspyHfSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0);
response.getAirspyHfSettings()->setBandIndex(settings.m_bandIndex ? 1 : 0);
if (response.getAirspyHfSettings()->getFileRecordName()) {
*response.getAirspyHfSettings()->getFileRecordName() = settings.m_fileRecordName;
} else {
response.getAirspyHfSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
}
}
int AirspyHFInput::webapiRunGet(
plugins/samplesource/bladerfinput/bladerfinput.cpp
+9
View File
@@ -639,6 +639,12 @@ void BladerfInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& re
response.getBladeRfInputSettings()->setXb200Filter((int) settings.m_xb200Filter);
response.getBladeRfInputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0);
response.getBladeRfInputSettings()->setIqCorrection(settings.m_iqCorrection ? 1 : 0);
if (response.getBladeRfInputSettings()->getFileRecordName()) {
*response.getBladeRfInputSettings()->getFileRecordName() = settings.m_fileRecordName;
} else {
response.getBladeRfInputSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
}
}
int BladerfInput::webapiSettingsPutPatch(
@@ -688,6 +694,9 @@ int BladerfInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("iqCorrection")) {
settings.m_iqCorrection = response.getBladeRfInputSettings()->getIqCorrection() != 0;
}
if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getBladeRfInputSettings()->getFileRecordName();
}
MsgConfigureBladerf *msg = MsgConfigureBladerf::create(settings, force);
m_inputMessageQueue.push(msg);
plugins/samplesource/hackrfinput/hackrfinput.cpp
+9
View File
@@ -602,6 +602,9 @@ int HackRFInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("linkTxFrequency")) {
settings.m_linkTxFrequency = response.getHackRfInputSettings()->getLinkTxFrequency() != 0;
}
if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getHackRfInputSettings()->getFileRecordName();
}
MsgConfigureHackRF *msg = MsgConfigureHackRF::create(settings, force);
m_inputMessageQueue.push(msg);
@@ -631,6 +634,12 @@ void HackRFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
response.getHackRfInputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0);
response.getHackRfInputSettings()->setIqCorrection(settings.m_iqCorrection ? 1 : 0);
response.getHackRfInputSettings()->setLinkTxFrequency(settings.m_linkTxFrequency ? 1 : 0);
if (response.getHackRfInputSettings()->getFileRecordName()) {
*response.getHackRfInputSettings()->getFileRecordName() = settings.m_fileRecordName;
} else {
response.getHackRfInputSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
}
}
int HackRFInput::webapiRunGet(
plugins/samplesource/limesdrinput/limesdrinput.cpp
+9
View File
@@ -1337,6 +1337,9 @@ int LimeSDRInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("transverterMode")) {
settings.m_transverterMode = response.getLimeSdrInputSettings()->getTransverterMode() != 0;
}
if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getLimeSdrInputSettings()->getFileRecordName();
}
MsgConfigureLimeSDR *msg = MsgConfigureLimeSDR::create(settings, force);
m_inputMessageQueue.push(msg);
@@ -1374,6 +1377,12 @@ void LimeSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& re
response.getLimeSdrInputSettings()->setTiaGain(settings.m_tiaGain);
response.getLimeSdrInputSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
response.getLimeSdrInputSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0);
if (response.getLimeSdrInputSettings()->getFileRecordName()) {
*response.getLimeSdrInputSettings()->getFileRecordName() = settings.m_fileRecordName;
} else {
response.getLimeSdrInputSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
}
}
int LimeSDRInput::webapiRunGet(
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+9
View File
@@ -608,6 +608,9 @@ int RTLSDRInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("rfBandwidth")) {
settings.m_rfBandwidth = response.getRtlSdrSettings()->getRfBandwidth() != 0;
}
if (deviceSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getRtlSdrSettings()->getFileRecordName();
}
MsgConfigureRTLSDR *msg = MsgConfigureRTLSDR::create(settings, force);
m_inputMessageQueue.push(msg);
@@ -638,6 +641,12 @@ void RTLSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
response.getRtlSdrSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
response.getRtlSdrSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0);
response.getRtlSdrSettings()->setRfBandwidth(settings.m_rfBandwidth);
if (response.getRtlSdrSettings()->getFileRecordName()) {
*response.getRtlSdrSettings()->getFileRecordName() = settings.m_fileRecordName;
} else {
response.getRtlSdrSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
}
}
int RTLSDRInput::webapiRunGet(