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

Replaced direct output to console for debug messages with qDebug

Browse Source
This commit is contained in:
f4exb
2015-08-09 10:33:04 +02:00
parent 5f8bec8d86
commit 4ba6f66cac
27 changed files with 77 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/bladerf/bladerfgui.cpp
+2 -2
View File
@@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <iostream>
#include <QDebug>
#include <libbladeRF.h>
#include "ui_bladerfgui.h"
@@ -199,7 +199,7 @@ void BladerfGui::on_fcPos_currentIndexChanged(int index)
void BladerfGui::on_lna_valueChanged(int value)
{
std::cerr << "BladerfGui: LNA gain = " << value << std::endl;
qDebug() << "BladerfGui: LNA gain = " << value;
if ((value < 0) || (value > 2))
return;
plugins/samplesource/bladerf/bladerfinput.cpp
+14 -15
View File
@@ -16,8 +16,7 @@
#include <string.h>
#include <errno.h>
#include <cstdio>
#include <iostream>
#include <QDebug>
#include "util/simpleserializer.h"
#include "bladerfgui.h"
@@ -236,7 +235,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if(bladerf_set_lna_gain(m_dev, getLnaGain(m_settings.m_lnaGain)) != 0) {
qDebug("bladerf_set_lna_gain() failed");
} else {
std::cerr << "BladerfInput: LNA gain set to " << getLnaGain(m_settings.m_lnaGain) << std::endl;
qDebug() << "BladerfInput: LNA gain set to " << getLnaGain(m_settings.m_lnaGain);
}
}
}
@@ -247,7 +246,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if(bladerf_set_rxvga1(m_dev, m_settings.m_vga1) != 0) {
qDebug("bladerf_set_rxvga1() failed");
} else {
std::cerr << "BladerfInput: VGA1 gain set to " << m_settings.m_vga1 << std::endl;
qDebug() << "BladerfInput: VGA1 gain set to " << m_settings.m_vga1;
}
}
}
@@ -258,7 +257,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if(bladerf_set_rxvga2(m_dev, m_settings.m_vga2) != 0) {
qDebug("bladerf_set_rxvga2() failed");
} else {
std::cerr << "BladerfInput: VGA2 gain set to " << m_settings.m_vga2 << std::endl;
qDebug() << "BladerfInput: VGA2 gain set to " << m_settings.m_vga2;
}
}
}
@@ -270,13 +269,13 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if (bladerf_expansion_attach(m_dev, BLADERF_XB_200) != 0) {
qDebug("bladerf_expansion_attach(xb200) failed");
} else {
std::cerr << "BladerfInput: Attach XB200" << std::endl;
qDebug() << "BladerfInput: Attach XB200";
}
} else {
if (bladerf_expansion_attach(m_dev, BLADERF_XB_NONE) != 0) {
qDebug("bladerf_expansion_attach(none) failed");
} else {
std::cerr << "BladerfInput: Detach XB200" << std::endl;
qDebug() << "BladerfInput: Detach XB200";
}
}
}
@@ -288,7 +287,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if(bladerf_xb200_set_path(m_dev, BLADERF_MODULE_RX, m_settings.m_xb200Path) != 0) {
qDebug("bladerf_xb200_set_path(BLADERF_MODULE_RX) failed");
} else {
std::cerr << "BladerfInput: set xb200 path to " << m_settings.m_xb200Path << std::endl;
qDebug() << "BladerfInput: set xb200 path to " << m_settings.m_xb200Path;
}
}
}
@@ -299,7 +298,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if(bladerf_xb200_set_filterbank(m_dev, BLADERF_MODULE_RX, m_settings.m_xb200Filter) != 0) {
qDebug("bladerf_xb200_set_filterbank(BLADERF_MODULE_RX) failed");
} else {
std::cerr << "BladerfInput: set xb200 filter to " << m_settings.m_xb200Filter << std::endl;
qDebug() << "BladerfInput: set xb200 filter to " << m_settings.m_xb200Filter;
}
}
}
@@ -310,7 +309,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if( bladerf_set_sample_rate(m_dev, BLADERF_MODULE_RX, settings.m_samplerate, &actualSamplerate) < 0)
qCritical("could not set sample rate: %d", settings.m_samplerate);
else {
std::cerr << "bladerf_set_sample_rate(BLADERF_MODULE_RX) actual sample rate is " << actualSamplerate << std::endl;
qDebug() << "bladerf_set_sample_rate(BLADERF_MODULE_RX) actual sample rate is " << actualSamplerate;
m_settings.m_samplerate = settings.m_samplerate;
m_bladerfThread->setSamplerate(settings.m_samplerate);
}
@@ -324,7 +323,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
if( bladerf_set_bandwidth(m_dev, BLADERF_MODULE_RX, m_settings.m_bandwidth, &actualBandwidth) < 0)
qCritical("could not set sample rate: %d", m_settings.m_samplerate);
else {
std::cerr << "bladerf_set_bandwidth(BLADERF_MODULE_RX) actual bandwidth is " << actualBandwidth << std::endl;
qDebug() << "bladerf_set_bandwidth(BLADERF_MODULE_RX) actual bandwidth is " << actualBandwidth;
}
}
}
@@ -333,7 +332,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
m_settings.m_log2Decim = settings.m_log2Decim;
if(m_dev != NULL) {
m_bladerfThread->setLog2Decimation(m_settings.m_log2Decim);
std::cerr << "BladerfInput: set decimation to " << (1<<settings.m_log2Decim) << std::endl;
qDebug() << "BladerfInput: set decimation to " << (1<<settings.m_log2Decim);
}
}
@@ -341,7 +340,7 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
m_settings.m_fcPos = settings.m_fcPos;
if(m_dev != NULL) {
m_bladerfThread->setFcPos((int) m_settings.m_fcPos);
std::cerr << "BladerfInput: set fc pos (enum) to " << (int) m_settings.m_fcPos << std::endl;
qDebug() << "BladerfInput: set fc pos (enum) to " << (int) m_settings.m_fcPos;
}
}
@@ -374,13 +373,13 @@ bool BladerfInput::applySettings(const GeneralSettings& generalSettings, const S
qDebug("bladerf_set_frequency(%lld) failed", m_generalSettings.m_centerFrequency);
}
std::cerr << "BladerfInput: center freq: " << m_generalSettings.m_centerFrequency << " Hz"
qDebug() << "BladerfInput: center freq: " << m_generalSettings.m_centerFrequency << " Hz"
<< " RF center freq: " << centerFrequency << " Hz"
<< " sample rate / 2 : " << m_settings.m_samplerate/2 << "Hz"
<< " BW: " << m_settings.m_bandwidth << "Hz"
<< " img: " << f_img << "Hz"
<< " cut: " << f_cut << "Hz"
<< " img - cut: " << f_img - f_cut << std::endl;
<< " img - cut: " << f_img - f_cut;
}
return true;
plugins/samplesource/filesource/filesourcegui.cpp
+2 -6
View File
@@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <iostream>
#include <QDebug>
#include <QTime>
#include <QDateTime>
@@ -131,7 +131,6 @@ bool FileSourceGui::handleMessage(Message* message)
}
else if(FileSourceInput::MsgReportFileSourceStreamData::match(message))
{
//std::cerr << "FileSourceGui::handleMessage: MsgReportFileSourceStreamData" << std::endl;
m_sampleRate = ((FileSourceInput::MsgReportFileSourceStreamData*)message)->getSampleRate();
m_centerFrequency = ((FileSourceInput::MsgReportFileSourceStreamData*)message)->getCenterFrequency();
m_startingTimeStamp = ((FileSourceInput::MsgReportFileSourceStreamData*)message)->getStartingTimeStamp();
@@ -142,7 +141,6 @@ bool FileSourceGui::handleMessage(Message* message)
else if(FileSourceInput::MsgReportFileSourceStreamTiming::match(message))
{
m_samplesCount = ((FileSourceInput::MsgReportFileSourceStreamTiming*)message)->getSamplesCount();
//std::cerr << "FileSourceGui::handleMessage: MsgReportFileSourceStreamTiming: " << m_samplesCount << std::endl;
message->completed();
updateWithStreamTime();
return true;
@@ -192,7 +190,7 @@ void FileSourceGui::on_showFileDialog_clicked(bool checked)
void FileSourceGui::configureFileName()
{
std::cerr << "FileSourceGui::configureFileName: " << m_fileName.toStdString() << std::endl;
qDebug() << "FileSourceGui::configureFileName: " << m_fileName.toStdString();
FileSourceInput::MsgConfigureFileSourceName* message = FileSourceInput::MsgConfigureFileSourceName::create(m_fileName);
message->submit(m_pluginAPI->getDSPEngineMessageQueue());
}
@@ -229,8 +227,6 @@ void FileSourceGui::updateWithStreamTime()
QString s_time = t.toString("hh:mm:ss.zzz");
ui->relTimeText->setText(s_time);
//std::cerr << "FileSourceGui::updateWithStreamTime: " << t_sec << "." << t_msec << " " << s_time.toStdString() << std::endl;
quint64 startingTimeStampMsec = m_startingTimeStamp * 1000;
QDateTime dt = QDateTime::fromMSecsSinceEpoch(startingTimeStampMsec);
dt = dt.addSecs(t_sec);
plugins/samplesource/filesource/filesourceinput.cpp
+6 -10
View File
@@ -16,8 +16,7 @@
#include <string.h>
#include <errno.h>
#include <cstdio>
#include <iostream>
#include <QDebug>
#include "util/simpleserializer.h"
#include "dsp/filesink.h"
@@ -90,7 +89,7 @@ FileSourceInput::~FileSourceInput()
void FileSourceInput::openFileStream()
{
std::cerr << "FileSourceInput::openFileStream: " << m_fileName.toStdString() << std::endl;
qDebug() << "FileSourceInput::openFileStream: " << m_fileName.toStdString();
//stopInput();
@@ -112,7 +111,7 @@ void FileSourceInput::openFileStream()
bool FileSourceInput::startInput(int device)
{
QMutexLocker mutexLocker(&m_mutex);
std::cerr << "FileSourceInput::startInput" << std::endl;
qDebug() << "FileSourceInput::startInput";
/*
if (!m_ifstream.is_open()) {
@@ -154,7 +153,7 @@ failed:
void FileSourceInput::stopInput()
{
std::cerr << "FileSourceInput::stopInput" << std::endl;
qDebug() << "FileSourceInput::stopInput";
QMutexLocker mutexLocker(&m_mutex);
if(m_fileSourceThread != NULL) {
@@ -192,7 +191,6 @@ bool FileSourceInput::handleMessage(Message* message)
{
if (MsgConfigureFileSourceName::match(message))
{
//std::cerr << "FileSourceInput::handleMessage: MsgConfigureFileName" << std::endl;
MsgConfigureFileSourceName* conf = (MsgConfigureFileSourceName*) message;
m_fileName = conf->getFileName();
openFileStream();
@@ -201,10 +199,8 @@ bool FileSourceInput::handleMessage(Message* message)
}
else if (MsgConfigureFileSourceWork::match(message))
{
//std::cerr << "FileSourceInput::handleMessage: MsgConfigureFileSourceWork: ";
MsgConfigureFileSourceWork* conf = (MsgConfigureFileSourceWork*) message;
bool working = conf->isWorking();
//std::cerr << (working ? "working" : "not working") << std::endl;
if (m_fileSourceThread != 0)
{
if (working) {
@@ -260,11 +256,11 @@ bool FileSourceInput::applySettings(const GeneralSettings& generalSettings, cons
}
}
std::cerr << "FileSourceInput::applySettings:"
qDebug() << "FileSourceInput::applySettings:"
<< " file name: " << settings.m_fileName.toStdString()
<< " center freq: " << m_centerFrequency << " Hz"
<< " sample rate: " << m_sampleRate
<< " Unix timestamp: " << m_startingTimeStamp << std::endl;
<< " Unix timestamp: " << m_startingTimeStamp;
}
return true;
plugins/samplesource/filesource/filesourcethread.cpp
+11 -14
View File
@@ -18,6 +18,7 @@
#include <errno.h>
#include <assert.h>
#include "dsp/samplefifo.h"
#include <QDebug>
#include "filesourcethread.h"
@@ -50,11 +51,11 @@ FileSourceThread::~FileSourceThread()
void FileSourceThread::startWork()
{
std::cerr << "FileSourceThread::startWork: ";
qDebug() << "FileSourceThread::startWork: ";
if (m_ifstream->is_open())
{
std::cerr << " file stream open, starting..." << std::endl;
qDebug() << " - file stream open, starting...";
m_startWaitMutex.lock();
start();
while(!m_running)
@@ -63,20 +64,20 @@ void FileSourceThread::startWork()
}
else
{
std::cerr << " file stream closed, not starting." << std::endl;
qDebug() << " - file stream closed, not starting.";
}
}
void FileSourceThread::stopWork()
{
std::cerr << "FileSourceThread::stopWork" << std::endl;
qDebug() << "FileSourceThread::stopWork";
m_running = false;
wait();
}
void FileSourceThread::setSamplerate(int samplerate)
{
std::cerr << "FileSourceThread::setSamplerate:"
qDebug() << "FileSourceThread::setSamplerate:"
<< " new:" << samplerate
<< " old:" << m_samplerate;
@@ -91,19 +92,15 @@ void FileSourceThread::setSamplerate(int samplerate)
m_bufsize = m_chunksize;
if (m_buf == 0) {
std::cerr << " Allocate buffer";
qDebug() << " - Allocate buffer";
m_buf = (quint8*) malloc(m_bufsize);
} else {
std::cerr << " Re-allocate buffer";
qDebug() << " - Re-allocate buffer";
m_buf = (quint8*) realloc((void*) m_buf, m_bufsize);
}
std::cerr << " size: " << m_bufsize
<< " #samples: " << (m_bufsize/4) << std::endl;
}
else
{
std::cerr << std::endl;
qDebug() << " - size: " << m_bufsize
<< " #samples: " << (m_bufsize/4);
}
//m_samplerate = samplerate;
@@ -126,7 +123,7 @@ void FileSourceThread::run()
void FileSourceThread::connectTimer(const QTimer& timer)
{
std::cerr << "FileSourceThread::connectTimer" << std::endl;
qDebug() << "FileSourceThread::connectTimer";
connect(&timer, SIGNAL(timeout()), this, SLOT(tick()));
}
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
-1
View File
@@ -1,4 +1,3 @@
#include <iostream>
#include "rtlsdrgui.h"
#include "ui_rtlsdrgui.h"
#include "plugin/pluginapi.h"