VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-10 20:40:23 -04:00
Code Issues Projects Releases Wiki Activity

FCDPro: open/close new style

Browse Source
This commit is contained in:
f4exb 2017-04-14 03:24:21 +02:00
parent b05897d221
commit f456293b84
3 changed files with 61 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/samplesource/fcdpro/fcdprogui.cpp
View File

@ -35,6 +35,9 @@ FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_sampleSource(NULL), m_sampleSource(NULL),
m_lastEngineState((DSPDeviceSourceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
m_sampleSource = new FCDProInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
ui->centerFrequency->setValueRange(7, 64000U, 1700000U); ui->centerFrequency->setValueRange(7, 64000U, 1700000U);
@ -141,9 +144,6 @@ FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
m_sampleSource = new FCDProInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
char recFileNameCStr[30]; char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr)); m_fileSink = new FileRecord(std::string(recFileNameCStr));

73
plugins/samplesource/fcdpro/fcdproinput.cpp
View File

@ -42,31 +42,61 @@ FCDProInput::FCDProInput(DeviceSourceAPI *deviceAPI) :
m_deviceDescription(fcd_traits<Pro>::displayedName), m_deviceDescription(fcd_traits<Pro>::displayedName),
m_running(false) m_running(false)
{ {
openDevice();
} }
FCDProInput::~FCDProInput() FCDProInput::~FCDProInput()
{ {
stop(); if (m_running) stop();
closeDevice();
}
bool FCDProInput::openDevice()
{
int device = m_deviceAPI->getSampleSourceSequence();
if (m_dev != 0)
{
closeDevice();
}
qDebug() << "FCDProInput::openDevice with device #" << device;
m_dev = fcdOpen(fcd_traits<Pro>::vendorId, fcd_traits<Pro>::productId, device);
if (m_dev == 0)
{
qCritical("FCDProInput::start: could not open FCD");
return false;
}
return true;
} }
bool FCDProInput::start(int device) bool FCDProInput::start(int device)
{ {
qDebug() << "FCDProInput::start with device #" << device; qDebug() << "FCDProInput::start";
QMutexLocker mutexLocker(&m_mutex); // QMutexLocker mutexLocker(&m_mutex);
if (m_FCDThread) if (!m_dev) {
{ return false;
return false; }
}
m_dev = fcdOpen(fcd_traits<Pro>::vendorId, fcd_traits<Pro>::productId, device); if (m_running) stop();
if (m_dev == 0) // if (m_FCDThread)
{ // {
qCritical("FCDProInput::start: could not open FCD"); // return false;
return false; // }
}
// m_dev = fcdOpen(fcd_traits<Pro>::vendorId, fcd_traits<Pro>::productId, device);
//
// if (m_dev == 0)
// {
// qCritical("FCDProInput::start: could not open FCD");
// return false;
// }
/* Apply settings before streaming to avoid bus contention; /* Apply settings before streaming to avoid bus contention;
* there is very little spare bandwidth on a full speed USB device. * there is very little spare bandwidth on a full speed USB device.
@ -89,16 +119,24 @@ bool FCDProInput::start(int device)
m_FCDThread->startWork(); m_FCDThread->startWork();
mutexLocker.unlock(); // mutexLocker.unlock();
applySettings(m_settings, true); applySettings(m_settings, true);
qDebug("FCDProInput::started"); qDebug("FCDProInput::started");
m_running = true;
return true; return true;
} }
void FCDProInput::closeDevice()
{
fcdClose(m_dev);
m_dev = 0;
}
void FCDProInput::stop() void FCDProInput::stop()
{ {
QMutexLocker mutexLocker(&m_mutex); // QMutexLocker mutexLocker(&m_mutex);
if (m_FCDThread) if (m_FCDThread)
{ {
@ -108,8 +146,9 @@ void FCDProInput::stop()
m_FCDThread = 0; m_FCDThread = 0;
} }
fcdClose(m_dev); m_running = false;
m_dev = 0; // fcdClose(m_dev);
// m_dev = 0;
} }
const QString& FCDProInput::getDeviceDescription() const const QString& FCDProInput::getDeviceDescription() const

2
plugins/samplesource/fcdpro/fcdproinput.h
View File

@ -87,6 +87,8 @@ public:
void set_gain6(int index); void set_gain6(int index);
private: private:
bool openDevice();
void closeDevice();
void applySettings(const FCDProSettings& settings, bool force); void applySettings(const FCDProSettings& settings, bool force);
void set_lo_ppm(); void set_lo_ppm();