VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-22 17:45:48 -05:00
Code Issues Projects Releases Wiki Activity

RTLSDR: fixed gains retrieval in the GUI

Browse Source
This commit is contained in:
f4exb 2017-09-23 05:51:29 +02:00
parent cad5f92dd6
commit 30fa25c67b
8 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -1,8 +1,9 @@
sdrangel (3.7.2-1) unstable; urgency=medium
* PlutoSDR: Remove from device enumeration if device is not accessible
* RTLSDR: Fixed gains retrieval in the GUI
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 01 Oct 2017 21:14:18 +0200
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sat, 23 Sep 2017 05:14:18 +0200
sdrangel (3.7.1-1) unstable; urgency=medium

9
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
View File

@ -52,8 +52,6 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings();
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
queryDeviceReport(); // will reply with MsgReportRTLSDR to report gain list
}
RTLSDRGui::~RTLSDRGui()
@ -132,7 +130,6 @@ bool RTLSDRGui::handleMessage(const Message& message)
{
if (RTLSDRInput::MsgReportRTLSDR::match(message))
{
qDebug() << "RTLSDRGui::handleMessage: MsgReportRTLSDR";
m_gains = ((RTLSDRInput::MsgReportRTLSDR&) message).getGains();
displayGains();
return true;
@ -319,12 +316,6 @@ void RTLSDRGui::on_record_toggled(bool checked)
m_sampleSource->getInputMessageQueue()->push(message);
}
void RTLSDRGui::queryDeviceReport()
{
RTLSDRInput::MsgQueryRTLSDR* message = RTLSDRInput::MsgQueryRTLSDR::create();
m_sampleSource->getInputMessageQueue()->push(message);
}
void RTLSDRGui::updateHardware()
{
RTLSDRInput::MsgConfigureRTLSDR* message = RTLSDRInput::MsgConfigureRTLSDR::create(m_settings);

1
plugins/samplesource/rtlsdr/rtlsdrgui.h
View File

@ -65,7 +65,6 @@ private:
int m_lastEngineState;
MessageQueue m_inputMessageQueue;
void queryDeviceReport();
void displayGains();
void displaySettings();
void sendSettings();

25
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -29,7 +29,6 @@
#include "dsp/filerecord.h"
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgConfigureRTLSDR, Message)
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgQueryRTLSDR, Message)
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgReportRTLSDR, Message)
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgFileRecord, Message)
@ -250,19 +249,6 @@ bool RTLSDRInput::handleMessage(const Message& message)
return true;
}
else if (MsgQueryRTLSDR::match(message))
{
//MsgQueryRTLSDR& conf = (MsgQueryRTLSDR&) message;
qDebug() << "RTLSDRInput::handleMessage: MsgQueryRTLSDR";
MsgReportRTLSDR *message = MsgReportRTLSDR::create(m_gains);
if (getMessageQueueToGUI()) {
getMessageQueueToGUI()->push(message);
}
return true;
}
else if (MsgFileRecord::match(message))
{
MsgFileRecord& conf = (MsgFileRecord&) message;
@ -436,6 +422,17 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force)
return true;
}
void RTLSDRInput::setMessageQueueToGUI(MessageQueue *queue)
{
qDebug("RTLSDRInput::setMessageQueueToGUI: %p", queue);
DeviceSampleSource::setMessageQueueToGUI(queue);
if (queue) {
MsgReportRTLSDR *message = MsgReportRTLSDR::create(m_gains);
queue->push(message);
}
}
void RTLSDRInput::set_ds_mode(int on)
{
rtlsdr_set_direct_sampling(m_dev, on);

16
plugins/samplesource/rtlsdr/rtlsdrinput.h
View File

@ -50,21 +50,6 @@ public:
{ }
};
class MsgQueryRTLSDR : public Message {
MESSAGE_CLASS_DECLARATION
public:
static MsgQueryRTLSDR* create()
{
return new MsgQueryRTLSDR();
}
protected:
MsgQueryRTLSDR() :
Message()
{ }
};
class MsgReportRTLSDR : public Message {
MESSAGE_CLASS_DECLARATION
@ -116,6 +101,7 @@ public:
virtual quint64 getCenterFrequency() const;
virtual bool handleMessage(const Message& message);
virtual void setMessageQueueToGUI(MessageQueue *queue);
const std::vector<int>& getGains() const { return m_gains; }
void set_ds_mode(int on);

2
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
View File

@ -11,7 +11,7 @@
const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
QString("RTL-SDR Input"),
QString("3.5.2"),
QString("3.7.2"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h
View File

@ -318,7 +318,7 @@ public:
virtual bool handleMessage(const Message& message);
void setMessageQueueToGUI(MessageQueue *queue);
virtual void setMessageQueueToGUI(MessageQueue *queue);
private:
DeviceSourceAPI *m_deviceAPI;

2
sdrbase/dsp/devicesamplesource.h
View File

@ -42,7 +42,7 @@ public:
virtual bool handleMessage(const Message& message) = 0;
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; }
virtual void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; }
MessageQueue *getMessageQueueToGUI() { return m_guiMessageQueue; }
SampleSinkFifo* getSampleFifo() { return &m_sampleFifo; }