Merge pull request #1026 from esaulenka/LawicelFixes

Lawicel fixes

Author: collin80

connections/canconnection.cpp

@@ -42,15 +42,21 @@ CANConnection::CANConnection(QString pPort,
     if (pBusSpeed > 0) mBusData[0].mBus.setSpeed(pBusSpeed);
     mBusData[0].mBus.setCanFD(pCanFd);
     if (pDataRate > 0) {
-      mBusData[0].mBus.setDataRate(pDataRate);
-      if (pCanFd) {
-	mBusData[0].mBus.setCanFD(pCanFd);
-      }
+        mBusData[0].mBus.setDataRate(pDataRate);
+        if (pCanFd) {
+            mBusData[0].mBus.setCanFD(pCanFd);
+        }
     }
 
     /* if needed, create a thread and move ourself into it */
     if(pUseThread) {
         mThread_p = new QThread();
+        /* move ourself to the thread */
+        if (!moveToThread(mThread_p)) {
+            qWarning() << "CANConnection::start(): cannot moveToThread()";
+        }
+        /* start the thread */
+        mThread_p->start(QThread::HighPriority);
     }
 }
 
@@ -64,34 +70,23 @@ CANConnection::~CANConnection()
         delete mThread_p;
         mThread_p = nullptr;
     }
