VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-25 03:24:18 -04:00
Code Issues Projects Releases Wiki Activity

LimeSDR: removed obsolete message. Only stop current side threads if changing center frequency

Browse Source
This commit is contained in:
f4exb
2017-10-24 02:41:54 +02:00
parent 238c8d312e
commit 2572f2be84
8 changed files with 16 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/limesdrinput/limesdrinput.cpp
+7 -90
View File
@@ -33,7 +33,6 @@
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgConfigureLimeSDR, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetStreamInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetDeviceInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportLimeSDRToBuddy, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportStreamInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgFileRecord, Message)
@@ -427,20 +426,6 @@ bool LimeSDRInput::handleMessage(const Message& message)
return true;
}
else if (MsgReportLimeSDRToBuddy::match(message))
{
MsgReportLimeSDRToBuddy& conf = (MsgReportLimeSDRToBuddy&) message;
m_settings.m_centerFrequency = conf.getCenterFrequency();
m_settings.m_devSampleRate = conf.getSampleRate();
m_settings.m_log2HardDecim = conf.getLog2HardDecim();
qDebug() << "LimeSDRInput::handleMessage: MsgReportLimeSDRToBuddy:"
<< " m_centerFrequency: " << conf.getCenterFrequency()
<< " m_devSampleRate: " << conf.getSampleRate()
<< " m_log2HardDecim: " << conf.getLog2HardDecim();
return true;
}
else if (DeviceLimeSDRShared::MsgReportSampleRateDirChange::match(message))
{
DeviceLimeSDRShared::MsgReportSampleRateDirChange& report = (DeviceLimeSDRShared::MsgReportSampleRateDirChange&) message;
@@ -474,16 +459,6 @@ bool LimeSDRInput::handleMessage(const Message& message)
return true;
}
else if (DeviceLimeSDRShared::MsgCrossReportToBuddy::match(message))
{
DeviceLimeSDRShared::MsgCrossReportToBuddy& conf = (DeviceLimeSDRShared::MsgCrossReportToBuddy&) message;
m_settings.m_devSampleRate = conf.getSampleRate();
qDebug() << "LimeSDRInput::handleMessage: MsgCrossReportToBuddy:"
<< " m_devSampleRate: " << conf.getSampleRate();
return true;
}
else if (MsgGetStreamInfo::match(message))
{
// qDebug() << "LimeSDRInput::handleMessage: MsgGetStreamInfo";
@@ -605,23 +580,20 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
bool suspendAllThread = false;
bool doCalibration = false;
bool setAntennaAuto = false;
// bool forceNCOFrequency = false;
// QMutexLocker mutexLocker(&m_mutex);
// determine if buddies threads or own thread need to be suspended
if ((m_settings.m_devSampleRate != settings.m_devSampleRate) ||
(m_settings.m_log2HardDecim != settings.m_log2HardDecim) ||
(m_settings.m_centerFrequency != settings.m_centerFrequency) || force)
(m_settings.m_log2HardDecim != settings.m_log2HardDecim) || force)
{
suspendAllThread = true;
}
// if ((m_settings.m_log2HardDecim != settings.m_log2HardDecim) ||
// (m_settings.m_centerFrequency != settings.m_centerFrequency) || force)
// {
// suspendRxThread = true;
// }
if ((m_settings.m_centerFrequency != settings.m_centerFrequency) || force)
{
suspendRxThread = true;
}
if ((m_settings.m_antennaPath != settings.m_antennaPath) &&
(m_settings.m_antennaPath == 0))
@@ -835,7 +807,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if ((m_settings.m_devSampleRate != settings.m_devSampleRate)
|| (m_settings.m_log2HardDecim != settings.m_log2HardDecim) || force)
{
// forwardChangeRxDSP = m_settings.m_log2HardDecim != settings.m_log2HardDecim;
forwardChangeAllDSP = true; //m_settings.m_devSampleRate != settings.m_devSampleRate;
m_settings.m_devSampleRate = settings.m_devSampleRate;
@@ -1079,27 +1050,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
DeviceLimeSDRShared::MsgReportSampleRateDirChange *report = DeviceLimeSDRShared::MsgReportSampleRateDirChange::create(
m_settings.m_devSampleRate, m_settings.m_log2HardDecim, true);
(*itSource)->getSampleSourceInputMessageQueue()->push(report);
// DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSource)->getBuddySharedPtr();
// int buddyNCOFreq = buddySharedPtr->m_ncoFrequency;
// uint32_t buddyLog2Decim = buddySharedPtr->m_log2Soft;
// DSPSignalNotification *notif = new DSPSignalNotification(
// m_settings.m_devSampleRate/(1<<buddyLog2Decim),
// m_settings.m_centerFrequency + buddyNCOFreq);
// (*itSource)->getDeviceEngineInputMessageQueue()->push(notif);
//
// MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create(
// m_settings.m_centerFrequency,
// m_settings.m_devSampleRate,
// m_settings.m_log2HardDecim);
//
// if ((*itSource)->getSampleSourceGUIMessageQueue())
// {
// MsgReportLimeSDRToBuddy *reportToGUI = new MsgReportLimeSDRToBuddy(*report);
// (*itSource)->getSampleSourceGUIMessageQueue()->push(reportToGUI);
// }
//
// (*itSource)->getSampleSourceInputMessageQueue()->push(report);
}
// send to sink buddies
@@ -1111,25 +1061,6 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
DeviceLimeSDRShared::MsgReportSampleRateDirChange *report = DeviceLimeSDRShared::MsgReportSampleRateDirChange::create(
m_settings.m_devSampleRate, m_settings.m_log2HardDecim, true);
(*itSink)->getSampleSinkInputMessageQueue()->push(report);
// DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSink)->getBuddySharedPtr();
// uint64_t buddyCenterFreq = buddySharedPtr->m_centerFrequency;
// int buddyNCOFreq = buddySharedPtr->m_ncoFrequency;
// uint32_t buddyLog2Interp = buddySharedPtr->m_log2Soft;
// DSPSignalNotification *notif = new DSPSignalNotification(
// m_settings.m_devSampleRate/(1<<buddyLog2Interp),
// buddyCenterFreq + buddyNCOFreq); // do not change center frequency
// (*itSink)->getDeviceEngineInputMessageQueue()->push(notif);
//
// DeviceLimeSDRShared::MsgCrossReportToBuddy *report = DeviceLimeSDRShared::MsgCrossReportToBuddy::create(m_settings.m_devSampleRate);
//
// if ((*itSink)->getSampleSinkGUIMessageQueue())
// {
// DeviceLimeSDRShared::MsgCrossReportToBuddy *reportToGUI = new DeviceLimeSDRShared::MsgCrossReportToBuddy(*report);
// (*itSink)->getSampleSinkGUIMessageQueue()->push(reportToGUI);
// }
//
// (*itSink)->getSampleSinkInputMessageQueue()->push(report);
}
}
else if (forwardChangeRxDSP)
@@ -1149,22 +1080,8 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
for (; itSource != sourceBuddies.end(); ++itSource)
{
DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSource)->getBuddySharedPtr();
int buddyNCOFreq = buddySharedPtr->m_ncoFrequency;
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + buddyNCOFreq);
(*itSource)->getDeviceEngineInputMessageQueue()->push(notif);
MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create(
m_settings.m_centerFrequency,
m_settings.m_devSampleRate,
m_settings.m_log2HardDecim);
if ((*itSource)->getSampleSourceGUIMessageQueue())
{
MsgReportLimeSDRToBuddy *reportToGUI = new MsgReportLimeSDRToBuddy(*report);
(*itSource)->getSampleSourceGUIMessageQueue()->push(reportToGUI);
}
DeviceLimeSDRShared::MsgReportSampleRateDirChange *report = DeviceLimeSDRShared::MsgReportSampleRateDirChange::create(
m_settings.m_devSampleRate, m_settings.m_log2HardDecim, true);
(*itSource)->getSampleSourceInputMessageQueue()->push(report);
}
}
plugins/samplesource/limesdrinput/limesdrinput.h
-26
View File
@@ -85,32 +85,6 @@ public:
{ }
};
class MsgReportLimeSDRToBuddy : public Message {
MESSAGE_CLASS_DECLARATION
public:
float getCenterFrequency() const { return m_centerFrequency; }
int getSampleRate() const { return m_sampleRate; }
uint32_t getLog2HardDecim() const { return m_log2HardDecim; }
static MsgReportLimeSDRToBuddy* create(float centerFrequency, int sampleRate, uint32_t log2HardDecim)
{
return new MsgReportLimeSDRToBuddy(centerFrequency, sampleRate, log2HardDecim);
}
private:
float m_centerFrequency;
int m_sampleRate;
uint32_t m_log2HardDecim;
MsgReportLimeSDRToBuddy(float centerFrequency, int sampleRate, uint32_t log2HardDecim) :
Message(),
m_centerFrequency(centerFrequency),
m_sampleRate(sampleRate),
m_log2HardDecim(log2HardDecim)
{ }
};
class MsgReportStreamInfo : public Message {
MESSAGE_CLASS_DECLARATION
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+1 -28
View File
@@ -139,22 +139,7 @@ bool LimeSDRInputGUI::deserialize(const QByteArray& data)
bool LimeSDRInputGUI::handleMessage(const Message& message)
{
if (LimeSDRInput::MsgReportLimeSDRToBuddy::match(message))
{
qDebug("LimeSDRInputGUI::handleMessagesToGUI: message: %s", message.getIdentifier());
LimeSDRInput::MsgReportLimeSDRToBuddy& report = (LimeSDRInput::MsgReportLimeSDRToBuddy&) message;
m_settings.m_centerFrequency = report.getCenterFrequency();
m_settings.m_devSampleRate = report.getSampleRate();
m_settings.m_log2HardDecim = report.getLog2HardDecim();
blockApplySettings(true);
displaySettings();
blockApplySettings(false);
return true;
}
else if (DeviceLimeSDRShared::MsgReportSampleRateDirChange::match(message))
if (DeviceLimeSDRShared::MsgReportSampleRateDirChange::match(message))
{
DeviceLimeSDRShared::MsgReportSampleRateDirChange& report = (DeviceLimeSDRShared::MsgReportSampleRateDirChange&) message;
m_settings.m_devSampleRate = report.getDevSampleRate();
@@ -166,18 +151,6 @@ bool LimeSDRInputGUI::handleMessage(const Message& message)
return true;
}
else if (DeviceLimeSDRShared::MsgCrossReportToBuddy::match(message))
{
qDebug("LimeSDRInputGUI::handleMessagesToGUI: message: %s", message.getIdentifier());
DeviceLimeSDRShared::MsgCrossReportToBuddy& report = (DeviceLimeSDRShared::MsgCrossReportToBuddy&) message;
m_settings.m_devSampleRate = report.getSampleRate(); // TODO: remove from here should be done device to device
blockApplySettings(true);
displaySettings();
blockApplySettings(false);
return true;
}
else if (LimeSDRInput::MsgReportStreamInfo::match(message))
{
LimeSDRInput::MsgReportStreamInfo& report = (LimeSDRInput::MsgReportStreamInfo&) message;