Send disconnect command to bootloader

- send disconnect command to bootloader

Author: jciberlin

flasher.cpp

@@ -49,6 +49,7 @@ const char Flasher::VERSION_CMD[8] = "version";
 const char Flasher::BOARD_ID_CMD[9] = "board_id";
 const char Flasher::FLASH_FW_CMD[9] = "flash_fw";
 const char Flasher::CHECK_SIGNATURE_CMD[16] = "check_signature";
+const char Flasher::DISCONNECT_CMD[11] = "disconnect";
 
 void Worker::doWork()
 {
@@ -154,11 +155,11 @@ void Flasher::loopHandler()
                         isConnected = true;
 
                     } else {
-                        emit connectUsbToPc("Trying to connect!");
+                        emit showStatusMsg("Trying to connect!");
                     }
 
                 } else {
-                    emit connectUsbToPc("Trying to connect!");
+                    emit showStatusMsg("Trying to connect!");
                 }
 
                 if ((!isConnected) && (m_timerTryConnect.hasExpired(TRY_TO_CONNECT_TIMEOUT_IN_MS))) {
@@ -178,7 +179,7 @@ void Flasher::loopHandler()
 
         case FlasherStates::CONNECTED:
 
-            emit connectedSerialPort();
+            emit showStatusMsg("Connected");
             if(m_serialPort->isOpen()) {
                 getVersion();
 
@@ -193,12 +194,30 @@ void Flasher::loopHandler()
             break;
 
         case FlasherStates::DISCONNECTED:
+        {
+            bool isDisconnectedSuccess = true;
             m_isTryConnectStart = false;
-            m_serialPort->closeConn();
-            if(!(m_serialPort->isOpen())) {
-                emit disconnectedSerialPort();
+
+            if (m_serialPort->isOpen()) {
+
+                if (m_serialPort->isBootloaderDetected()) {
+                    isDisconnectedSuccess = this->sendDisconnectCmd();
+                }
+
+                m_serialPort->closeConn();
+            }
+
+            if (isDisconnectedSuccess) {
+                emit showStatusMsg("Disconnected");
+
+            } else {
+                emit showStatusMsg("Unplug board!");
             }
+
+            this->setState(FlasherStates::IDLE);
+
             break;
+        }
 
         case FlasherStates::BOARD_ID:
 
@@ -262,7 +281,14 @@ void Flasher::loopHandler()
             std::tuple<bool, QString, QString> flashingInfo = this->startFlash();
             this->showInfoMsgAtTheEndOfFlashing(std::get<1>(flashingInfo), std::get<2>(flashingInfo));
             emit clearProgress();
-            this->setState(FlasherStates::IDLE);
+
+            if (std::get<0>(flashingInfo)) {
+                m_serialPort->closeConn();
+                this->setState(FlasherStates::TRY_TO_CONNECT);
+
+            } else {
+                this->setState(FlasherStates::IDLE);
+            }
             break;
         }
 
@@ -627,3 +653,10 @@ void Flasher::showInfoMsgAtTheEndOfFlashing(const QString& title, const QString&
     msgBox.setStandardButtons(QMessageBox::Ok);
     msgBox.exec();
 }
+
+bool Flasher::sendDisconnectCmd()
+{
+    m_serialPort->write(DISCONNECT_CMD, sizeof(DISCONNECT_CMD));
+    m_serialPort->waitForReadyRead(SERIAL_TIMEOUT_IN_MS);
+    return checkAck();
+}

flasher.h

@@ -102,9 +102,7 @@ Q_OBJECT
 signals:
     void updateProgress(const qint64& dataPosition, const qint64& firmwareSize);
     void clearProgress();
-    void connectUsbToPc(const QString& text);
-    void connectedSerialPort();
-    void disconnectedSerialPort();
+    void showStatusMsg(const QString& text);
     void failedToConnect();
     void openSerialPortInThread();
     void closeSerialPortInThread();
@@ -118,6 +116,7 @@ public slots:
 
 private:
     void showInfoMsgAtTheEndOfFlashing(const QString& title, const QString& description);
+    bool sendDisconnectCmd();
 
     std::shared_ptr<SerialPort> m_serialPort;
     std::unique_ptr<QFile> m_fileFirmware;
@@ -159,6 +158,7 @@ public slots:
     static const char BOARD_ID_CMD[9];
     static const char FLASH_FW_CMD[9];
     static const char CHECK_SIGNATURE_CMD[16];
+    static const char DISCONNECT_CMD[11];
 };
 
 #endif // FLASHER_H

mainwindow.cpp

@@ -70,18 +70,7 @@ MainWindow::MainWindow(std::shared_ptr<Flasher> flasher, QWidget *parent) :
         m_ui->progressBar->setValue(0);
     });
 
-    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"));
-        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::showStatusMsg, this, [&] (const QString& text) { this->showStatusMessage(text); });
 
     connect(m_flasher.get(), &Flasher::failedToConnect, this, [&] (void) {
         this->showStatusMessage(tr("Failed to connect!"));