Merge pull request #1 from IMProject/pr-speed-up-firmware-file-selection

Speed up firmware file selection

Author: jciberlin

flasher.cpp

@@ -96,7 +96,7 @@ void Flasher::init()
     connect(this, &Flasher::runLoop, worker, &Worker::doWork);
     connect(worker, &Worker::flasherLoop, this, &Flasher::loopHandler);
     workerThread.start();
-    runLoop();
+    emit runLoop();
 }
 
 void Flasher::deinit()
@@ -245,7 +245,7 @@ void Flasher::loopHandler()
     }
 
     workerThread.msleep(SLEEP_TIME);
-    runLoop();
+    emit runLoop();
 }
 
 void  Flasher::startFlashingSlot()
@@ -551,7 +551,7 @@ void Flasher::deserialize32(uint8_t* buf, uint32_t* value)
     *value |= (uint32_t)(buf[3] << 0u);
 }
 
-void Flasher::setFilePath(QString filePath)
+void Flasher::setFilePath(const QString& filePath)
 {
     m_filePath = filePath;
 }
@@ -576,3 +576,7 @@ void Flasher::getVersion(void)
     emit textInBrowser(gitVersion);
     //qInfo() << gitVersion;
 }
+
+QThread& Flasher::getWorkerThread() {
+    return workerThread;
+}

flasher.h

@@ -97,10 +97,11 @@ Q_OBJECT
     void closeSerialPort();
     void actionOpenFirmwareFile();
     void deserialize32(uint8_t* buf, uint32_t* value);
-    void setFilePath(QString filePath);
+    void setFilePath(const QString& filePath);
     void setFlashWriteAddress(QByteArray setFlashWriteAddress);
     void sendFlashCommandToApp(void); //enter in bootlaoder
     void getVersion(void);
+    QThread& getWorkerThread();
 
 signals:
     void updateProgress(qint64 dataPosition, qint64 firmwareSize);

mainwindow.cpp

@@ -184,10 +184,14 @@ Flasher* MainWindow::getFlasherPtr()
 
 void MainWindow::on_selectFirmware_clicked()
 {
+    m_flasher->getWorkerThread().quit();
+
     QString filePath = QFileDialog::getOpenFileName(this,
             tr("Flight control binary"), "",
             tr("Binary (*.bin);;All Files (*)"));
 
+    m_flasher->init();
+
     m_flasher->setFilePath(filePath);
     m_flasher->actionOpenFirmwareFile();
 }