frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Add RS232 timeout for asynchronous connection (#650)

Browse Source
This commit is contained in:
Portisch 2019-12-15 13:43:50 +01:00 committed by Paulchen Panther
parent 6b983c7a57
commit fe728b1543
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libsrc/leddevice/dev_serial/ProviderRs232.cpp
View File

@ -14,10 +14,10 @@
ProviderRs232::ProviderRs232() ProviderRs232::ProviderRs232()
: _rs232Port(this) : _rs232Port(this)
, _writeTimeout(this)
, _blockedForDelay(false) , _blockedForDelay(false)
, _stateChanged(true) , _stateChanged(true)
, _bytesToWrite(0) , _bytesToWrite(0)
, _bytesWritten(0)
, _frameDropCounter(0) , _frameDropCounter(0)
, _lastError(QSerialPort::NoError) , _lastError(QSerialPort::NoError)
, _preOpenDelayTimeOut(0) , _preOpenDelayTimeOut(0)
@ -27,6 +27,9 @@ ProviderRs232::ProviderRs232()
connect(&_rs232Port, SIGNAL(error(QSerialPort::SerialPortError)), this, SLOT(error(QSerialPort::SerialPortError))); connect(&_rs232Port, SIGNAL(error(QSerialPort::SerialPortError)), this, SLOT(error(QSerialPort::SerialPortError)));
connect(&_rs232Port, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64))); connect(&_rs232Port, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64)));
connect(&_rs232Port, SIGNAL(readyRead()), this, SLOT(readyRead())); connect(&_rs232Port, SIGNAL(readyRead()), this, SLOT(readyRead()));
_writeTimeout.setInterval(5000);
_writeTimeout.setSingleShot(true);
connect(&_writeTimeout, SIGNAL(timeout()), this, SLOT(writeTimeout()));
} }
bool ProviderRs232::init(const QJsonObject &deviceConfig) bool ProviderRs232::init(const QJsonObject &deviceConfig)
@ -61,11 +64,11 @@ QString ProviderRs232::findSerialDevice()
void ProviderRs232::bytesWritten(qint64 bytes) void ProviderRs232::bytesWritten(qint64 bytes)
{ {
_bytesWritten += bytes; _bytesToWrite -= bytes;
if (_bytesWritten >= _bytesToWrite) if (_bytesToWrite <= 0)
{ {
_bytesToWrite = 0;
_blockedForDelay = false; _blockedForDelay = false;
_writeTimeout.stop();
} }
} }
@ -132,11 +135,18 @@ ProviderRs232::~ProviderRs232()
void ProviderRs232::closeDevice() void ProviderRs232::closeDevice()
{ {
_writeTimeout.stop();
if (_rs232Port.isOpen()) if (_rs232Port.isOpen())
{ {
_rs232Port.close(); _rs232Port.close();
Debug(_log,"Close UART: %s", _deviceName.toLocal8Bit().constData()); Debug(_log,"Close UART: %s", _deviceName.toLocal8Bit().constData());
} }
_stateChanged = true;
_bytesToWrite = 0;
_blockedForDelay = false;
_deviceReady = false;
} }
int ProviderRs232::open() int ProviderRs232::open()
@ -225,7 +235,7 @@ int ProviderRs232::writeBytes(const qint64 size, const uint8_t * data)
QTimer::singleShot(500, this, SLOT(unblockAfterDelay())); QTimer::singleShot(500, this, SLOT(unblockAfterDelay()));
return -1; return -1;
} }
QTimer::singleShot(5000, this, SLOT(unblockAfterDelay())); _writeTimeout.start();
} }
else else
{ {
@ -235,6 +245,11 @@ int ProviderRs232::writeBytes(const qint64 size, const uint8_t * data)
return 0; return 0;
} }
void ProviderRs232::writeTimeout()
{
Error(_log, "Timeout on write data to %s", _deviceName.toLocal8Bit().constData());
closeDevice();
}
void ProviderRs232::unblockAfterDelay() void ProviderRs232::unblockAfterDelay()
{ {

5
libsrc/leddevice/dev_serial/ProviderRs232.h
View File

@ -45,6 +45,7 @@ private slots:
int rewriteLeds(); int rewriteLeds();
/// Unblock the device after a connection delay /// Unblock the device after a connection delay
void writeTimeout();
void unblockAfterDelay(); void unblockAfterDelay();
void error(QSerialPort::SerialPortError error); void error(QSerialPort::SerialPortError error);
void bytesWritten(qint64 bytes); void bytesWritten(qint64 bytes);
@ -84,12 +85,14 @@ protected:
/// The RS232 serial-device /// The RS232 serial-device
QSerialPort _rs232Port; QSerialPort _rs232Port;
/// A timeout timer for the asynchronous connection
QTimer _writeTimeout;
bool _blockedForDelay; bool _blockedForDelay;
bool _stateChanged; bool _stateChanged;
qint64 _bytesToWrite; qint64 _bytesToWrite;
qint64 _bytesWritten;
qint64 _frameDropCounter; qint64 _frameDropCounter;
QSerialPort::SerialPortError _lastError; QSerialPort::SerialPortError _lastError;
qint64 _preOpenDelayTimeOut; qint64 _preOpenDelayTimeOut;