Merge pull request #497 from deXol/develop

Make sure init messages are called first with a TimerJob

Author: limpkin

src/MPDevice.cpp

@@ -140,34 +140,31 @@ void MPDevice::setupMessageProtocol()
 
 void MPDevice::sendInitMessages()
 {
-    statusTimer->start(500);
-    QTimer::singleShot(100, [this]() {
-        if (isBLE())
+    statusTimer->start(STATUS_STARTING_DELAY);
+    addTimerJob(INIT_STARTING_DELAY);
+    if (isBLE())
+    {
+        /**
+          * Reset Flip Bit is written directly to device
+          * so TimerJob has no effect, hence sending
+          * it with a lower timeout.
+          */
+        QTimer::singleShot(INIT_STARTING_DELAY/2, [this]()
         {
             if (AppDaemon::isDebugDev())
                 qDebug() << "Resetting flip bit for BLE";
-
             bleImpl->sendResetFlipBit();
-            if (bleImpl->isAfterAuxFlash())
-            {
-                qDebug() << "Fixing communication with device after Aux Flash";
-                writeCancelRequest();
-            }
-            bleImpl->getPlatInfo();
-        }
+        });
 
-        exitMemMgmtMode(false);
-        //TODO Remove when GET_MOOLTIPASS_PARM implemented for BLE
-        /**
-          * Temporary solution until GET_MOOLTIPASS_PARM
-          * is not implemented for the ble device we do not
-          * get if BLE is detected.
-          */
-        if (isBLE())
+        if (bleImpl->isAfterAuxFlash())
         {
-            flashMbSizeChanged(0);
+            qDebug() << "Fixing communication with device after Aux Flash";
+            writeCancelRequest();
         }
-    });
+        bleImpl->getPlatInfo();
+    }
+
+    exitMemMgmtMode(false);
 }
 
 void MPDevice::sendData(MPCmd::Command c, const QByteArray &data, quint32 timeout, MPCommandCb cb, bool checkReturn)
@@ -500,6 +497,14 @@ void MPDevice::runAndDequeueJobs()
     currentJobs->start();
 }
 
+void MPDevice::addTimerJob(int msec)
+{
+    auto *waitingJob = new AsyncJobs(QString("Waiting job"), this);
+    waitingJob->append(new TimerJob{msec});
+    jobsQueue.enqueue(waitingJob);
+    runAndDequeueJobs();
+}
+
 void MPDevice::updateFilesCache()
 {
     getStoredFiles([this](bool success, QList<QVariantMap> files)

src/MPDevice.h

@@ -232,6 +232,7 @@ private slots:
     /* Platform function for writing data, should be implemented in platform class */
     virtual void platformWrite(const QByteArray &data) { Q_UNUSED(data); }
 
+    void addTimerJob(int msec);
     void loadLoginNode(AsyncJobs *jobs, const QByteArray &address,
                        const MPDeviceProgressCb &cbProgress);
     void loadLoginChildNode(AsyncJobs *jobs, MPNode *parent, MPNode *parentClone, const QByteArray &address);
@@ -433,6 +434,8 @@ private slots:
         EXPORT_IS_BLE_INDEX = 14,
         EXPORT_BLE_USER_CATEGORIES_INDEX = 15
     };
+    static constexpr int STATUS_STARTING_DELAY = 500;
+    static constexpr int INIT_STARTING_DELAY = 300;
 };
 
 #endif // MPDEVICE_H