t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight changes to serialworker to make things run a bit more stable.

Browse Source
This commit is contained in:
Collin Kidder
2016-02-07 16:05:41 -05:00
parent 05836129b3
commit 5de449b12b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serialworker.cpp
+8 -3
View File
@@ -132,7 +132,7 @@ void SerialWorker::connectionTimeout()
{ {
//then emit the the failure signal and see if anyone cares //then emit the the failure signal and see if anyone cares
qDebug() << "Failed to connect to GVRET at that com port"; qDebug() << "Failed to connect to GVRET at that com port";
ticker->stop(); //ticker->stop();
closeSerialPort(); //make sure it's properly closed anyway closeSerialPort(); //make sure it's properly closed anyway
emit connectionFailure(); emit connectionFailure();
} }
@@ -433,13 +433,14 @@ void SerialWorker::handleTick()
if (connected) if (connected)
{ {
if (!gotValidated) if (!gotValidated && doValidation)
{ {
if (serial == NULL) return; if (serial == NULL) return;
if (serial->isOpen()) //if it's still false we have a problem... if (serial->isOpen()) //if it's still false we have a problem...
{ {
qDebug() << "Comm validation failed. "; qDebug() << "Comm validation failed. ";
closeSerialPort(); //start by stopping everything. closeSerialPort(); //start by stopping everything.
//Then wait 500ms and restart the connection automatically
QTimer::singleShot(500, this, SLOT(handleReconnect())); QTimer::singleShot(500, this, SLOT(handleReconnect()));
return; return;
} }
@@ -451,7 +452,7 @@ void SerialWorker::handleTick()
emit frameUpdateTick(framesPerSec / 4, gotFrames); //sends stats to interested parties emit frameUpdateTick(framesPerSec / 4, gotFrames); //sends stats to interested parties
canModel->sendBulkRefresh(gotFrames); canModel->sendBulkRefresh(gotFrames);
gotFrames = 0; gotFrames = 0;
if (doValidation && serial) sendCommValidation(); if (doValidation && serial && serial->isOpen()) sendCommValidation();
} }
void SerialWorker::handleReconnect() void SerialWorker::handleReconnect()
@@ -467,6 +468,10 @@ void SerialWorker::sendCommValidation()
gotValidated = false; gotValidated = false;
output.append((char)0xF1); //another command to the GVRET output.append((char)0xF1); //another command to the GVRET
output.append((char)0x09); //request a reply to get validation output.append((char)0x09); //request a reply to get validation
//send it twice for good measure.
output.append((char)0xF1); //another command to the GVRET
output.append((char)0x09); //request a reply to get validation
serial->write(output); serial->write(output);
} }