Reverse API: format updates

This commit is contained in:
f4exb 2018-12-19 22:01:26 +01:00
parent f689feb8b6
commit 7c4b4bc795
5 changed files with 74 additions and 69 deletions

View File

@ -792,5 +792,6 @@ void AMDemod::networkManagerFinished(QNetworkReply *reply)
}
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("AMDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
}

View File

@ -1444,52 +1444,52 @@ void LimeSDROutput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys
if (deviceSettingsKeys.contains("antennaPath") || force) {
swgLimeSdrOutputSettings->setAntennaPath((int) settings.m_antennaPath);
}
if (deviceSettingsKeys.contains("centerFrequency")) {
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgLimeSdrOutputSettings->setCenterFrequency(settings.m_centerFrequency);
}
if (deviceSettingsKeys.contains("devSampleRate")) {
if (deviceSettingsKeys.contains("devSampleRate") || force) {
swgLimeSdrOutputSettings->setDevSampleRate(settings.m_devSampleRate);
}
if (deviceSettingsKeys.contains("extClock")) {
if (deviceSettingsKeys.contains("extClock") || force) {
swgLimeSdrOutputSettings->setExtClock(settings.m_extClock ? 1 : 0);
}
if (deviceSettingsKeys.contains("extClockFreq")) {
if (deviceSettingsKeys.contains("extClockFreq") || force) {
swgLimeSdrOutputSettings->setExtClockFreq(settings.m_extClockFreq);
}
if (deviceSettingsKeys.contains("gain")) {
if (deviceSettingsKeys.contains("gain") || force) {
swgLimeSdrOutputSettings->setGain(settings.m_gain);
}
if (deviceSettingsKeys.contains("log2HardInterp")) {
if (deviceSettingsKeys.contains("log2HardInterp") || force) {
swgLimeSdrOutputSettings->setLog2HardInterp(settings.m_log2HardInterp);
}
if (deviceSettingsKeys.contains("log2SoftInterp")) {
if (deviceSettingsKeys.contains("log2SoftInterp") || force) {
swgLimeSdrOutputSettings->setLog2SoftInterp(settings.m_log2SoftInterp);
}
if (deviceSettingsKeys.contains("lpfBW")) {
if (deviceSettingsKeys.contains("lpfBW") || force) {
swgLimeSdrOutputSettings->setLpfBw(settings.m_lpfBW);
}
if (deviceSettingsKeys.contains("lpfFIREnable")) {
if (deviceSettingsKeys.contains("lpfFIREnable") || force) {
swgLimeSdrOutputSettings->setLpfFirEnable(settings.m_lpfFIREnable ? 1 : 0);
}
if (deviceSettingsKeys.contains("lpfFIRBW")) {
if (deviceSettingsKeys.contains("lpfFIRBW") || force) {
swgLimeSdrOutputSettings->setLpfFirbw(settings.m_lpfFIRBW);
}
if (deviceSettingsKeys.contains("ncoEnable")) {
if (deviceSettingsKeys.contains("ncoEnable") || force) {
swgLimeSdrOutputSettings->setNcoEnable(settings.m_ncoEnable ? 1 : 0);
}
if (deviceSettingsKeys.contains("ncoFrequency")) {
if (deviceSettingsKeys.contains("ncoFrequency") || force) {
swgLimeSdrOutputSettings->setNcoFrequency(settings.m_ncoFrequency);
}
if (deviceSettingsKeys.contains("transverterDeltaFrequency")) {
if (deviceSettingsKeys.contains("transverterDeltaFrequency") || force) {
swgLimeSdrOutputSettings->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
}
if (deviceSettingsKeys.contains("transverterMode")) {
if (deviceSettingsKeys.contains("transverterMode") || force) {
swgLimeSdrOutputSettings->setTransverterMode(settings.m_transverterMode ? 1 : 0);
}
if (deviceSettingsKeys.contains("gpioDir")) {
if (deviceSettingsKeys.contains("gpioDir") || force) {
swgLimeSdrOutputSettings->setGpioDir(settings.m_gpioDir & 0xFF);
}
if (deviceSettingsKeys.contains("gpioPins")) {
if (deviceSettingsKeys.contains("gpioPins") || force) {
swgLimeSdrOutputSettings->setGpioPins(settings.m_gpioPins & 0xFF);
}
@ -1540,5 +1540,6 @@ void LimeSDROutput::networkManagerFinished(QNetworkReply *reply)
}
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("LimeSDROutput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
}

View File

@ -1667,73 +1667,73 @@ void LimeSDRInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys,
if (deviceSettingsKeys.contains("antennaPath") || force) {
swgLimeSdrInputSettings->setAntennaPath((int) settings.m_antennaPath);
}
if (deviceSettingsKeys.contains("centerFrequency")) {
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgLimeSdrInputSettings->setCenterFrequency(settings.m_centerFrequency);
}
if (deviceSettingsKeys.contains("dcBlock")) {
if (deviceSettingsKeys.contains("dcBlock") || force) {
swgLimeSdrInputSettings->setDcBlock(settings.m_dcBlock ? 1 : 0);
}
if (deviceSettingsKeys.contains("devSampleRate")) {
if (deviceSettingsKeys.contains("devSampleRate") || force) {
swgLimeSdrInputSettings->setDevSampleRate(settings.m_devSampleRate);
}
if (deviceSettingsKeys.contains("extClock")) {
if (deviceSettingsKeys.contains("extClock") || force) {
swgLimeSdrInputSettings->setExtClock(settings.m_extClock ? 1 : 0);
}
if (deviceSettingsKeys.contains("extClockFreq")) {
if (deviceSettingsKeys.contains("extClockFreq") || force) {
swgLimeSdrInputSettings->setExtClockFreq(settings.m_extClockFreq);
}
if (deviceSettingsKeys.contains("gain")) {
if (deviceSettingsKeys.contains("gain") || force) {
swgLimeSdrInputSettings->setGain(settings.m_gain);
}
if (deviceSettingsKeys.contains("gainMode")) {
if (deviceSettingsKeys.contains("gainMode") || force) {
swgLimeSdrInputSettings->setGainMode((int) settings.m_gainMode);
}
if (deviceSettingsKeys.contains("iqCorrection")) {
if (deviceSettingsKeys.contains("iqCorrection") || force) {
swgLimeSdrInputSettings->setIqCorrection(settings.m_iqCorrection ? 1 : 0);
}
if (deviceSettingsKeys.contains("lnaGain")) {
if (deviceSettingsKeys.contains("lnaGain") || force) {
swgLimeSdrInputSettings->setLnaGain(settings.m_lnaGain);
}
if (deviceSettingsKeys.contains("log2HardDecim")) {
if (deviceSettingsKeys.contains("log2HardDecim") || force) {
swgLimeSdrInputSettings->setLog2HardDecim(settings.m_log2HardDecim);
}
if (deviceSettingsKeys.contains("log2SoftDecim")) {
if (deviceSettingsKeys.contains("log2SoftDecim") || force) {
swgLimeSdrInputSettings->setLog2SoftDecim(settings.m_log2SoftDecim);
}
if (deviceSettingsKeys.contains("lpfBW")) {
if (deviceSettingsKeys.contains("lpfBW") || force) {
swgLimeSdrInputSettings->setLpfBw(settings.m_lpfBW);
}
if (deviceSettingsKeys.contains("lpfFIREnable")) {
if (deviceSettingsKeys.contains("lpfFIREnable") || force) {
swgLimeSdrInputSettings->setLpfFirEnable(settings.m_lpfFIREnable ? 1 : 0);
}
if (deviceSettingsKeys.contains("lpfFIRBW")) {
if (deviceSettingsKeys.contains("lpfFIRBW") || force) {
swgLimeSdrInputSettings->setLpfFirbw(settings.m_lpfFIRBW);
}
if (deviceSettingsKeys.contains("ncoEnable")) {
if (deviceSettingsKeys.contains("ncoEnable") || force) {
swgLimeSdrInputSettings->setNcoEnable(settings.m_ncoEnable ? 1 : 0);
}
if (deviceSettingsKeys.contains("ncoFrequency")) {
if (deviceSettingsKeys.contains("ncoFrequency") || force) {
swgLimeSdrInputSettings->setNcoFrequency(settings.m_ncoFrequency);
}
if (deviceSettingsKeys.contains("pgaGain")) {
if (deviceSettingsKeys.contains("pgaGain") || force) {
swgLimeSdrInputSettings->setPgaGain(settings.m_pgaGain);
}
if (deviceSettingsKeys.contains("tiaGain")) {
if (deviceSettingsKeys.contains("tiaGain") || force) {
swgLimeSdrInputSettings->setTiaGain(settings.m_tiaGain);
}
if (deviceSettingsKeys.contains("transverterDeltaFrequency")) {
if (deviceSettingsKeys.contains("transverterDeltaFrequency") || force) {
swgLimeSdrInputSettings->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
}
if (deviceSettingsKeys.contains("transverterMode")) {
if (deviceSettingsKeys.contains("transverterMode") || force) {
swgLimeSdrInputSettings->setTransverterMode(settings.m_transverterMode ? 1 : 0);
}
if (deviceSettingsKeys.contains("fileRecordName")) {
if (deviceSettingsKeys.contains("fileRecordName") || force) {
swgLimeSdrInputSettings->setFileRecordName(new QString(settings.m_fileRecordName));
}
if (deviceSettingsKeys.contains("gpioDir")) {
if (deviceSettingsKeys.contains("gpioDir") || force) {
swgLimeSdrInputSettings->setGpioDir(settings.m_gpioDir & 0xFF);
}
if (deviceSettingsKeys.contains("gpioPins")) {
if (deviceSettingsKeys.contains("gpioPins") || force) {
swgLimeSdrInputSettings->setGpioPins(settings.m_gpioPins & 0xFF);
}
@ -1784,5 +1784,6 @@ void LimeSDRInput::networkManagerFinished(QNetworkReply *reply)
}
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("LimeSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
}

View File

@ -785,49 +785,49 @@ void RTLSDRInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys,
if (deviceSettingsKeys.contains("agc") || force) {
swgRtlSdrSettings->setAgc(settings.m_agc ? 1 : 0);
}
if (deviceSettingsKeys.contains("centerFrequency")) {
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgRtlSdrSettings->setCenterFrequency(settings.m_centerFrequency);
}
if (deviceSettingsKeys.contains("dcBlock")) {
if (deviceSettingsKeys.contains("dcBlock") || force) {
swgRtlSdrSettings->setDcBlock(settings.m_dcBlock ? 1 : 0);
}
if (deviceSettingsKeys.contains("devSampleRate")) {
if (deviceSettingsKeys.contains("devSampleRate") || force) {
swgRtlSdrSettings->setDevSampleRate(settings.m_devSampleRate);
}
if (deviceSettingsKeys.contains("fcPos")) {
if (deviceSettingsKeys.contains("fcPos") || force) {
swgRtlSdrSettings->setFcPos(settings.m_fcPos);
}
if (deviceSettingsKeys.contains("gain")) {
if (deviceSettingsKeys.contains("gain") || force) {
swgRtlSdrSettings->setGain(settings.m_gain);
}
if (deviceSettingsKeys.contains("iqImbalance")) {
if (deviceSettingsKeys.contains("iqImbalance") || force) {
swgRtlSdrSettings->setIqImbalance(settings.m_iqImbalance ? 1 : 0);
}
if (deviceSettingsKeys.contains("loPpmCorrection")) {
if (deviceSettingsKeys.contains("loPpmCorrection") || force) {
swgRtlSdrSettings->setLoPpmCorrection(settings.m_loPpmCorrection);
}
if (deviceSettingsKeys.contains("log2Decim")) {
if (deviceSettingsKeys.contains("log2Decim") || force) {
swgRtlSdrSettings->setLog2Decim(settings.m_log2Decim);
}
if (deviceSettingsKeys.contains("lowSampleRate")) {
if (deviceSettingsKeys.contains("lowSampleRate") || force) {
swgRtlSdrSettings->setLowSampleRate(settings.m_lowSampleRate);
}
if (deviceSettingsKeys.contains("noModMode")) {
if (deviceSettingsKeys.contains("noModMode") || force) {
swgRtlSdrSettings->setNoModMode(settings.m_noModMode ? 1 : 0);
}
if (deviceSettingsKeys.contains("offsetTuning")) {
if (deviceSettingsKeys.contains("offsetTuning") || force) {
swgRtlSdrSettings->setOffsetTuning(settings.m_offsetTuning ? 1 : 0);
}
if (deviceSettingsKeys.contains("transverterDeltaFrequency")) {
if (deviceSettingsKeys.contains("transverterDeltaFrequency") || force) {
swgRtlSdrSettings->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
}
if (deviceSettingsKeys.contains("transverterMode")) {
if (deviceSettingsKeys.contains("transverterMode") || force) {
swgRtlSdrSettings->setTransverterMode(settings.m_transverterMode ? 1 : 0);
}
if (deviceSettingsKeys.contains("rfBandwidth")) {
if (deviceSettingsKeys.contains("rfBandwidth") || force) {
swgRtlSdrSettings->setRfBandwidth(settings.m_rfBandwidth);
}
if (deviceSettingsKeys.contains("fileRecordName")) {
if (deviceSettingsKeys.contains("fileRecordName") || force) {
swgRtlSdrSettings->setFileRecordName(new QString(settings.m_fileRecordName));
}
@ -878,5 +878,6 @@ void RTLSDRInput::networkManagerFinished(QNetworkReply *reply)
}
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("RTLSDRInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
}

View File

@ -628,52 +628,52 @@ void TestSourceInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKe
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgTestSourceSettings->setCenterFrequency(settings.m_centerFrequency);
}
if (deviceSettingsKeys.contains("frequencyShift")) {
if (deviceSettingsKeys.contains("frequencyShift") || force) {
swgTestSourceSettings->setFrequencyShift(settings.m_frequencyShift);
}
if (deviceSettingsKeys.contains("sampleRate")) {
if (deviceSettingsKeys.contains("sampleRate") || force) {
swgTestSourceSettings->setSampleRate(settings.m_sampleRate);
}
if (deviceSettingsKeys.contains("log2Decim")) {
if (deviceSettingsKeys.contains("log2Decim") || force) {
swgTestSourceSettings->setLog2Decim(settings.m_log2Decim);
}
if (deviceSettingsKeys.contains("fcPos")) {
if (deviceSettingsKeys.contains("fcPos") || force) {
swgTestSourceSettings->setFcPos((int) settings.m_fcPos);
}
if (deviceSettingsKeys.contains("sampleSizeIndex")) {
if (deviceSettingsKeys.contains("sampleSizeIndex") || force) {
swgTestSourceSettings->setSampleSizeIndex(settings.m_sampleSizeIndex);
}
if (deviceSettingsKeys.contains("amplitudeBits")) {
if (deviceSettingsKeys.contains("amplitudeBits") || force) {
swgTestSourceSettings->setAmplitudeBits(settings.m_amplitudeBits);
}
if (deviceSettingsKeys.contains("autoCorrOptions")) {
if (deviceSettingsKeys.contains("autoCorrOptions") || force) {
swgTestSourceSettings->setAutoCorrOptions((int) settings.m_sampleSizeIndex);
}
if (deviceSettingsKeys.contains("modulation")) {
if (deviceSettingsKeys.contains("modulation") || force) {
swgTestSourceSettings->setModulation((int) settings.m_modulation);
}
if (deviceSettingsKeys.contains("modulationTone")) {
swgTestSourceSettings->setModulationTone(settings.m_modulationTone);
}
if (deviceSettingsKeys.contains("amModulation")) {
if (deviceSettingsKeys.contains("amModulation") || force) {
swgTestSourceSettings->setAmModulation(settings.m_amModulation);
};
if (deviceSettingsKeys.contains("fmDeviation")) {
if (deviceSettingsKeys.contains("fmDeviation") || force) {
swgTestSourceSettings->setFmDeviation(settings.m_fmDeviation);
};
if (deviceSettingsKeys.contains("dcFactor")) {
if (deviceSettingsKeys.contains("dcFactor") || force) {
swgTestSourceSettings->setDcFactor(settings.m_dcFactor);
};
if (deviceSettingsKeys.contains("iFactor")) {
if (deviceSettingsKeys.contains("iFactor") || force) {
swgTestSourceSettings->setIFactor(settings.m_iFactor);
};
if (deviceSettingsKeys.contains("qFactor")) {
if (deviceSettingsKeys.contains("qFactor") || force) {
swgTestSourceSettings->setQFactor(settings.m_qFactor);
};
if (deviceSettingsKeys.contains("phaseImbalance")) {
if (deviceSettingsKeys.contains("phaseImbalance") || force) {
swgTestSourceSettings->setPhaseImbalance(settings.m_phaseImbalance);
};
if (deviceSettingsKeys.contains("fileRecordName")) {
if (deviceSettingsKeys.contains("fileRecordName") || force) {
swgTestSourceSettings->setFileRecordName(new QString(settings.m_fileRecordName));
}
@ -726,5 +726,6 @@ void TestSourceInput::networkManagerFinished(QNetworkReply *reply)
}
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("TestSourceInput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
}