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

SerialBusConnection: Improve connect/disconnect handling

Browse Source 
* disconnectDevice() already checks mDev_p
* use the error description provided by QCanBus::createDevice()
This commit is contained in:
Andre Hartmann
2017-11-25 17:27:38 +01:00
parent 15aef1afbe
commit 84cb598a0d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/serialbusconnection.cpp
+4 -4
View File
@@ -67,8 +67,7 @@ void SerialBusConnection::piSetBusSettings(int pBusIdx, CANBus bus)
return; return;
/* disconnect device if we have one connected */ /* disconnect device if we have one connected */
if(mDev_p) disconnectDevice();
disconnectDevice();
/* copy bus config */ /* copy bus config */
setBusConfig(0, bus); setBusConfig(0, bus);
@@ -78,10 +77,11 @@ void SerialBusConnection::piSetBusSettings(int pBusIdx, CANBus bus)
return; return;
/* create device */ /* create device */
mDev_p = QCanBus::instance()->createDevice("socketcan", getPort()); QString errorString;
mDev_p = QCanBus::instance()->createDevice("socketcan", getPort(), &errorString);
if (!mDev_p) { if (!mDev_p) {
disconnectDevice(); disconnectDevice();
qDebug() << "can't create device"; qDebug() << "Error: createDevice(" << getType() << getPort() << "):" << errorString;
return; return;
} }