Solution to get Octane Zero Runner ZR8 Elliptical working with Zwift #1338

Author: cagnulein

.gitignore

@@ -48,3 +48,4 @@ google_test/*
 !build-qdomyos-zwift-Qt_*_for_iOS-Debug # Needed for Apple Watch
 src/inner_templates/googlemaps/cesium-key.js
 *.autosave
+.vscode/settings.json

src/octanetreadmill.cpp

@@ -174,6 +174,9 @@ octanetreadmill::octanetreadmill(uint32_t pollDeviceTime, bool noConsole, bool n
     actualPaceSign.append(0x23);
     actualPace2Sign.append(0x01);
     actualPace2Sign.append(0x23);
+    cadenceSign.append(0x2c);
+    cadenceSign.append(0x01);
+    cadenceSign.append(0x3A);
 
     m_watt.setType(metric::METRIC_WATT);
     Speed.setType(metric::METRIC_SPEED);
@@ -337,14 +340,28 @@ void octanetreadmill::characteristicChanged(const QLowEnergyCharacteristic &char
 
     emit packetReceived();
 
-    if (lastTimeCharacteristicChanged.secsTo(QDateTime::currentDateTime()) > 5) {
+    if (ZR8 == false && lastTimeCharacteristicChanged.secsTo(QDateTime::currentDateTime()) > 5) {
         emit debug(QStringLiteral("resetting speed"));
         Speed = 0;
+        Cadence = 0;
+    } else if(ZR8 == true && Speed.lastChanged().secsTo(QDateTime::currentDateTime()) > 15 && Cadence.lastChanged().secsTo(QDateTime::currentDateTime()) > 15) {
+        emit debug(QStringLiteral("resetting speed"));
+        Speed = 0;
+        Cadence = 0;
     }
 
     if ((newValue.length() != 20))
         return;
 
+    if(ZR8 && newValue.contains(cadenceSign)) {
+        int16_t i = newValue.indexOf(cadenceSign) + 3;
+
+        if (i >= newValue.length())
+            return;
+
+        Cadence = ((uint8_t)packet.at(i));
+    }
+
     if ((uint8_t)newValue[0] == 0xa5 && newValue[1] == 0x17)
         return;
 
@@ -368,8 +385,16 @@ void octanetreadmill::characteristicChanged(const QLowEnergyCharacteristic &char
     else
 #endif
     {
-        /*if(heartRateBeltName.startsWith("Disabled"))
-        Heart = value.at(18);*/
+#ifdef Q_OS_IOS
+#ifndef IO_UNDER_QT
+        lockscreen h;
+        long appleWatchHeartRate = h.heartRate();
+        h.setKcal(KCal.value());
+        h.setDistance(Distance.value());
+        Heart = appleWatchHeartRate;
+        debug("Current Heart from Apple Watch: " + QString::number(appleWatchHeartRate));
+#endif
+#endif
     }
     emit debug(QStringLiteral("Current speed: ") + QString::number(speed));
 
@@ -404,7 +429,9 @@ void octanetreadmill::characteristicChanged(const QLowEnergyCharacteristic &char
                      (1000.0 / (lastTimeCharacteristicChanged.msecsTo(QDateTime::currentDateTime()))));
     }
 
-    cadenceFromAppleWatch();
+    // ZR8 has builtin cadence sensor
+    if(!ZR8)
+        cadenceFromAppleWatch();
 
     emit debug(QStringLiteral("Current Distance Calculated: ") + QString::number(Distance.value()));
     emit debug(QStringLiteral("Current KCal: ") + QString::number(KCal.value()));
@@ -504,6 +531,12 @@ void octanetreadmill::deviceDiscovered(const QBluetoothDeviceInfo &device) {
                device.address().toString() + ')');
     {
         bluetoothDevice = device;
+
+        if(device.name().toUpper().startsWith(QLatin1String("ZR8"))) {
+            ZR8 = true;
+            qDebug() << "ZR8 workaround activated";
+        }
+
         m_control = QLowEnergyController::createCentral(bluetoothDevice, this);
         connect(m_control, &QLowEnergyController::serviceDiscovered, this, &octanetreadmill::serviceDiscovered);
         connect(m_control, &QLowEnergyController::discoveryFinished, this, &octanetreadmill::serviceScanDone);

src/octanetreadmill.h

@@ -66,6 +66,7 @@ class octanetreadmill : public treadmill {
 
     QByteArray actualPaceSign;
     QByteArray actualPace2Sign;
+    QByteArray cadenceSign;
 
     QTimer *refresh;
     virtualtreadmill *virtualTreadMill = nullptr;
@@ -77,6 +78,8 @@ class octanetreadmill : public treadmill {
     bool initDone = false;
     bool initRequest = false;
 
+    bool ZR8 = false;
+
   Q_SIGNALS:
     void disconnected();
     void debug(QString string);