Merge remote-tracking branch 'origin/master' into fixing_trainprogram_jitter

src/trainprogram.cpp

@@ -586,6 +586,17 @@ void trainprogram::scheduler() {
 
     QMutexLocker(&this->schedulerMutex);
     QSettings settings;
+    QDateTime now = QDateTime::currentDateTime();
+    qint64 msecsElapsed = lastSchedulerCall.msecsTo(now);
+
+    // Reset jitter if it's getting too large
+    if (qAbs(currentTimerJitter) > 5000) {
+        currentTimerJitter = 0;
+    }
+
+    currentTimerJitter += msecsElapsed - 1000;
+    lastSchedulerCall = now;
+
     // outside the if case about a valid train program because the information for the floating window url should be
     // sent anyway
     if (settings.value(QZSettings::peloton_companion_workout_ocr, QZSettings::default_companion_peloton_workout_ocr)
@@ -811,6 +822,7 @@ void trainprogram::scheduler() {
 #endif
         }
 
+        currentTimerJitter = 0;
         return;
     }
 
@@ -832,6 +844,20 @@ void trainprogram::scheduler() {
 #endif
 
     ticks++;
+    qDebug() << QStringLiteral("trainprogram ticks") << ticks << QStringLiteral("currentTimerJitter") << currentTimerJitter;
+
+    if(qAbs(currentTimerJitter) > 1000) {
+        // we are late...
+        if (currentTimerJitter > 1000) {
+            int seconds = currentTimerJitter / 1000;
+            ticks += seconds;
+            currentTimerJitter -= (seconds * 1000);
+            qDebug() << QStringLiteral("fixing jitter!") << seconds << ticks << currentTimerJitter;
+        } else {
+            // negative jitter, reset the counter without touching the ticks
+            currentTimerJitter = 0;
+        }
+    }
 
     double odometerFromTheDevice = bluetoothManager->device()->odometer();
 
@@ -1270,6 +1296,7 @@ void trainprogram::restart() {
     ticks = 0;
     offset = 0;
     currentStep = 0;
+    currentTimerJitter = 0;    
     started = true;
 }
 

src/trainprogram.h

@@ -168,6 +168,9 @@ private slots:
     int lastStepTimestampChanged = 0;
     double lastCurrentStepDistance = 0.0;
     QTime lastCurrentStepTime = QTime(0, 0, 0);
+    
+    int64_t currentTimerJitter = 0;
+    QDateTime lastSchedulerCall = QDateTime::currentDateTime();
 
     QUdpSocket* pelotonOCRsocket = nullptr;
     void pelotonOCRcomputeTime(QString t);