VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

FCDProPlus: Make settings assignments atomic. Part of #1329

Browse Source
This commit is contained in:
f4exb 2022-10-23 11:40:32 +02:00
parent 5a162e6474
commit 8dfda5e534
6 changed files with 224 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
View File

@ -94,6 +94,7 @@ void FCDProPlusGui::resetToDefaults()
{ {
m_settings.resetToDefaults(); m_settings.resetToDefaults();
displaySettings(); displaySettings();
m_forceSettings = true;
sendSettings(); sendSettings();
} }
@ -129,7 +130,13 @@ bool FCDProPlusGui::handleMessage(const Message& message)
if (FCDProPlusInput::MsgConfigureFCDProPlus::match(message)) if (FCDProPlusInput::MsgConfigureFCDProPlus::match(message))
{ {
const FCDProPlusInput::MsgConfigureFCDProPlus& cfg = (FCDProPlusInput::MsgConfigureFCDProPlus&) message; const FCDProPlusInput::MsgConfigureFCDProPlus& cfg = (FCDProPlusInput::MsgConfigureFCDProPlus&) message;
m_settings = cfg.getSettings();
if (cfg.getForce()) {
m_settings = cfg.getSettings();
} else {
m_settings.applySettings(cfg.getSettingsKeys(), cfg.getSettings());
}
blockApplySettings(true); blockApplySettings(true);
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
@ -236,6 +243,7 @@ void FCDProPlusGui::sendSettings()
void FCDProPlusGui::on_centerFrequency_changed(quint64 value) void FCDProPlusGui::on_centerFrequency_changed(quint64 value)
{ {
m_settings.m_centerFrequency = value * 1000; m_settings.m_centerFrequency = value * 1000;
m_settingsKeys.append("centerFrequency");
sendSettings(); sendSettings();
} }
@ -246,6 +254,7 @@ void FCDProPlusGui::on_decim_currentIndexChanged(int index)
} }
m_settings.m_log2Decim = index; m_settings.m_log2Decim = index;
m_settingsKeys.append("log2Decim");
sendSettings(); sendSettings();
} }
@ -253,12 +262,15 @@ void FCDProPlusGui::on_fcPos_currentIndexChanged(int index)
{ {
if (index == 0) { if (index == 0) {
m_settings.m_fcPos = FCDProPlusSettings::FC_POS_INFRA; m_settings.m_fcPos = FCDProPlusSettings::FC_POS_INFRA;
m_settingsKeys.append("fcPos");
sendSettings(); sendSettings();
} else if (index == 1) { } else if (index == 1) {
m_settings.m_fcPos = FCDProPlusSettings::FC_POS_SUPRA; m_settings.m_fcPos = FCDProPlusSettings::FC_POS_SUPRA;
m_settingsKeys.append("fcPos");
sendSettings(); sendSettings();
} else if (index == 2) { } else if (index == 2) {
m_settings.m_fcPos = FCDProPlusSettings::FC_POS_CENTER; m_settings.m_fcPos = FCDProPlusSettings::FC_POS_CENTER;
m_settingsKeys.append("fcPos");
sendSettings(); sendSettings();
} }
} }
@ -266,20 +278,23 @@ void FCDProPlusGui::on_fcPos_currentIndexChanged(int index)
void FCDProPlusGui::on_dcOffset_toggled(bool checked) void FCDProPlusGui::on_dcOffset_toggled(bool checked)
{ {
m_settings.m_dcBlock = checked; m_settings.m_dcBlock = checked;
m_settingsKeys.append("dcBlock");
sendSettings(); sendSettings();
} }
void FCDProPlusGui::on_iqImbalance_toggled(bool checked) void FCDProPlusGui::on_iqImbalance_toggled(bool checked)
{ {
m_settings.m_iqImbalance = checked; m_settings.m_iqImbalance = checked;
m_settingsKeys.append("iqImbalance");
sendSettings(); sendSettings();
} }
void FCDProPlusGui::updateHardware() void FCDProPlusGui::updateHardware()
{ {
FCDProPlusInput::MsgConfigureFCDProPlus* message = FCDProPlusInput::MsgConfigureFCDProPlus::create(m_settings, m_forceSettings); FCDProPlusInput::MsgConfigureFCDProPlus* message = FCDProPlusInput::MsgConfigureFCDProPlus::create(m_settings, m_settingsKeys, m_forceSettings);
m_sampleSource->getInputMessageQueue()->push(message); m_sampleSource->getInputMessageQueue()->push(message);
m_forceSettings = false; m_forceSettings = false;
m_settingsKeys.clear();
m_updateTimer.stop(); m_updateTimer.stop();
} }
@ -315,30 +330,35 @@ void FCDProPlusGui::updateStatus()
void FCDProPlusGui::on_checkBoxG_stateChanged(int state) void FCDProPlusGui::on_checkBoxG_stateChanged(int state)
{ {
m_settings.m_lnaGain = (state == Qt::Checked); m_settings.m_lnaGain = (state == Qt::Checked);
m_settingsKeys.append("lnaGain");
sendSettings(); sendSettings();
} }
void FCDProPlusGui::on_checkBoxB_stateChanged(int state) void FCDProPlusGui::on_checkBoxB_stateChanged(int state)
{ {
m_settings.m_biasT = (state == Qt::Checked); m_settings.m_biasT = (state == Qt::Checked);
m_settingsKeys.append("biasT");
sendSettings(); sendSettings();
} }
void FCDProPlusGui::on_mixGain_stateChanged(int state) void FCDProPlusGui::on_mixGain_stateChanged(int state)
{ {
m_settings.m_mixGain = (state == Qt::Checked); m_settings.m_mixGain = (state == Qt::Checked);
m_settingsKeys.append("mixGain");
sendSettings(); sendSettings();
} }
void FCDProPlusGui::on_filterIF_currentIndexChanged(int index) void FCDProPlusGui::on_filterIF_currentIndexChanged(int index)
{ {
m_settings.m_ifFilterIndex = index; m_settings.m_ifFilterIndex = index;
m_settingsKeys.append("ifFilterIndex");
sendSettings(); sendSettings();
} }
void FCDProPlusGui::on_filterRF_currentIndexChanged(int index) void FCDProPlusGui::on_filterRF_currentIndexChanged(int index)
{ {
m_settings.m_rfFilterIndex = index; m_settings.m_rfFilterIndex = index;
m_settingsKeys.append("rfFilterIndex");
sendSettings(); sendSettings();
} }
@ -346,6 +366,7 @@ void FCDProPlusGui::on_ifGain_valueChanged(int value)
{ {
m_settings.m_ifGain = value; m_settings.m_ifGain = value;
displaySettings(); displaySettings();
m_settingsKeys.append("ifGain");
sendSettings(); sendSettings();
} }
@ -353,6 +374,7 @@ void FCDProPlusGui::on_ppm_valueChanged(int value)
{ {
m_settings.m_LOppmTenths = value; m_settings.m_LOppmTenths = value;
displaySettings(); displaySettings();
m_settingsKeys.append("LOppmTenths");
sendSettings(); sendSettings();
} }
@ -370,6 +392,10 @@ void FCDProPlusGui::on_transverter_clicked()
qDebug("FCDProPlusGui::on_transverter_clicked: %lld Hz %s", m_settings.m_transverterDeltaFrequency, m_settings.m_transverterMode ? "on" : "off"); qDebug("FCDProPlusGui::on_transverter_clicked: %lld Hz %s", m_settings.m_transverterDeltaFrequency, m_settings.m_transverterMode ? "on" : "off");
updateFrequencyLimits(); updateFrequencyLimits();
m_settings.m_centerFrequency = ui->centerFrequency->getValueNew()*1000; m_settings.m_centerFrequency = ui->centerFrequency->getValueNew()*1000;
m_settingsKeys.append("transverterMode");
m_settingsKeys.append("transverterDeltaFrequency");
m_settingsKeys.append("iqOrder");
m_settingsKeys.append("centerFrequency");
sendSettings(); sendSettings();
} }
@ -390,6 +416,10 @@ void FCDProPlusGui::openDeviceSettingsDialog(const QPoint& p)
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIDeviceIndex");
sendSettings(); sendSettings();
} }

