schwinn 170 fix

https://github.com/TrackMyIndoorWorkout/TrackMyIndoorWorkout/blob/eff6fc6529120aad3fd546338e9059aa9ff32d99/lib/devices/device_descriptors/schwinn_x70.dart#L61
cagnulein · Jun 4, 2024 · 61a6be9 · 61a6be9
1 parent 908cd7f
commit 61a6be9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/src/devices/schwinn170bike/schwinn170bike.cpp b/src/devices/schwinn170bike/schwinn170bike.cpp
@@ -133,6 +133,35 @@ void schwinn170bike::characteristicChanged(const QLowEnergyCharacteristic &chara
         return;
     }
 
+    if (newValue.length() == 17) {
+        double cadence_gain = settings.value(QZSettings::cadence_gain, QZSettings::default_cadence_gain).toDouble();
+        double cadence_offset = settings.value(QZSettings::cadence_offset, QZSettings::default_cadence_offset).toDouble();
+
+        if (settings.value(QZSettings::cadence_sensor_name, QZSettings::default_cadence_sensor_name)
+                .toString()
+                .startsWith(QStringLiteral("Disabled"))) {
+            double current = ((double)(((uint16_t)((uint8_t)newValue.at(5)) << 8) | (uint16_t)((uint8_t)newValue.at(4))));
+            if (current != lastCadenceValue) {
+                QDateTime now = QDateTime::currentDateTime();
+                double c = ((current - lastCadenceValue) / (now.msecsTo(lastCadenceChanged))) * 60000.0;
+                lastCadenceValue = current;
+                lastCadenceChanged = now;
+                if (c < 255) {
+                    if (c > 0)
+                        Cadence = (c * cadence_gain) + cadence_offset;
+                    else
+                        Cadence = 0;
+                } else {
+                    qDebug() << "Cadence too high" << c << "discarded!";
+                }
+            }
+        }
+
+        emit debug(QStringLiteral("Current Cadence: ") + QString::number(Cadence.value()));
+
+        return;
+    }
+
     if (newValue.length() != 14)
         return;
 
@@ -141,21 +170,6 @@ void schwinn170bike::characteristicChanged(const QLowEnergyCharacteristic &chara
     m_watt = ((double)(((uint16_t)((uint8_t)newValue.at(7)) << 8) | (uint16_t)((uint8_t)newValue.at(6)))) / 100.0;
     emit debug(QStringLiteral("Current Watt: ") + QString::number(m_watt.value()));
 
-    double cadence_gain = settings.value(QZSettings::cadence_gain, QZSettings::default_cadence_gain).toDouble();
-    double cadence_offset = settings.value(QZSettings::cadence_offset, QZSettings::default_cadence_offset).toDouble();
-
-    if (settings.value(QZSettings::cadence_sensor_name, QZSettings::default_cadence_sensor_name)
-            .toString()
-            .startsWith(QStringLiteral("Disabled"))) {
-        double c = ((double)(((uint16_t)((uint8_t)newValue.at(4)) << 8) | (uint16_t)((uint8_t)newValue.at(3)))) / 17.47;
-        if (c > 0)
-            Cadence = (c * cadence_gain) + cadence_offset;
-        else
-            Cadence = 0;
-    }
-
-    emit debug(QStringLiteral("Current Cadence: ") + QString::number(Cadence.value()));
-
     if (!settings.value(QZSettings::speed_power_based, QZSettings::default_speed_power_based).toBool()) {
         Speed = ((double)(((uint16_t)((uint8_t)newValue.at(4)) << 8) | (uint16_t)((uint8_t)newValue.at(3)))) / 100.0;
     } else {

diff --git a/src/devices/schwinn170bike/schwinn170bike.h b/src/devices/schwinn170bike/schwinn170bike.h
@@ -60,6 +60,9 @@ class schwinn170bike : public bike {
     QByteArray lastPacket;
     QDateTime lastRefreshCharacteristicChanged = QDateTime::currentDateTime();
     uint8_t firstStateChanged = 0;
+
+    double lastCadenceValue = 0;
+    QDateTime lastCadenceChanged = QDateTime::currentDateTime();
 
     bool initDone = false;
     bool initRequest = false;

diff --git a/src/ios/virtualbike_zwift.swift b/src/ios/virtualbike_zwift.swift
@@ -107,6 +107,8 @@ class BLEPeripheralManagerZwift: NSObject, CBPeripheralManagerDelegate {
   public var connected: Bool = false
 
   private var notificationTimer: Timer! = nil
+
+  let SwiftDebug = swiftDebug()
   //var delegate: BLEPeripheralManagerDelegate?
 
   init(disable_hr: Bool, garmin_bluetooth_compatibility: Bool) {