-
-    mBusData.clear();
 }
 
 
 void CANConnection::start()
 {
     if( mThread_p && (mThread_p != QThread::currentThread()) )
     {
-        /* move ourself to the thread */
-        moveToThread(mThread_p); /*TODO handle errors */
-        /* connect started() */
-        connect(mThread_p, SIGNAL(started()), this, SLOT(start()));
-        /* start the thread */
-        mThread_p->start(QThread::HighPriority);
+        QMetaObject::invokeMethod(this, "start",
+                                  Qt::BlockingQueuedConnection);
         return;
     }
 
     /* set started flag */
     mStarted = true;
 
     QSettings settings;
-
-    if (settings.value("Main/TimeClock", false).toBool())
-    {
-        useSystemTime = true;
-    }
-    else useSystemTime = false;
+    useSystemTime = settings.value("Main/TimeClock", false).toBool();
 
     /* in multithread case, this will be called before entering thread event loop */
     return piStarted();
@@ -115,25 +110,24 @@ void CANConnection::suspend(bool pSuspend)
 void CANConnection::stop()
 {
     /* 1) execute in mThread_p context */
-    if( mThread_p && mStarted && (mThread_p != QThread::currentThread()) )
+    if( mThread_p && (mThread_p != QThread::currentThread()) )
     {
         /* if thread is finished, it means we call this function for the second time so we can leave */
         if( !mThread_p->isFinished() )
         {
             /* we need to call piStop() */
             QMetaObject::invokeMethod(this, "stop",
                                       Qt::BlockingQueuedConnection);
-            /* 3) stop thread */
-            mThread_p->quit();
-            if(!mThread_p->wait()) {
-                qDebug() << "can't stop thread";
-            }
         }
         return;
     }
 
     /* 2) call piStop in mThread context */
-    return piStop();
+    if (mStarted)
+    {
+        piStop();
+    }
+    mStarted = false;
 }
 
 

connections/canconnection.h

@@ -212,7 +212,6 @@ public slots:
 protected:
     int mNumBuses; //protected to allow connected device to figure out how many buses are available
     QVector<BusData> mBusData;
-    bool mConsoleOutput; //send debugging info to the console?
     int mSerialSpeed;
 
     //determine if the passed frame is part of a filter or not.

connections/connectionwindow.cpp

@@ -599,14 +599,15 @@ void ConnectionWindow::saveConnections()
 
     /* save connections */
     foreach(CANConnection* conn_p, conns)
-      { CANBus bus;
+    {
+        CANBus bus;
 
         if (conn_p->getBusSettings(0, bus)) {
-          busSpeeds.append(bus.getSpeed());
-	  CanFds.append(bus.isCanFD() ? 1 : 0);
-	  DataRates.append(bus.getDataRate());
+            busSpeeds.append(bus.getSpeed());
+            CanFds.append(bus.isCanFD() ? 1 : 0);
+            DataRates.append(bus.getDataRate());
         }
-	serialSpeeds.append(conn_p->getSerialSpeed());
+        serialSpeeds.append(conn_p->getSerialSpeed());
         portNames.append(conn_p->getPort());
         devTypes.append(conn_p->getType());
         driverNames.append(conn_p->getDriver());

connections/gvretserial.cpp

@@ -7,6 +7,7 @@
 #include <QtNetwork>
 
 #include "gvretserial.h"
+#include "canconmanager.h"
 
 GVRetSerial::GVRetSerial(QString portName, bool useTcp) :
     CANConnection(portName, "gvret", CANCon::GVRET_SERIAL, 0, 0, false, 0, 3, 4000, true),
@@ -21,7 +22,6 @@ GVRetSerial::GVRetSerial(QString portName, bool useTcp) :
     rx_state = IDLE;
     rx_step = 0;
     validationCounter = 10; //how many times we can miss validation before we die
-    isAutoRestart = false;
     espSerialMode = true;
 
     timeBasis = 0;
@@ -236,8 +236,6 @@ bool GVRetSerial::piSendFrame(const CommFrame& frame)
 
     //qDebug() << "Sending out GVRET frame with id " << frame.ID << " on bus " << frame.bus;
 
-    framesRapid++;
-
     if (serial == nullptr && tcpClient == nullptr && udpClient == nullptr) return false;
     if (serial && !serial->isOpen()) return false;
     if (tcpClient && !tcpClient->isOpen()) return false;
@@ -307,16 +305,16 @@ void GVRetSerial::connectDevice()
         sendDebug("TCP Connection to a GVRET device");
         tcpClient = new QTcpSocket();
         tcpClient->connectToHost(getPort(), 23);
-        connect(tcpClient, SIGNAL(readyRead()), this, SLOT(readSerialData()));
-        connect(tcpClient, SIGNAL(connected()), this, SLOT(deviceConnected()));
+        connect(tcpClient, &QTcpSocket::readyRead, this, &GVRetSerial::readSerialData);
+        connect(tcpClient, &QTcpSocket::connected, this, &GVRetSerial::deviceConnected);
         sendDebug("Created TCP Socket");
         // */
         /*
         qDebug() << "UDP Connection to a GVRET device";
         udpClient = new QUdpSocket();
         udpClient->connectToHost(getPort(), 17222);
-        connect(udpClient, SIGNAL(readyRead()), this, SLOT(readSerialData()));
-        //connect(udpClient, SIGNAL(connected()), this, SLOT(tcpConnected()));
+        connect(udpClient, &QUdpSocket::readyRead, this, &GVRetSerial::readSerialData);
+        //connect(udpClient, &QUdpSocket::connected, this, &GVRetSerial::tcpConnected);
         debugOutput("Created UDP Socket");
         tcpConnected();
         */
@@ -331,8 +329,8 @@ void GVRetSerial::connectDevice()
         sendDebug("Created Serial Port Object");
 
         /* connect reading event */
-        connect(serial, SIGNAL(readyRead()), this, SLOT(readSerialData()));
-        connect(serial, SIGNAL(error(QSerialPort::SerialPortError)), this, SLOT(serialError(QSerialPort::SerialPortError)));
+        connect(serial, &QSerialPort::readyRead, this, &GVRetSerial::readSerialData);
+        connect(serial, &QSerialPort::errorOccurred, this, &GVRetSerial::serialError);
 
         /* configure */
         serial->setBaudRate(1000000); //most GVRET devices ignore baud, ESP32 needs it set explicitly to the proper value
@@ -350,7 +348,7 @@ void GVRetSerial::connectDevice()
             {
                 serial->setDataTerminalReady(false); //ESP32 uses these for bootloader selection and reset so turn them off
                 serial->setRequestToSend(false);                
-                QTimer::singleShot(3000, this, SLOT(deviceConnected())); //give ESP32 some time as it could have rebooted
+                QTimer::singleShot(3000, this, &GVRetSerial::deviceConnected); //give ESP32 some time as it could have rebooted
             }
         }
         else
@@ -410,7 +408,7 @@ void GVRetSerial::deviceConnected()
     sendToSerial(output);
 
     if(doValidation) {
-        QTimer::singleShot(5000, this, SLOT(connectionTimeout()));
+        QTimer::singleShot(5000, this, &GVRetSerial::connectionTimeout);
     }
     else {
         setStatus(CANCon::CONNECTED);
@@ -563,7 +561,7 @@ void GVRetSerial::connectionTimeout()
     else
     {
         /* start timer */
-        connect(&mTimer, SIGNAL(timeout()), this, SLOT(handleTick()));
+        connect(&mTimer, &QTimer::timeout, this, &GVRetSerial::handleTick);
         mTimer.setInterval(250); //tick four times per second
         mTimer.setSingleShot(false); //keep ticking
         mTimer.start();
@@ -943,13 +941,13 @@ void GVRetSerial::procRXChar(unsigned char c)
             stats.numHardwareBuses = mNumBuses;
             emit status(stats);
 
-            int can0Status = 0x78; //updating everything we can update
-            int can1Status = 0x78;
-            if (can0Enabled) can0Status +=1;
-            if (can0ListenOnly) can0Status += 4;
-            if (can1Enabled) can1Status += 1;
-            if (deviceSingleWireMode > 0) can1Status += 2;
-            if (can1ListenOnly) can1Status += 4;
+            // int can0Status = 0x78; //updating everything we can update
+            // int can1Status = 0x78;
+            // if (can0Enabled) can0Status +=1;
+            // if (can0ListenOnly) can0Status += 4;
+            // if (can1Enabled) can1Status += 1;
+            // if (deviceSingleWireMode > 0) can1Status += 2;
+            // if (can1ListenOnly) can1Status += 4;
             //emit busStatus(busBase, can0Baud & 0xFFFFF, can0Status);
             //emit busStatus(busBase + 1, can1Baud & 0xFFFFF, can1Status);
             break;
@@ -1122,7 +1120,7 @@ void GVRetSerial::handleTick()
 
                 disconnectDevice(); //start by stopping everything.
                 //Then wait 500ms and restart the connection automatically
-                //QTimer::singleShot(500, this, SLOT(connectDevice()));
+                //QTimer::singleShot(500, this, &GVRetSerial::connectDevice);
                 return;
             }
         }

connections/gvretserial.h

@@ -7,14 +7,8 @@
 #include <QTimer>
 #include <QTcpSocket>
 #include <QUdpSocket>
-
-/*************/
-#include <QDateTime>
-/*************/
-
-#include "canframemodel.h"
 #include "canconnection.h"
-#include "canconmanager.h"
+
 
 namespace SERIALSTATE {
 
@@ -80,18 +74,15 @@ private slots:
 
 protected:
     QTimer             mTimer;
-    QThread            mThread;
 
     bool doValidation;
     int validationCounter;
-    bool isAutoRestart;
     bool continuousTimeSync;
     bool useTcp;
     bool espSerialMode; //special serial mode for ESP32 based boards - no flow control and much slower serial baud speed
     QSerialPort *serial;
     QTcpSocket *tcpClient;
     QUdpSocket *udpClient;
-    int framesRapid;
     STATE rx_state;
     int rx_step;
     CommFrame buildFrame;