kopia lustrzana https://github.com/f4exb/sdrangel
LimeSDR output: force settings at startup and on deserialize
rodzic
402f733384
commit
ccd2e04f0b
|
@ -41,7 +41,6 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) :
|
||||||
m_limeSDROutputThread(0),
|
m_limeSDROutputThread(0),
|
||||||
m_deviceDescription("LimeSDROutput"),
|
m_deviceDescription("LimeSDROutput"),
|
||||||
m_running(false),
|
m_running(false),
|
||||||
m_firstConfig(true),
|
|
||||||
m_channelAcquired(false)
|
m_channelAcquired(false)
|
||||||
{
|
{
|
||||||
m_streamId.handle = 0;
|
m_streamId.handle = 0;
|
||||||
|
@ -435,14 +434,10 @@ bool LimeSDROutput::handleMessage(const Message& message)
|
||||||
MsgConfigureLimeSDR& conf = (MsgConfigureLimeSDR&) message;
|
MsgConfigureLimeSDR& conf = (MsgConfigureLimeSDR&) message;
|
||||||
qDebug() << "LimeSDROutput::handleMessage: MsgConfigureLimeSDR";
|
qDebug() << "LimeSDROutput::handleMessage: MsgConfigureLimeSDR";
|
||||||
|
|
||||||
if (!applySettings(conf.getSettings(), m_firstConfig))
|
if (!applySettings(conf.getSettings(), conf.getForce()))
|
||||||
{
|
{
|
||||||
qDebug("LimeSDROutput::handleMessage config error");
|
qDebug("LimeSDROutput::handleMessage config error");
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
m_firstConfig = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -693,6 +688,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo
|
||||||
int fifoSize = std::max(
|
int fifoSize = std::max(
|
||||||
(int) ((settings.m_devSampleRate/(1<<settings.m_log2SoftInterp)) * DeviceLimeSDRShared::m_sampleFifoLengthInSeconds),
|
(int) ((settings.m_devSampleRate/(1<<settings.m_log2SoftInterp)) * DeviceLimeSDRShared::m_sampleFifoLengthInSeconds),
|
||||||
DeviceLimeSDRShared::m_sampleFifoMinSize);
|
DeviceLimeSDRShared::m_sampleFifoMinSize);
|
||||||
|
qDebug("LimeSDROutput::applySettings: resize FIFO: %d", fifoSize);
|
||||||
m_sampleSourceFifo.resize(fifoSize);
|
m_sampleSourceFifo.resize(fifoSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,18 +36,21 @@ public:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
const LimeSDROutputSettings& getSettings() const { return m_settings; }
|
const LimeSDROutputSettings& getSettings() const { return m_settings; }
|
||||||
|
bool getForce() const { return m_force; }
|
||||||
|
|
||||||
static MsgConfigureLimeSDR* create(const LimeSDROutputSettings& settings)
|
static MsgConfigureLimeSDR* create(const LimeSDROutputSettings& settings, bool force)
|
||||||
{
|
{
|
||||||
return new MsgConfigureLimeSDR(settings);
|
return new MsgConfigureLimeSDR(settings, force);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
LimeSDROutputSettings m_settings;
|
LimeSDROutputSettings m_settings;
|
||||||
|
bool m_force;
|
||||||
|
|
||||||
MsgConfigureLimeSDR(const LimeSDROutputSettings& settings) :
|
MsgConfigureLimeSDR(const LimeSDROutputSettings& settings, bool force) :
|
||||||
Message(),
|
Message(),
|
||||||
m_settings(settings)
|
m_settings(settings),
|
||||||
|
m_force(force)
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -215,7 +218,6 @@ private:
|
||||||
QString m_deviceDescription;
|
QString m_deviceDescription;
|
||||||
bool m_running;
|
bool m_running;
|
||||||
DeviceLimeSDRShared m_deviceShared;
|
DeviceLimeSDRShared m_deviceShared;
|
||||||
bool m_firstConfig;
|
|
||||||
bool m_channelAcquired;
|
bool m_channelAcquired;
|
||||||
|
|
||||||
lms_stream_t m_streamId;
|
lms_stream_t m_streamId;
|
||||||
|
|
|
@ -33,6 +33,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, QWidget* parent) :
|
||||||
m_sampleRate(0),
|
m_sampleRate(0),
|
||||||
m_lastEngineState((DSPDeviceSinkEngine::State)-1),
|
m_lastEngineState((DSPDeviceSinkEngine::State)-1),
|
||||||
m_doApplySettings(true),
|
m_doApplySettings(true),
|
||||||
|
m_forceSettings(true),
|
||||||
m_statusCounter(0),
|
m_statusCounter(0),
|
||||||
m_deviceStatusCounter(0)
|
m_deviceStatusCounter(0)
|
||||||
{
|
{
|
||||||
|
@ -74,6 +75,8 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, QWidget* parent) :
|
||||||
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
|
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
|
||||||
|
|
||||||
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
|
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
|
||||||
|
|
||||||
|
sendSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
LimeSDROutputGUI::~LimeSDROutputGUI()
|
LimeSDROutputGUI::~LimeSDROutputGUI()
|
||||||
|
@ -125,6 +128,7 @@ bool LimeSDROutputGUI::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;
|
||||||
}
|
}
|
||||||
|
@ -302,8 +306,9 @@ void LimeSDROutputGUI::updateHardware()
|
||||||
if (m_doApplySettings)
|
if (m_doApplySettings)
|
||||||
{
|
{
|
||||||
qDebug() << "LimeSDROutputGUI::updateHardware";
|
qDebug() << "LimeSDROutputGUI::updateHardware";
|
||||||
LimeSDROutput::MsgConfigureLimeSDR* message = LimeSDROutput::MsgConfigureLimeSDR::create(m_settings);
|
LimeSDROutput::MsgConfigureLimeSDR* message = LimeSDROutput::MsgConfigureLimeSDR::create(m_settings, m_forceSettings);
|
||||||
m_limeSDROutput->getInputMessageQueue()->push(message);
|
m_limeSDROutput->getInputMessageQueue()->push(message);
|
||||||
|
m_forceSettings = false;
|
||||||
m_updateTimer.stop();
|
m_updateTimer.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,6 +63,7 @@ private:
|
||||||
quint64 m_deviceCenterFrequency; //!< Center frequency in device
|
quint64 m_deviceCenterFrequency; //!< Center frequency in device
|
||||||
int m_lastEngineState;
|
int m_lastEngineState;
|
||||||
bool m_doApplySettings;
|
bool m_doApplySettings;
|
||||||
|
bool m_forceSettings;
|
||||||
int m_statusCounter;
|
int m_statusCounter;
|
||||||
int m_deviceStatusCounter;
|
int m_deviceStatusCounter;
|
||||||
MessageQueue m_inputMessageQueue;
|
MessageQueue m_inputMessageQueue;
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = {
|
const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = {
|
||||||
QString("LimeSDR Output"),
|
QString("LimeSDR Output"),
|
||||||
QString("3.6.0"),
|
QString("3.7.4"),
|
||||||
QString("(c) Edouard Griffiths, F4EXB"),
|
QString("(c) Edouard Griffiths, F4EXB"),
|
||||||
QString("https://github.com/f4exb/sdrangel"),
|
QString("https://github.com/f4exb/sdrangel"),
|
||||||
true,
|
true,
|
||||||
|
|
Ładowanie…
Reference in New Issue