VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 11:12:27 -04:00
Code Issues Projects Releases Wiki Activity

FCD Pro: force settings at startup and on deserialize

Browse Source
This commit is contained in:
f4exb 2017-10-14 09:35:39 +02:00
parent 4e6654e4b4
commit a4ea78f037
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fcdlib/fcdtraits.cpp
View File

@ -22,8 +22,8 @@ const char *fcd_traits<ProPlus>::displayedName = "FunCube Dongle Pro+";
const char *fcd_traits<Pro>::pluginDisplayedName = "FunCube Pro Input"; const char *fcd_traits<Pro>::pluginDisplayedName = "FunCube Pro Input";
const char *fcd_traits<ProPlus>::pluginDisplayedName = "FunCube Pro+ Input"; const char *fcd_traits<ProPlus>::pluginDisplayedName = "FunCube Pro+ Input";
const char *fcd_traits<Pro>::pluginVersion = "3.7.3"; const char *fcd_traits<Pro>::pluginVersion = "3.7.4";
const char *fcd_traits<ProPlus>::pluginVersion = "3.7.3"; const char *fcd_traits<ProPlus>::pluginVersion = "3.7.4";
const int64_t fcd_traits<Pro>::loLowLimitFreq = 64000000L; const int64_t fcd_traits<Pro>::loLowLimitFreq = 64000000L;
const int64_t fcd_traits<ProPlus>::loLowLimitFreq = 150000L; const int64_t fcd_traits<ProPlus>::loLowLimitFreq = 150000L;

5
plugins/samplesource/fcdpro/fcdprogui.cpp
View File

@ -31,6 +31,7 @@ FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::FCDProGui), ui(new Ui::FCDProGui),
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_forceSettings(true),
m_settings(), m_settings(),
m_sampleSource(NULL), m_sampleSource(NULL),
m_lastEngineState((DSPDeviceSourceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
@ -195,6 +196,7 @@ bool FCDProGui::deserialize(const QByteArray& data)
if(m_settings.deserialize(data)) if(m_settings.deserialize(data))
{ {
displaySettings(); displaySettings();
m_forceSettings = true;
sendSettings(); sendSettings();
return true; return true;
} }
@ -500,8 +502,9 @@ void FCDProGui::updateStatus()
void FCDProGui::updateHardware() void FCDProGui::updateHardware()
{ {
FCDProInput::MsgConfigureFCD* message = FCDProInput::MsgConfigureFCD::create(m_settings); FCDProInput::MsgConfigureFCD* message = FCDProInput::MsgConfigureFCD::create(m_settings, m_forceSettings);
m_sampleSource->getInputMessageQueue()->push(message); m_sampleSource->getInputMessageQueue()->push(message);
m_forceSettings = false;
m_updateTimer.stop(); m_updateTimer.stop();
} }

1
plugins/samplesource/fcdpro/fcdprogui.h
View File

@ -55,6 +55,7 @@ private:
Ui::FCDProGui* ui; Ui::FCDProGui* ui;
DeviceSourceAPI* m_deviceAPI; DeviceSourceAPI* m_deviceAPI;
bool m_forceSettings;
FCDProSettings m_settings; FCDProSettings m_settings;
QTimer m_updateTimer; QTimer m_updateTimer;
QTimer m_statusTimer; QTimer m_statusTimer;

2
plugins/samplesource/fcdpro/fcdproinput.cpp
View File

@ -175,7 +175,7 @@ bool FCDProInput::handleMessage(const Message& message)
{ {
qDebug() << "FCDProInput::handleMessage: MsgConfigureFCD"; qDebug() << "FCDProInput::handleMessage: MsgConfigureFCD";
MsgConfigureFCD& conf = (MsgConfigureFCD&) message; MsgConfigureFCD& conf = (MsgConfigureFCD&) message;
applySettings(conf.getSettings(), false); applySettings(conf.getSettings(), conf.getForce());
return true; return true;
} }
else if (MsgFileRecord::match(message)) else if (MsgFileRecord::match(message))

11
plugins/samplesource/fcdpro/fcdproinput.h
View File

@ -41,18 +41,21 @@ public:
public: public:
const FCDProSettings& getSettings() const { return m_settings; } const FCDProSettings& getSettings() const { return m_settings; }
bool getForce() const { return m_force; }
static MsgConfigureFCD* create(const FCDProSettings& settings) static MsgConfigureFCD* create(const FCDProSettings& settings, bool force)
{ {
return new MsgConfigureFCD(settings); return new MsgConfigureFCD(settings, force);
} }
private: private:
FCDProSettings m_settings; FCDProSettings m_settings;
bool m_force;
MsgConfigureFCD(const FCDProSettings& settings) : MsgConfigureFCD(const FCDProSettings& settings, bool force) :
Message(), Message(),
m_settings(settings) m_settings(settings),
m_force(force)
{ } { }
}; };