1
plugins/samplesource/fcdproplus/fcdproplusgui.h
View File

@ -51,6 +51,7 @@ private:
bool m_doApplySettings; bool m_doApplySettings;
bool m_forceSettings; bool m_forceSettings;
FCDProPlusSettings m_settings; FCDProPlusSettings m_settings;
QList<QString> m_settingsKeys;
QTimer m_updateTimer; QTimer m_updateTimer;
QTimer m_statusTimer; QTimer m_statusTimer;
std::vector<int> m_gains; std::vector<int> m_gains;

129
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
View File

@ -111,7 +111,7 @@ bool FCDProPlusInput::openDevice()
void FCDProPlusInput::init() void FCDProPlusInput::init()
{ {
applySettings(m_settings, true); applySettings(m_settings, QList<QString>(), true);
} }
bool FCDProPlusInput::start() bool FCDProPlusInput::start()
@ -148,7 +148,7 @@ bool FCDProPlusInput::start()
m_FCDThread->startWork(); m_FCDThread->startWork();
// mutexLocker.unlock(); // mutexLocker.unlock();
applySettings(m_settings, true); applySettings(m_settings, QList<QString>(), true);
qDebug("FCDProPlusInput::started"); qDebug("FCDProPlusInput::started");
m_running = true; m_running = true;
@ -227,12 +227,12 @@ bool FCDProPlusInput::deserialize(const QByteArray& data)
success = false; success = false;
} }
MsgConfigureFCDProPlus* message = MsgConfigureFCDProPlus::create(m_settings, true); MsgConfigureFCDProPlus* message = MsgConfigureFCDProPlus::create(m_settings, QList<QString>(), true);
m_inputMessageQueue.push(message); m_inputMessageQueue.push(message);
if (m_guiMessageQueue) if (m_guiMessageQueue)
{ {
MsgConfigureFCDProPlus* messageToGUI = MsgConfigureFCDProPlus::create(m_settings, true); MsgConfigureFCDProPlus* messageToGUI = MsgConfigureFCDProPlus::create(m_settings, QList<QString>(), true);
m_guiMessageQueue->push(messageToGUI); m_guiMessageQueue->push(messageToGUI);
} }
@ -259,12 +259,12 @@ void FCDProPlusInput::setCenterFrequency(qint64 centerFrequency)
FCDProPlusSettings settings = m_settings; FCDProPlusSettings settings = m_settings;
settings.m_centerFrequency = centerFrequency; settings.m_centerFrequency = centerFrequency;
MsgConfigureFCDProPlus* message = MsgConfigureFCDProPlus::create(settings, false); MsgConfigureFCDProPlus* message = MsgConfigureFCDProPlus::create(settings, QList<QString>{"centerFrequency"}, false);
m_inputMessageQueue.push(message); m_inputMessageQueue.push(message);
if (m_guiMessageQueue) if (m_guiMessageQueue)
{ {
MsgConfigureFCDProPlus* messageToGUI = MsgConfigureFCDProPlus::create(settings, false); MsgConfigureFCDProPlus* messageToGUI = MsgConfigureFCDProPlus::create(settings, QList<QString>{"centerFrequency"}, false);
m_guiMessageQueue->push(messageToGUI); m_guiMessageQueue->push(messageToGUI);
} }
} }
@ -275,7 +275,7 @@ bool FCDProPlusInput::handleMessage(const Message& message)
{ {
qDebug() << "FCDProPlusInput::handleMessage: MsgConfigureFCD"; qDebug() << "FCDProPlusInput::handleMessage: MsgConfigureFCD";
MsgConfigureFCDProPlus& conf = (MsgConfigureFCDProPlus&) message; MsgConfigureFCDProPlus& conf = (MsgConfigureFCDProPlus&) message;
applySettings(conf.getSettings(), conf.getForce()); applySettings(conf.getSettings(), conf.getSettingsKeys(), conf.getForce());
return true; return true;
} }
else if (MsgStartStop::match(message)) else if (MsgStartStop::match(message))
@ -285,8 +285,7 @@ bool FCDProPlusInput::handleMessage(const Message& message)
if (cmd.getStartStop()) if (cmd.getStartStop())
{ {
if (m_deviceAPI->initDeviceEngine()) if (m_deviceAPI->initDeviceEngine()) {
{
m_deviceAPI->startDeviceEngine(); m_deviceAPI->startDeviceEngine();
} }
} }
@ -307,30 +306,17 @@ bool FCDProPlusInput::handleMessage(const Message& message)
} }
} }
void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool force) void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, const QList<QString>& settingsKeys, bool force)
{ {
qDebug() << "FCDProPlusInput::applySettings: force: " << force << settings.getDebugString(settingsKeys, force);
bool forwardChange = false; bool forwardChange = false;
QList<QString> reverseAPIKeys;
if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency)) { if (force || settingsKeys.contains("centerFrequency")
reverseAPIKeys.append("centerFrequency"); || settingsKeys.contains("LOppmTenths")
} || settingsKeys.contains("fcPos")
if (force || (m_settings.m_transverterMode != settings.m_transverterMode)) { || settingsKeys.contains("log2Decim")
reverseAPIKeys.append("transverterMode"); || settingsKeys.contains("transverterMode")
} || settingsKeys.contains("transverterDeltaFrequency"))
if (force || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) {
reverseAPIKeys.append("transverterDeltaFrequency");
}
if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) {
reverseAPIKeys.append("LOppmTenths");
}
if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency)
|| (m_settings.m_LOppmTenths != settings.m_LOppmTenths)
|| (m_settings.m_fcPos != settings.m_fcPos)
|| (m_settings.m_log2Decim != settings.m_log2Decim)
|| (m_settings.m_transverterMode != settings.m_transverterMode)
|| (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency))
{ {
qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency( qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency(
settings.m_centerFrequency, settings.m_centerFrequency,
@ -353,9 +339,8 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for
m_settings.m_centerFrequency = settings.m_centerFrequency; m_settings.m_centerFrequency = settings.m_centerFrequency;
} }
if ((m_settings.m_log2Decim != settings.m_log2Decim) || force) if (settingsKeys.contains("log2Decim") || force)
{ {
reverseAPIKeys.append("log2Decim");
forwardChange = true; forwardChange = true;
if (m_FCDThread) if (m_FCDThread)
@ -365,10 +350,8 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for
} }
} }
if ((m_settings.m_fcPos != settings.m_fcPos) || force) if (settingsKeys.contains("fcPos") || force)
{ {
reverseAPIKeys.append("fcPos");
if (m_FCDThread) { if (m_FCDThread) {
m_FCDThread->setFcPos((int) settings.m_fcPos); m_FCDThread->setFcPos((int) settings.m_fcPos);
} }
@ -376,10 +359,8 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for
qDebug() << "FCDProPlusInput::applySettings: set fc pos (enum) to " << (int) settings.m_fcPos; qDebug() << "FCDProPlusInput::applySettings: set fc pos (enum) to " << (int) settings.m_fcPos;
} }
if ((m_settings.m_iqOrder != settings.m_iqOrder) || force) if (settingsKeys.contains("iqOrder") || force)
{ {
reverseAPIKeys.append("iqOrder");
if (m_FCDThread) { if (m_FCDThread) {
m_FCDThread->setIQOrder((int) settings.m_iqOrder); m_FCDThread->setIQOrder((int) settings.m_iqOrder);
} }
@ -387,82 +368,72 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for
qDebug() << "FCDProPlusInput::applySettings: set IQ order to %s" << (settings.m_iqOrder ? "IQ" : "QI"); qDebug() << "FCDProPlusInput::applySettings: set IQ order to %s" << (settings.m_iqOrder ? "IQ" : "QI");
} }
if ((m_settings.m_lnaGain != settings.m_lnaGain) || force) if (settingsKeys.contains("lnaGain") || force)
{ {
reverseAPIKeys.append("lnaGain");
if (m_dev != 0) { if (m_dev != 0) {
set_lna_gain(settings.m_lnaGain); set_lna_gain(settings.m_lnaGain);
} }
} }
if ((m_settings.m_biasT != settings.m_biasT) || force) if (settingsKeys.contains("biasT") || force)
{ {
reverseAPIKeys.append("biasT");
if (m_dev != 0) { if (m_dev != 0) {
set_bias_t(settings.m_biasT); set_bias_t(settings.m_biasT);
} }
} }
if ((m_settings.m_mixGain != settings.m_mixGain) || force) if (settingsKeys.contains("mixGain") || force)
{ {
reverseAPIKeys.append("mixGain");
if (m_dev != 0) { if (m_dev != 0) {
set_mixer_gain(settings.m_mixGain); set_mixer_gain(settings.m_mixGain);
} }
} }
if ((m_settings.m_ifGain != settings.m_ifGain) || force) if (settingsKeys.contains("ifGain") || force)
{ {
reverseAPIKeys.append("ifGain");
if (m_dev != 0) { if (m_dev != 0) {
set_if_gain(settings.m_ifGain); set_if_gain(settings.m_ifGain);
} }
} }
if ((m_settings.m_ifFilterIndex != settings.m_ifFilterIndex) || force) if (settingsKeys.contains("ifFilterIndex") || force)
{ {
reverseAPIKeys.append("ifFilterIndex");
if (m_dev != 0) { if (m_dev != 0) {
set_if_filter(settings.m_ifFilterIndex); set_if_filter(settings.m_ifFilterIndex);
} }
} }
if ((m_settings.m_rfFilterIndex != settings.m_rfFilterIndex) || force) if (settingsKeys.contains("rfFilterIndex") || force)
{ {
reverseAPIKeys.append("rfFilterIndex");
if (m_dev != 0) { if (m_dev != 0) {
set_rf_filter(settings.m_rfFilterIndex); set_rf_filter(settings.m_rfFilterIndex);
} }
} }
if ((m_settings.m_dcBlock != settings.m_dcBlock) || force) if (settingsKeys.contains("dcBlock") || force)
{ {
reverseAPIKeys.append("dcBlock");
m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqImbalance); m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqImbalance);
} }
if ((m_settings.m_iqImbalance != settings.m_iqImbalance) || force) if (settingsKeys.contains("iqImbalance") || force)
{ {
reverseAPIKeys.append("iqImbalance");
m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqImbalance); m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqImbalance);
} }
if (settings.m_useReverseAPI) if (settingsKeys.contains("useReverseAPI"))
{ {
bool fullUpdate = ((m_settings.m_useReverseAPI != settings.m_useReverseAPI) && settings.m_useReverseAPI) || bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
(m_settings.m_reverseAPIAddress != settings.m_reverseAPIAddress) || settingsKeys.contains("reverseAPIAddress") ||
(m_settings.m_reverseAPIPort != settings.m_reverseAPIPort) || settingsKeys.contains("reverseAPIPort") ||
(m_settings.m_reverseAPIDeviceIndex != settings.m_reverseAPIDeviceIndex); settingsKeys.contains("reverseAPIDeviceIndex");
webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force); webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
} }
m_settings = settings; if (force) {
m_settings = settings;
} else {
m_settings.applySettings(settingsKeys, settings);
}
if (forwardChange) if (forwardChange)
{ {
@ -504,30 +475,26 @@ void FCDProPlusInput::set_mixer_gain(bool on)
void FCDProPlusInput::set_if_gain(int gain) void FCDProPlusInput::set_if_gain(int gain)
{ {
if (gain < 0) if (gain < 0) {
{
return; return;
} }
quint8 cmd_value = gain; quint8 cmd_value = gain;
if (fcdAppSetParam(m_dev, FCDPROPLUS_HID_CMD_SET_IF_GAIN, &cmd_value, 1) != FCD_MODE_APP) if (fcdAppSetParam(m_dev, FCDPROPLUS_HID_CMD_SET_IF_GAIN, &cmd_value, 1) != FCD_MODE_APP) {
{
qWarning() << "FCDProPlusInput::set_if_gain: failed to set at " << cmd_value; qWarning() << "FCDProPlusInput::set_if_gain: failed to set at " << cmd_value;
} }
} }
void FCDProPlusInput::set_if_filter(int filterIndex) void FCDProPlusInput::set_if_filter(int filterIndex)
{ {
if ((filterIndex < 0) || (filterIndex >= FCDProPlusConstants::fcdproplus_if_filter_nb_values())) if ((filterIndex < 0) || (filterIndex >= FCDProPlusConstants::fcdproplus_if_filter_nb_values())) {
{
return; return;
} }
quint8 cmd_value = FCDProPlusConstants::if_filters[filterIndex].value; quint8 cmd_value = FCDProPlusConstants::if_filters[filterIndex].value;
if (fcdAppSetParam(m_dev, FCDPROPLUS_HID_CMD_SET_IF_FILTER, &cmd_value, 1) != FCD_MODE_APP) if (fcdAppSetParam(m_dev, FCDPROPLUS_HID_CMD_SET_IF_FILTER, &cmd_value, 1) != FCD_MODE_APP) {
{
qWarning() << "FCDProPlusInput::set_if_filter: failed to set at " << cmd_value; qWarning() << "FCDProPlusInput::set_if_filter: failed to set at " << cmd_value;
} }
} }
@ -535,15 +502,13 @@ void FCDProPlusInput::set_if_filter(int filterIndex)
void FCDProPlusInput::set_rf_filter(int filterIndex) void FCDProPlusInput::set_rf_filter(int filterIndex)
{ {
if ((filterIndex < 0) || (filterIndex >= FCDProPlusConstants::fcdproplus_rf_filter_nb_values())) if ((filterIndex < 0) || (filterIndex >= FCDProPlusConstants::fcdproplus_rf_filter_nb_values())) {
{
return; return;
} }
quint8 cmd_value = FCDProPlusConstants::rf_filters[filterIndex].value; quint8 cmd_value = FCDProPlusConstants::rf_filters[filterIndex].value;
if (fcdAppSetParam(m_dev, FCDPROPLUS_HID_CMD_SET_RF_FILTER, &cmd_value, 1) != FCD_MODE_APP) if (fcdAppSetParam(m_dev, FCDPROPLUS_HID_CMD_SET_RF_FILTER, &cmd_value, 1) != FCD_MODE_APP) {
{
qWarning() << "FCDProPlusInput::set_rf_filter: failed to set at " << cmd_value; qWarning() << "FCDProPlusInput::set_rf_filter: failed to set at " << cmd_value;
} }
} }
@ -597,12 +562,12 @@ int FCDProPlusInput::webapiSettingsPutPatch(
FCDProPlusSettings settings = m_settings; FCDProPlusSettings settings = m_settings;
webapiUpdateDeviceSettings(settings, deviceSettingsKeys, response); webapiUpdateDeviceSettings(settings, deviceSettingsKeys, response);
MsgConfigureFCDProPlus *msg = MsgConfigureFCDProPlus::create(settings, force); MsgConfigureFCDProPlus *msg = MsgConfigureFCDProPlus::create(settings, deviceSettingsKeys, force);
m_inputMessageQueue.push(msg); m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any if (m_guiMessageQueue) // forward to GUI if any
{ {
MsgConfigureFCDProPlus *msgToGUI = MsgConfigureFCDProPlus::create(settings, force); MsgConfigureFCDProPlus *msgToGUI = MsgConfigureFCDProPlus::create(settings, deviceSettingsKeys, force);
m_guiMessageQueue->push(msgToGUI); m_guiMessageQueue->push(msgToGUI);
} }
@ -708,7 +673,7 @@ void FCDProPlusInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings&
response.getFcdProPlusSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getFcdProPlusSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
} }
void FCDProPlusInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const FCDProPlusSettings& settings, bool force) void FCDProPlusInput::webapiReverseSendSettings(const QList<QString>& deviceSettingsKeys, const FCDProPlusSettings& settings, bool force)
{ {
SWGSDRangel::SWGDeviceSettings *swgDeviceSettings = new SWGSDRangel::SWGDeviceSettings(); SWGSDRangel::SWGDeviceSettings *swgDeviceSettings = new SWGSDRangel::SWGDeviceSettings();
swgDeviceSettings->setDirection(0); // single Rx swgDeviceSettings->setDirection(0); // single Rx

13
plugins/samplesource/fcdproplus/fcdproplusinput.h
View File

@ -49,20 +49,23 @@ public:
public: public:
const FCDProPlusSettings& getSettings() const { return m_settings; } const FCDProPlusSettings& getSettings() const { return m_settings; }
const QList<QString>& getSettingsKeys() const { return m_settingsKeys; }
bool getForce() const { return m_force; } bool getForce() const { return m_force; }
static MsgConfigureFCDProPlus* create(const FCDProPlusSettings& settings, bool force) static MsgConfigureFCDProPlus* create(const FCDProPlusSettings& settings, const QList<QString>& settingsKeys, bool force)
{ {
return new MsgConfigureFCDProPlus(settings, force); return new MsgConfigureFCDProPlus(settings, settingsKeys, force);
} }
private: private:
FCDProPlusSettings m_settings; FCDProPlusSettings m_settings;
QList<QString> m_settingsKeys;
bool m_force; bool m_force;
MsgConfigureFCDProPlus(const FCDProPlusSettings& settings, bool force) : MsgConfigureFCDProPlus(const FCDProPlusSettings& settings, const QList<QString>& settingsKeys, bool force) :
Message(), Message(),
m_settings(settings), m_settings(settings),
m_settingsKeys(settingsKeys),
m_force(force) m_force(force)
{ } { }
}; };
@ -159,8 +162,8 @@ private:
void closeDevice(); void closeDevice();
bool openFCDAudio(const char *filename); bool openFCDAudio(const char *filename);
void closeFCDAudio(); void closeFCDAudio();
void applySettings(const FCDProPlusSettings& settings, bool force); void applySettings(const FCDProPlusSettings& settings, const QList<QString>& settingsKeys, bool force);
void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const FCDProPlusSettings& settings, bool force); void webapiReverseSendSettings(const QList<QString>& deviceSettingsKeys, const FCDProPlusSettings& settings, bool force);
void webapiReverseSendStartStop(bool start); void webapiReverseSendStartStop(bool start);
private slots: private slots:

134
plugins/samplesource/fcdproplus/fcdproplussettings.cpp
View File

@ -126,3 +126,137 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data)
} }
} }
void FCDProPlusSettings::applySettings(const QStringList& settingsKeys, const FCDProPlusSettings& settings)
{
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
if (settingsKeys.contains("rangeLow")) {
m_rangeLow = settings.m_rangeLow;
}
if (settingsKeys.contains("lnaGain")) {
m_lnaGain = settings.m_lnaGain;
}
if (settingsKeys.contains("biasT")) {
m_biasT = settings.m_biasT;
}
if (settingsKeys.contains("ifGain")) {
m_ifGain = settings.m_ifGain;
}
if (settingsKeys.contains("mixGain")) {
m_mixGain = settings.m_mixGain;
}
if (settingsKeys.contains("rfFilterIndex")) {
m_rfFilterIndex = settings.m_rfFilterIndex;
}
if (settingsKeys.contains("ifFilterIndex")) {
m_ifFilterIndex = settings.m_ifFilterIndex;
}
if (settingsKeys.contains("LOppmTenths")) {
m_LOppmTenths = settings.m_LOppmTenths;
}
if (settingsKeys.contains("log2Decim")) {
m_log2Decim = settings.m_log2Decim;
}
if (settingsKeys.contains("fcPos")) {
m_fcPos = settings.m_fcPos;
}
if (settingsKeys.contains("dcBlock")) {
m_dcBlock = settings.m_dcBlock;
}
if (settingsKeys.contains("iqImbalance")) {
m_iqImbalance = settings.m_iqImbalance;
}
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
if (settingsKeys.contains("transverterMode")) {
m_transverterMode = settings.m_transverterMode;
}
if (settingsKeys.contains("transverterDeltaFrequency")) {
m_transverterDeltaFrequency = settings.m_transverterDeltaFrequency;
}
if (settingsKeys.contains("iqOrder")) {
m_iqOrder = settings.m_iqOrder;
}
if (settingsKeys.contains("useReverseAPI")) {
m_useReverseAPI = settings.m_useReverseAPI;
}
if (settingsKeys.contains("reverseAPIAddress")) {
m_reverseAPIAddress = settings.m_reverseAPIAddress;
}
if (settingsKeys.contains("reverseAPIPort")) {
m_reverseAPIPort = settings.m_reverseAPIPort;
}
if (settingsKeys.contains("reverseAPIDeviceIndex")) {
m_reverseAPIDeviceIndex = settings.m_reverseAPIDeviceIndex;
}
}
QString FCDProPlusSettings::getDebugString(const QStringList& settingsKeys, bool force) const
{
std::ostringstream ostr;
if (settingsKeys.contains("centerFrequency") || force) {
ostr << " m_centerFrequency: " << m_centerFrequency;
}
if (settingsKeys.contains("rangeLow") || force) {
ostr << " m_rangeLow: " << m_rangeLow;
}
if (settingsKeys.contains("lnaGain") || force) {
ostr << " m_lnaGain: " << m_lnaGain;
}
if (settingsKeys.contains("biasT") || force) {
ostr << " m_biasT: " << m_biasT;
}
if (settingsKeys.contains("ifGain") || force) {
ostr << " m_ifGain: " << m_ifGain;
}
if (settingsKeys.contains("mixGain") || force) {
ostr << " m_mixGain: " << m_mixGain;
}
if (settingsKeys.contains("rfFilterIndex") || force) {
ostr << " m_rfFilterIndex: " << m_rfFilterIndex;
}
if (settingsKeys.contains("ifFilterIndex") || force) {
ostr << " m_ifFilterIndex: " << m_ifFilterIndex;
}
if (settingsKeys.contains("LOppmTenths") || force) {
ostr << " m_LOppmTenths: " << m_LOppmTenths;
}
if (settingsKeys.contains("log2Decim") || force) {
ostr << " m_log2Decim: " << m_log2Decim;
}
if (settingsKeys.contains("fcPos") || force) {
ostr << " m_fcPos: " << m_fcPos;
}
if (settingsKeys.contains("dcBlock") || force) {
ostr << " m_dcBlock: " << m_dcBlock;
}
if (settingsKeys.contains("iqImbalance") || force) {
ostr << " m_iqImbalance: " << m_iqImbalance;
}
if (settingsKeys.contains("transverterMode") || force) {
ostr << " m_transverterMode: " << m_transverterMode;
}
if (settingsKeys.contains("transverterDeltaFrequency") || force) {
ostr << " m_transverterDeltaFrequency: " << m_transverterDeltaFrequency;
}
if (settingsKeys.contains("iqOrder") || force) {
ostr << " m_iqOrder: " << m_iqOrder;
}
if (settingsKeys.contains("useReverseAPI") || force) {
ostr << " m_useReverseAPI: " << m_useReverseAPI;
}
if (settingsKeys.contains("reverseAPIAddress") || force) {
ostr << " m_reverseAPIAddress: " << m_reverseAPIAddress.toStdString();
}
if (settingsKeys.contains("reverseAPIPort") || force) {
ostr << " m_reverseAPIPort: " << m_reverseAPIPort;
}
if (settingsKeys.contains("reverseAPIDeviceIndex") || force) {
ostr << " m_reverseAPIDeviceIndex: " << m_reverseAPIDeviceIndex;
}
return QString(ostr.str().c_str());
}

2
plugins/samplesource/fcdproplus/fcdproplussettings.h
View File

@ -52,6 +52,8 @@ struct FCDProPlusSettings {
void resetToDefaults(); void resetToDefaults();
QByteArray serialize() const; QByteArray serialize() const;
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);
void applySettings(const QStringList& settingsKeys, const FCDProPlusSettings& settings);
QString getDebugString(const QStringList& settingsKeys, bool force=false) const;
}; };
#endif /* _FCDPROPLUS_FCDPROPLUSSETTINGS_H_ */ #endif /* _FCDPROPLUS_FCDPROPLUSSETTINGS_H_ */