Implement try to connect functionality

- try to connect 20 seconds, after that time, display failed to connect message
- increase timeout in SerialPort::openConnBlocking() method to 20 seconds
- do not try to detect board if port is not opened

Author: jciberlin

flasher.cpp

@@ -60,14 +60,15 @@ Flasher::Flasher() :
         m_fileFirmware(std::make_unique<QFile>()),
         m_keysFile(std::make_shared<QFile>()),
         m_socketClient(std::make_unique<SocketClient>()),
-        m_state(FlasherStates::TRY_CONNECT),
+        m_state(FlasherStates::INIT),
         m_firmwareSize(0),
         m_tryOpen(false),
         m_isPortOpen(false),
         m_isSecureBoot(true),
         m_boardId(),
         m_boardKey(),
-        m_jsonObject()
+        m_jsonObject(),
+        m_isTryConnectStart(false)
 {
     m_keysFile->setFileName(KEY_FILE_NAME);
     m_keysFile->open(QIODevice::ReadWrite);
@@ -106,7 +107,7 @@ void Flasher::deinit()
 
 void Flasher::openSerialPort()
 {
-    this->setState(FlasherStates::PLUG_USB);
+    this->setState(FlasherStates::TRY_TO_CONNECT);
     m_tryOpen = true;
 }
 
@@ -119,35 +120,61 @@ void Flasher::closeSerialPort()
 void Flasher::loopHandler()
 {
     bool success;
-    bool manufacturer;
 
-    switch (m_state)
-    {
+    switch (m_state) {
 
         case FlasherStates::IDLE:
             if(m_fileFirmware->isOpen() && m_serialPort->isOpen()) {
                 emit readyToFlashId();
             }
             break;
 
-        case FlasherStates::TRY_CONNECT:
-            if(m_tryOpen) {
-                manufacturer = m_serialPort->tryOpenPort();
+        case FlasherStates::INIT:
 
-                if(!manufacturer) {
-                    this->setState(FlasherStates::PLUG_USB);
+            if (m_tryOpen) {
+
+                if (!(m_serialPort->tryOpenPort())) {
+                    this->setState(FlasherStates::TRY_TO_CONNECT);
                 }
             }
 
             break;
 
-        case FlasherStates::PLUG_USB:
-            emit connectUsbToPc();
-            m_serialPort->tryOpenPort();
-            if(m_serialPort->isOpen()) {
-                this->setState(FlasherStates::CONNECTED);
+        case FlasherStates::TRY_TO_CONNECT:
+        {
+            bool isConnected = false;
+
+            if (m_isTryConnectStart) {
+
+                if (m_serialPort->tryOpenPort()) {
+
+                    if (m_serialPort->isOpen()) {
+                        this->setState(FlasherStates::CONNECTED);
+                        m_isTryConnectStart = false;
+                        isConnected = true;
+
+                    } else {
+                        emit connectUsbToPc("Trying to connect!");
+                    }
+
+                } else {
+                    emit connectUsbToPc("Trying to connect!");
+                }
+
+                if ((!isConnected) && (m_timerTryConnect.hasExpired(TRY_TO_CONNECT_TIMEOUT_IN_MS))) {
+                    emit failedToConnect();
+                    this->setState(FlasherStates::INIT);
+                    m_tryOpen = false;
+                    m_isTryConnectStart = false;
+                }
+
+            } else {
+                m_isTryConnectStart = true;
+                m_timerTryConnect.start();
             }
+
             break;
+        }
 
         case FlasherStates::CONNECTED:
 
@@ -166,6 +193,7 @@ void Flasher::loopHandler()
             break;
 
         case FlasherStates::DISCONNECTED:
+            m_isTryConnectStart = false;
             m_serialPort->closeConn();
             if(!(m_serialPort->isOpen())) {
                 emit disconnectedSerialPort();
@@ -180,7 +208,7 @@ void Flasher::loopHandler()
                 this->setState(FlasherStates::BOARD_CHECK_REGISTRATION);
             } else {
                 emit textInBrowser("Board ID Error. Unplug your board, press disconnect/connect, and plug your board again.");
-                this->setState(FlasherStates::TRY_CONNECT);
+                this->setState(FlasherStates::INIT);
             }
 
             break;

flasher.h

@@ -38,12 +38,13 @@
 #include <QJsonObject>
 #include <QThread>
 #include <QFile>
+#include <QElapsedTimer>
 #include <socket.h>
 
 enum class FlasherStates {
     IDLE,
-    TRY_CONNECT,
-    PLUG_USB,
+    INIT,
+    TRY_TO_CONNECT,
     CONNECTED,
     DISCONNECTED,
     BOARD_ID,
@@ -101,9 +102,10 @@ Q_OBJECT
 signals:
     void updateProgress(const qint64& dataPosition, const qint64& firmwareSize);
     void clearProgress();
-    void connectUsbToPc();
+    void connectUsbToPc(const QString& text);
     void connectedSerialPort();
     void disconnectedSerialPort();
+    void failedToConnect();
     void openSerialPortInThread();
     void closeSerialPortInThread();
     void runLoop();
@@ -131,6 +133,8 @@ public slots:
     QString m_boardKey;
     QJsonObject m_jsonObject;
     QString m_filePath;
+    bool m_isTryConnectStart;
+    QElapsedTimer m_timerTryConnect;
 
     static constexpr qint64 SIGNATURE_SIZE {64};
     static constexpr int ERASE_TIMEOUT_IN_MS {5000};
@@ -143,6 +147,7 @@ public slots:
     static constexpr int BOARD_ID_SIZE_STRING {BOARD_ID_SIZE * 2};
     static constexpr int KEY_SIZE {32};
     static constexpr int KEY_SIZE_STRING {KEY_SIZE * 2};
+    static constexpr int TRY_TO_CONNECT_TIMEOUT_IN_MS {20000};
 
     static const QString KEY_FILE_NAME;
     static const QByteArray NOT_SECURED_MAGIC_STRING;

mainwindow.cpp

@@ -70,18 +70,25 @@ MainWindow::MainWindow(std::shared_ptr<Flasher> flasher, QWidget *parent) :
         m_ui->progressBar->setValue(0);
     });
 
-    connect(m_flasher.get(), &Flasher::connectUsbToPc, this, [&] (void) { this->showStatusMessage(tr("Reconnect board to PC")); });
+    connect(m_flasher.get(), &Flasher::connectUsbToPc, this, [&] (const QString& text) { this->showStatusMessage(text); });
 
     connect(m_flasher.get(), &Flasher::connectedSerialPort, this, [&] (void) {
         this->showStatusMessage(tr("Connected"));
-        this->openSerialPortUi();
+        m_ui->actionConnect->setEnabled(false);
+        m_ui->actionDisconnect->setEnabled(true);
     });
 
     connect(m_flasher.get(), &Flasher::disconnectedSerialPort, this, [&] (void) {
         this->showStatusMessage(tr("Disconnected"));
         this->closeSerialPortUi();
     });
 
+    connect(m_flasher.get(), &Flasher::failedToConnect, this, [&] (void) {
+        this->showStatusMessage(tr("Failed to connect!"));
+        m_ui->actionConnect->setEnabled(true);
+        m_ui->actionDisconnect->setEnabled(false);
+    });
+
     connect(m_flasher.get(), &Flasher::textInBrowser, this, [&] (const auto& text) { m_ui->textBrowser->append(text); });
 
     connect(m_flasher.get(), &Flasher::isBootloader, this, &MainWindow::isBootloaderUi);

serial_port.cpp

@@ -35,6 +35,7 @@
 #include "serial_port.h"
 #include <QDebug>
 #include <QSerialPortInfo>
+#include <QElapsedTimer>
 
 const char SerialPort::SOFTWARE_TYPE_CMD[14] = "software_type";
 const QString SerialPort::MANUFACT_IMBOOT = "IMBOOT";
@@ -46,12 +47,8 @@ const QString SerialPort::SW_TYPE_IMAPP = "IMApplication";
 SerialPort::SerialPort()
     : m_settings(std::make_unique<SettingsDialog>()),
       m_isOpen(false),
-      m_timer(new QTimer),
       m_isBootlaoder(false)
 {
-    m_timer.setSingleShot(true);
-    m_timer.setInterval(TIMER_TIMEOUT_IN_MS);
-    m_timer.start();
 }
 
 void SerialPort::openConn()
@@ -74,9 +71,13 @@ void SerialPort::openConn()
 
 void SerialPort::openConnBlocking()
 {
-    while(!m_isOpen) {
+    QElapsedTimer timer;
+    timer.start();
+
+    while (!m_isOpen) {
         tryOpenPort();
-        if(m_timer.remainingTime() == 0){
+
+        if (timer.hasExpired(TIMER_TIMEOUT_IN_MS)) {
             qInfo() << "Timeout";
             break;
         }
@@ -127,13 +128,14 @@ bool SerialPort::tryOpenPort()
         if(success) {
             openConn();
 
-            // For Microsoft, we can't be sure if we are connected to the proper board so we need to check this.
-            bool isBoardDetected = detectBoard();
-            if(isBoardDetected) {
-                // we are connected to proper board, exit for loop
-                break;
-            } else {
-                if(m_isOpen) {
+            if (m_isOpen) {
+
+                // For Microsoft, we can't be sure if we are connected to the proper board so we need to check this.
+                if (detectBoard()) {
+                    // we are connected to proper board, exit for loop
+                    break;
+
+                } else {
                     closeConn();
                 }
             }

serial_port.h

@@ -36,7 +36,6 @@
 #define SERIAL_PORT_H
 
 #include <QSerialPort>
-#include <QTimer>
 #include "settingsdialog.h"
 
 class SerialPort : public QSerialPort {
@@ -58,10 +57,9 @@ class SerialPort : public QSerialPort {
     std::unique_ptr<SettingsDialog> m_settings;
     bool m_isOpen;
     SettingsDialog::Settings m_port;
-    QTimer m_timer;
     bool m_isBootlaoder;
 
-    static constexpr int TIMER_TIMEOUT_IN_MS {10000};
+    static constexpr int TIMER_TIMEOUT_IN_MS {20000};
     static constexpr int SERIAL_TIMEOUT_IN_MS {100};
     static const char SOFTWARE_TYPE_CMD[14];
     static const QString MANUFACT_IMBOOT;