VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-15 12:12:28 -04:00
Code Issues Projects Releases Wiki Activity

LimeSDR input: implemented basic stream reporting

Browse Source
This commit is contained in:
f4exb 2017-04-19 18:41:55 +02:00
parent 1a1c793014
commit db67e07ab9
7 changed files with 399 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
plugins/samplesource/limesdrinput/limesdrinput.cpp
View File

@ -28,8 +28,10 @@
#include "limesdr/devicelimesdrparam.h" #include "limesdr/devicelimesdrparam.h"
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgConfigureLimeSDR, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgConfigureLimeSDR, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetStreamInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgSetReferenceConfig, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgSetReferenceConfig, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportLimeSDRToGUI, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportLimeSDRToGUI, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportStreamInfo, Message)
LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) : LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) :
@ -333,6 +335,53 @@ bool LimeSDRInput::handleMessage(const Message& message)
m_settings = conf.getSettings(); m_settings = conf.getSettings();
return true; return true;
} }
else if (MsgGetStreamInfo::match(message))
{
qDebug() << "LimeSDRInput::handleMessage: MsgGetStreamInfo";
lms_stream_status_t status;
if (LMS_GetStreamStatus(&m_streamId, &status) < 0)
{
qDebug("LimeSDRInput::handleMessage: canot get stream status");
MsgReportStreamInfo *report = MsgReportStreamInfo::create(
false, // Success
status.active,
status.fifoFilledCount,
status.fifoSize,
status.underrun,
status.overrun,
status.droppedPackets,
status.sampleRate,
status.linkRate,
status.timestamp);
m_deviceAPI->getDeviceOutputMessageQueue()->push(report);
}
else
{
qDebug() << "LimeSDRInput::handleMessage: got stream status at %llu" << status.timestamp
<< " fifoFilledCount: " << status.fifoFilledCount
<< " fifoSize: " << status.fifoSize
<< " underrun: " << status.underrun
<< " overrun: " << status.overrun
<< " droppedPackets: " << status.droppedPackets
<< " sampleRate: " << status.sampleRate
<< " linkRate: " << status.linkRate;
MsgReportStreamInfo *report = MsgReportStreamInfo::create(
true, // Success
status.active,
status.fifoFilledCount,
status.fifoSize,
status.underrun,
status.overrun,
status.droppedPackets,
status.sampleRate,
status.linkRate,
status.timestamp);
m_deviceAPI->getDeviceOutputMessageQueue()->push(report);
}
return true;
}
else else
{ {
return false; return false;

364
plugins/samplesource/limesdrinput/limesdrinput.h
View File

@ -1,135 +1,229 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2017 Edouard Griffiths, F4EXB // // Copyright (C) 2017 Edouard Griffiths, F4EXB //
// // // //
// This program is free software; you can redistribute it and/or modify // // This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by // // it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or // // the Free Software Foundation as version 3 of the License, or //
// // // //
// This program is distributed in the hope that it will be useful, // // This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of // // but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. // // GNU General Public License V3 for more details. //
// // // //
// You should have received a copy of the GNU General Public License // // You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUT_H_ #ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUT_H_
#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUT_H_ #define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUT_H_
#include <QString> #include <QString>
#include <stdint.h> #include <stdint.h>
#include "dsp/devicesamplesource.h" #include "dsp/devicesamplesource.h"
#include "limesdr/devicelimesdrshared.h" #include "limesdr/devicelimesdrshared.h"
#include "limesdrinputsettings.h" #include "limesdrinputsettings.h"
class DeviceSourceAPI; class DeviceSourceAPI;
class LimeSDRInputThread; class LimeSDRInputThread;
struct DeviceLimeSDRParams; struct DeviceLimeSDRParams;
class LimeSDRInput : public DeviceSampleSource class LimeSDRInput : public DeviceSampleSource
{ {
public: public:
class MsgConfigureLimeSDR : public Message { class MsgConfigureLimeSDR : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
const LimeSDRInputSettings& getSettings() const { return m_settings; } const LimeSDRInputSettings& getSettings() const { return m_settings; }
static MsgConfigureLimeSDR* create(const LimeSDRInputSettings& settings) static MsgConfigureLimeSDR* create(const LimeSDRInputSettings& settings)
{ {
return new MsgConfigureLimeSDR(settings); return new MsgConfigureLimeSDR(settings);
} }
private: private:
LimeSDRInputSettings m_settings; LimeSDRInputSettings m_settings;
MsgConfigureLimeSDR(const LimeSDRInputSettings& settings) : MsgConfigureLimeSDR(const LimeSDRInputSettings& settings) :
Message(), Message(),
m_settings(settings) m_settings(settings)
{ } { }
}; };
class MsgSetReferenceConfig : public Message { class MsgSetReferenceConfig : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
const LimeSDRInputSettings& getSettings() const { return m_settings; } const LimeSDRInputSettings& getSettings() const { return m_settings; }
static MsgSetReferenceConfig* create(const LimeSDRInputSettings& settings) static MsgSetReferenceConfig* create(const LimeSDRInputSettings& settings)
{ {
return new MsgSetReferenceConfig(settings); return new MsgSetReferenceConfig(settings);
} }
private: private:
LimeSDRInputSettings m_settings; LimeSDRInputSettings m_settings;
MsgSetReferenceConfig(const LimeSDRInputSettings& settings) : MsgSetReferenceConfig(const LimeSDRInputSettings& settings) :
Message(), Message(),
m_settings(settings) m_settings(settings)
{ } { }
}; };
class MsgReportLimeSDRToGUI : public Message { class MsgGetStreamInfo : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
float getCenterFrequency() const { return m_centerFrequency; } static MsgGetStreamInfo* create()
int getSampleRate() const { return m_sampleRate; } {
uint32_t getLog2HardDecim() const { return m_log2HardDecim; } return new MsgGetStreamInfo();
}
static MsgReportLimeSDRToGUI* create(float centerFrequency, int sampleRate, uint32_t log2HardDecim)
{ private:
return new MsgReportLimeSDRToGUI(centerFrequency, sampleRate, log2HardDecim); MsgGetStreamInfo() :
} Message()
{ }
private: };
float m_centerFrequency;
int m_sampleRate; class MsgReportLimeSDRToGUI : public Message {
uint32_t m_log2HardDecim; MESSAGE_CLASS_DECLARATION
MsgReportLimeSDRToGUI(float centerFrequency, int sampleRate, uint32_t log2HardDecim) : public:
Message(), float getCenterFrequency() const { return m_centerFrequency; }
m_centerFrequency(centerFrequency), int getSampleRate() const { return m_sampleRate; }
m_sampleRate(sampleRate), uint32_t getLog2HardDecim() const { return m_log2HardDecim; }
m_log2HardDecim(log2HardDecim)
{ } static MsgReportLimeSDRToGUI* create(float centerFrequency, int sampleRate, uint32_t log2HardDecim)
}; {
return new MsgReportLimeSDRToGUI(centerFrequency, sampleRate, log2HardDecim);
LimeSDRInput(DeviceSourceAPI *deviceAPI); }
virtual ~LimeSDRInput();
private:
virtual bool start(); float m_centerFrequency;
virtual void stop(); int m_sampleRate;
uint32_t m_log2HardDecim;
virtual const QString& getDeviceDescription() const;
virtual int getSampleRate() const; MsgReportLimeSDRToGUI(float centerFrequency, int sampleRate, uint32_t log2HardDecim) :
virtual quint64 getCenterFrequency() const; Message(),
m_centerFrequency(centerFrequency),
virtual bool handleMessage(const Message& message); m_sampleRate(sampleRate),
m_log2HardDecim(log2HardDecim)
std::size_t getChannelIndex(); { }
void getLORange(float& minF, float& maxF, float& stepF) const; };
void getSRRange(float& minF, float& maxF, float& stepF) const;
void getLPRange(float& minF, float& maxF, float& stepF) const; class MsgReportStreamInfo : public Message {
uint32_t getHWLog2Decim() const; MESSAGE_CLASS_DECLARATION
private: public:
DeviceSourceAPI *m_deviceAPI; bool getSuccess() const { return m_success; }
QMutex m_mutex; bool getActive() const { return m_active; }
LimeSDRInputSettings m_settings; uint32_t getFifoFilledCount() const { return m_fifoFilledCount; }
LimeSDRInputThread* m_limeSDRInputThread; uint32_t getFifoSize() const { return m_fifoSize; }
QString m_deviceDescription; uint32_t getUnderrun() const { return m_underrun; }
bool m_running; uint32_t getOverrun() const { return m_overrun; }
DeviceLimeSDRShared m_deviceShared; uint32_t getDroppedPackets() const { return m_droppedPackets; }
bool m_firstConfig; float getSampleRate() const { return m_sampleRate; }
float getLinkRate() const { return m_linkRate; }
lms_stream_t m_streamId; uint64_t getTimestamp() const { return m_timestamp; }
bool openDevice(); static MsgReportStreamInfo* create(
void closeDevice(); bool active,
bool applySettings(const LimeSDRInputSettings& settings, bool force); uint32_t fifoFilledCount,
}; uint32_t fifoSize,
uint32_t underrun,
#endif /* PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUT_H_ */ uint32_t overrun,
uint32_t droppedPackets,
float sampleRate,
float linkRate,
uint64_t timestamp
)
{
return new MsgReportStreamInfo(
active,
fifoFilledCount,
fifoSize,
underrun,
overrun,
droppedPackets,
sampleRate,
linkRate,
timestamp
);
}
private:
bool m_success;
// everything from lms_stream_status_t
bool m_active; //!< Indicates whether the stream is currently active
uint32_t m_fifoFilledCount; //!< Number of samples in FIFO buffer
uint32_t m_fifoSize; //!< Size of FIFO buffer
uint32_t m_underrun; //!< FIFO underrun count
uint32_t m_overrun; //!< FIFO overrun count
uint32_t m_droppedPackets; //!< Number of dropped packets by HW
float m_sampleRate; //!< Sampling rate of the stream
float m_linkRate; //!< Combined data rate of all stream of the same direction (TX or RX)
uint64_t m_timestamp; //!< Current HW timestamp
MsgReportStreamInfo(
bool success,
bool active,
uint32_t fifoFilledCount,
uint32_t fifoSize,
uint32_t underrun,
uint32_t overrun,
uint32_t droppedPackets,
float sampleRate,
float linkRate,
uint64_t timestamp
) :
Message(),
m_success(success),
m_active(active),
m_fifoFilledCount(fifoFilledCount),
m_fifoSize(fifoSize),
m_underrun(underrun),
m_overrun(overrun),
m_droppedPackets(droppedPackets),
m_sampleRate(sampleRate),
m_linkRate(linkRate),
m_timestamp(timestamp)
{ }
};
LimeSDRInput(DeviceSourceAPI *deviceAPI);
virtual ~LimeSDRInput();
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;
virtual int getSampleRate() const;
virtual quint64 getCenterFrequency() const;
virtual bool handleMessage(const Message& message);
std::size_t getChannelIndex();
void getLORange(float& minF, float& maxF, float& stepF) const;
void getSRRange(float& minF, float& maxF, float& stepF) const;
void getLPRange(float& minF, float& maxF, float& stepF) const;
uint32_t getHWLog2Decim() const;
private:
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
LimeSDRInputSettings m_settings;
LimeSDRInputThread* m_limeSDRInputThread;
QString m_deviceDescription;
bool m_running;
DeviceLimeSDRShared m_deviceShared;
bool m_firstConfig;
lms_stream_t m_streamId;
bool openDevice();
void closeDevice();
bool applySettings(const LimeSDRInputSettings& settings, bool force);
};
#endif /* PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUT_H_ */

