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

Fix automatic loading of connections on start up. Shouldn't crash

Browse Source 
now...
This commit is contained in:
Collin Kidder
2019-02-17 15:15:48 -05:00
parent f6269dd5f4
commit 3291869849
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/gvretserial.cpp
+7 -2
View File
@@ -344,7 +344,7 @@ void GVRetSerial::connectDevice()
serial->setFlowControl(serial->NoFlowControl);
if (!serial->open(QIODevice::ReadWrite))
{
sendDebug("Error returned during port opening: " + serial->errorString());
//sendDebug("Error returned during port opening: " + serial->errorString());
}
else
{
@@ -359,7 +359,7 @@ void GVRetSerial::connectDevice()
serial->setFlowControl(serial->HardwareControl); //Most GVRET style devices use hardware flow control
if (!serial->open(QIODevice::ReadWrite))
{
sendDebug("Error returned during port opening: " + serial->errorString());
//sendDebug("Error returned during port opening: " + serial->errorString());
}
else
{
@@ -473,14 +473,17 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
case QSerialPort::DeviceNotFoundError:
errMessage = "Device not found error on serial";
killConnection = true;
piStop();
break;
case QSerialPort::PermissionError:
errMessage = "Permission error on serial port";
killConnection = true;
piStop();
break;
case QSerialPort::OpenError:
errMessage = "Open error on serial port";
killConnection = true;
piStop();
break;
case QSerialPort::ParityError:
errMessage = "Parity error on serial port";
@@ -500,6 +503,7 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
case QSerialPort::ResourceError:
errMessage = "Serial port seems to have disappeared.";
killConnection = true;
piStop();
break;
case QSerialPort::UnsupportedOperationError:
errMessage = "Unsupported operation on serial port";
@@ -516,6 +520,7 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
case QSerialPort::NotOpenError:
errMessage = "The serial port isn't open";
killConnection = true;
piStop();
break;
}
/*