VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-23 08:28:36 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1171 from srcejon/fix_1153

Browse Source 
Rotator controller - Open/close serial ports in worker thread.
This commit is contained in:
Edouard Griffiths 2022-03-03 19:06:52 +01:00 committed by GitHub
commit 36876c053f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/feature/gs232controller/gs232controllerworker.cpp
View File

@ -45,8 +45,6 @@ GS232ControllerWorker::GS232ControllerWorker() :
m_spidStatusSent(false), m_spidStatusSent(false),
m_rotCtlDReadAz(false) m_rotCtlDReadAz(false)
{ {
connect(&m_pollTimer, SIGNAL(timeout()), this, SLOT(update()));
m_pollTimer.start(1000);
} }
GS232ControllerWorker::~GS232ControllerWorker() GS232ControllerWorker::~GS232ControllerWorker()
@ -69,6 +67,15 @@ bool GS232ControllerWorker::startWork()
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
connect(thread(), SIGNAL(started()), this, SLOT(started()));
connect(thread(), SIGNAL(finished()), this, SLOT(finished()));
m_running = true;
return m_running;
}
// startWork() is called from main thread. Serial ports on Linux need to be opened/closed on worker thread
void GS232ControllerWorker::started()
{
connect(&m_serialPort, &QSerialPort::readyRead, this, &GS232ControllerWorker::readData); connect(&m_serialPort, &QSerialPort::readyRead, this, &GS232ControllerWorker::readData);
connect(&m_socket, &QTcpSocket::readyRead, this, &GS232ControllerWorker::readData); connect(&m_socket, &QTcpSocket::readyRead, this, &GS232ControllerWorker::readData);
if (m_settings.m_connection == GS232ControllerSettings::TCP) { if (m_settings.m_connection == GS232ControllerSettings::TCP) {
@ -76,21 +83,29 @@ bool GS232ControllerWorker::startWork()
} else { } else {
m_device = openSerialPort(m_settings); m_device = openSerialPort(m_settings);
} }
m_running = true; connect(&m_pollTimer, SIGNAL(timeout()), this, SLOT(update()));
return m_running; m_pollTimer.start(1000);
disconnect(thread(), SIGNAL(started()), this, SLOT(started()));
} }
void GS232ControllerWorker::stopWork() void GS232ControllerWorker::stopWork()
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
disconnect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
}
void GS232ControllerWorker::finished()
{
// Close serial port as USB/controller activity can create RFI // Close serial port as USB/controller activity can create RFI
if (m_device && m_device->isOpen()) { if (m_device && m_device->isOpen()) {
m_device->close(); m_device->close();
} }
disconnect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
disconnect(&m_serialPort, &QSerialPort::readyRead, this, &GS232ControllerWorker::readData); disconnect(&m_serialPort, &QSerialPort::readyRead, this, &GS232ControllerWorker::readData);
disconnect(&m_socket, &QTcpSocket::readyRead, this, &GS232ControllerWorker::readData); disconnect(&m_socket, &QTcpSocket::readyRead, this, &GS232ControllerWorker::readData);
m_pollTimer.stop();
disconnect(&m_pollTimer, SIGNAL(timeout()), this, SLOT(update()));
m_running = false; m_running = false;
disconnect(thread(), SIGNAL(finished()), this, SLOT(finished()));
} }
void GS232ControllerWorker::handleInputMessages() void GS232ControllerWorker::handleInputMessages()

2
plugins/feature/gs232controller/gs232controllerworker.h
View File

@ -95,6 +95,8 @@ private:
void setAzimuthElevation(float azimuth, float elevation); void setAzimuthElevation(float azimuth, float elevation);
private slots: private slots:
void started();
void finished();
void handleInputMessages(); void handleInputMessages();
void readData(); void readData();
void update(); void update();