Incorrect distance on QZ with Sole S77 treadmill #1781

cagnulein · Nov 10, 2023 · 2e0dde6 · 2e0dde6
1 parent 7b8c8ea
commit 2e0dde6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.cagnulen.qdomyoszwift" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionName="2.16.22" android:versionCode="656" android:installLocation="auto">
+<manifest package="org.cagnulen.qdomyoszwift" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionName="2.16.23" android:versionCode="657" android:installLocation="auto">
 <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
           Remove the comment if you do not require these default permissions. -->
 			<!-- %%INSERT_PERMISSIONS -->

diff --git a/src/main.qml b/src/main.qml
@@ -745,7 +745,7 @@ ApplicationWindow {
             }
 
             ItemDelegate {
-                text: "version 2.16.22"
+                text: "version 2.16.23"
                 width: parent.width
             }
 

diff --git a/src/qdomyos-zwift.pri b/src/qdomyos-zwift.pri
@@ -815,4 +815,4 @@ INCLUDEPATH += purchasing/inapp
 
 WINRT_MANIFEST = AppxManifest.xml
 
-VERSION = 2.16.22
+VERSION = 2.16.23
diff --git a/src/solef80treadmill.cpp b/src/solef80treadmill.cpp
@@ -604,6 +604,7 @@ void solef80treadmill::characteristicChanged(const QLowEnergyCharacteristic &cha
             emit debug(QStringLiteral("Current Average Speed: ") + QString::number(avgSpeed));
         }
 
+        QDateTime now = QDateTime::currentDateTime();
         if (Flags.totalDistance) {
             // ignoring the distance, because it's a total life odometer
             // Distance = ((double)((((uint32_t)((uint8_t)newValue.at(index + 2)) << 16) |
@@ -613,7 +614,7 @@ void solef80treadmill::characteristicChanged(const QLowEnergyCharacteristic &cha
         // else
         {
             Distance += ((Speed.value() / 3600000.0) *
-                         ((double)lastRefreshCharacteristicChanged.msecsTo(QDateTime::currentDateTime())));
+                         ((double)lastRefreshCharacteristicChanged.msecsTo(now)));
         }
 
         emit debug(QStringLiteral("Current Distance: ") + QString::number(Distance.value()));
@@ -658,7 +659,7 @@ void solef80treadmill::characteristicChanged(const QLowEnergyCharacteristic &cha
                       200.0) /
                      (60000.0 /
                       ((double)lastRefreshCharacteristicChanged.msecsTo(
-                          QDateTime::currentDateTime())))); //(( (0.048* Output in watts +1.19) * body weight in
+                          now)))); //(( (0.048* Output in watts +1.19) * body weight in
                                                             // kg * 3.5) / 200 ) / 60
         }
 
@@ -698,7 +699,7 @@ void solef80treadmill::characteristicChanged(const QLowEnergyCharacteristic &cha
             // todo
         }
 
-        lastRefreshCharacteristicChanged = QDateTime::currentDateTime();
+        lastRefreshCharacteristicChanged = now;
     }
 
     if (heartRateBeltName.startsWith(QStringLiteral("Disabled"))) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -815,4 +815,4 @@ INCLUDEPATH += purchasing/inapp

		WINRT_MANIFEST = AppxManifest.xml

		VERSION = 2.16.22
		VERSION = 2.16.23