Delay in Virtual Gears with Tacx Neo 1 (Issue #2153)

cagnulein · Feb 25, 2024 · 102e1d6 · 102e1d6
1 parent 7170e28
commit 102e1d6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/devices/bike.cpp b/src/devices/bike.cpp
@@ -32,7 +32,8 @@ void bike::changeResistance(resistance_t resistance) {
 
 void bike::changeInclination(double grade, double percentage) {
     qDebug() << QStringLiteral("bike::changeInclination") << autoResistanceEnable << grade << percentage;
-    if (autoResistanceEnable) {
+    lastRawRequestedInclinationValue = grade;
+    if (autoResistanceEnable) {        
         requestInclination = grade;
     }
     emit inclinationChanged(grade, percentage);

diff --git a/src/devices/bike.h b/src/devices/bike.h
@@ -84,6 +84,7 @@ class bike : public bluetoothdevice {
 
     double m_gears = 0;
     resistance_t lastRawRequestedResistanceValue = -1;
+    double lastRawRequestedInclinationValue = -100;
     uint16_t LastCrankEventTime = 0;
     double CrankRevs = 0;
 

diff --git a/src/devices/tacxneo2/tacxneo2.cpp b/src/devices/tacxneo2/tacxneo2.cpp
@@ -120,26 +120,32 @@ void tacxneo2::update() {
             // updateDisplay(elapsed);
         }
 
+        auto virtualBike = this->VirtualBike();
+
         if (requestResistance != -1) {
             if (requestResistance != currentResistance().value() || lastGearValue != gears()) {
                 emit debug(QStringLiteral("writing resistance ") + QString::number(requestResistance));
-                auto virtualBike = this->VirtualBike();
                 if (((virtualBike && !virtualBike->ftmsDeviceConnected()) || !virtualBike) &&
                     (requestPower == 0 || requestPower == -1)) {
                     requestInclination = requestResistance / 10.0;
                 }
                 // forceResistance(requestResistance);;
-            }
-            lastGearValue = gears();
+            }            
             requestResistance = -1;
         }
         if (requestInclination != -100) {
             emit debug(QStringLiteral("writing inclination ") + QString::number(requestInclination));
             forceInclination(requestInclination + gears()); // since this bike doesn't have the concept of resistance,
                                                             // i'm using the gears in the inclination
-            requestInclination = -100;
+            requestInclination = -100;            
+        } else if((virtualBike && virtualBike->ftmsDeviceConnected()) && lastGearValue != gears() && lastRawRequestedInclinationValue != -100) {
+            // in order to send the new gear value ASAP
+            forceInclination(lastRawRequestedInclinationValue + gears());   // since this bike doesn't have the concept of resistance,
+                                                                            // i'm using the gears in the inclination
         }
 
+        lastGearValue = gears();
+
         if (requestPower != -1) {
             changePower(requestPower);
             requestPower = -1;