37
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
View File

@ -35,7 +35,8 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_sampleSource(0), m_sampleSource(0),
m_sampleRate(0), m_sampleRate(0),
m_lastEngineState((DSPDeviceSourceEngine::State)-1), m_lastEngineState((DSPDeviceSourceEngine::State)-1),
m_doApplySettings(true) m_doApplySettings(true),
m_statusCounter(0)
{ {
m_limeSDRInput = new LimeSDRInput(m_deviceAPI); m_limeSDRInput = new LimeSDRInput(m_deviceAPI);
m_sampleSource = (DeviceSampleSource *) m_limeSDRInput; m_sampleSource = (DeviceSampleSource *) m_limeSDRInput;
@ -179,6 +180,29 @@ void LimeSDRInputGUI::handleMessagesToGUI()
delete message; delete message;
} }
else if (LimeSDRInput::MsgReportStreamInfo::match(*message))
{
LimeSDRInput::MsgReportStreamInfo *report = (LimeSDRInput::MsgReportStreamInfo *) message;
if (report->getSuccess())
{
if (report->getActive())
{
ui->streamStatusLabel->setStyleSheet("QLabel { background-color : green; }");
}
else
{
ui->streamStatusLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
}
ui->streamSampleRateText->setText(tr("%1kS").arg(QString::number(report->getSampleRate() / 1000.0f, 'f', 0)));
ui->streamLinkRateText->setText(tr("%1kB").arg(QString::number(report->getLinkRate() / 1000.0f, 'f', 0)));
}
else
{
ui->streamStatusLabel->setStyleSheet("QLabel { background-color : red; }");
}
}
} }
} }
@ -253,6 +277,17 @@ void LimeSDRInputGUI::updateStatus()
m_lastEngineState = state; m_lastEngineState = state;
} }
if (m_statusCounter < 1)
{
m_statusCounter++;
}
else
{
LimeSDRInput::MsgGetStreamInfo* message = LimeSDRInput::MsgGetStreamInfo::create();
m_sampleSource->getInputMessageQueue()->push(message);
m_statusCounter = 0;
}
} }
void LimeSDRInputGUI::blockApplySettings(bool block) void LimeSDRInputGUI::blockApplySettings(bool block)

1
plugins/samplesource/limesdrinput/limesdrinputgui.h
View File

@ -61,6 +61,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;
int m_statusCounter;
void displaySettings(); void displaySettings();
void sendSettings(); void sendSettings();

83
plugins/samplesource/limesdrinput/limesdrinputgui.ui
View File

@ -591,6 +591,89 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="statusLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="streamStatusLabel">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/stream.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="streamSampleRateText">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>00000kS</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="streamLinkRateText">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>00000kB</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="padLayout"> <layout class="QHBoxLayout" name="padLayout">
<item> <item>

1
sdrbase/resources/res.qrc
View File

@ -76,5 +76,6 @@
<file>picture.png</file> <file>picture.png</file>
<file>camera.png</file> <file>camera.png</file>
<file>filter_bandpass.png</file> <file>filter_bandpass.png</file>
<file>stream.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
sdrbase/resources/stream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 487 B