fix: update Kickr Run incline from FTMS data

Author: root

src/devices/wahookickruntreadmill/wahookickruntreadmill.cpp

@@ -138,7 +138,32 @@ void wahookickruntreadmill::forceIncline(double requestIncline) {
 
     writeFTMSControlPoint(QByteArray(reinterpret_cast<const char *>(cmd), sizeof(cmd)),
                           QStringLiteral("forceIncline ") + QString::number(requestIncline));
-    Inclination = requestIncline;
+}
+
+wahookickruntreadmill::FtmsTreadmillData wahookickruntreadmill::parseFtmsTreadmillData(const QByteArray &data) {
+    FtmsTreadmillData parsed;
+    if (data.length() < 2)
+        return parsed;
+
+    const quint16 flags = static_cast<quint8>(data.at(0)) |
+                          (static_cast<quint16>(static_cast<quint8>(data.at(1))) << 8);
+    int index = 2;
+
+    // FTMS Treadmill Data fields are optional and ordered by the flags.
+    if (!(flags & 0x0001)) // Instantaneous Speed
+        index += 2;
+    if (flags & 0x0002) // Average Speed
+        index += 2;
+    if (flags & 0x0004) // Total Distance
+        index += 3;
+    if (!(flags & 0x0008) || data.length() < index + 2)
+        return parsed;
+
+    const quint16 rawInclination = static_cast<quint8>(data.at(index)) |
+                                  (static_cast<quint16>(static_cast<quint8>(data.at(index + 1))) << 8);
+    parsed.hasInclination = true;
+    parsed.inclination = static_cast<qint16>(rawInclination) / 10.0;
+    return parsed;
 }
 
 void wahookickruntreadmill::changeSpeed(double speed) {
@@ -247,6 +272,15 @@ void wahookickruntreadmill::characteristicChanged(const QLowEnergyCharacteristic
         return;
     }
 
+    if (characteristic.uuid() == QBluetoothUuid(static_cast<quint16>(0x2ACD))) {
+        const FtmsTreadmillData ftmsData = parseFtmsTreadmillData(newValue);
+        if (ftmsData.hasInclination) {
+            Inclination = ftmsData.inclination;
+            emit debug(QStringLiteral("KickRun inclination=") + QString::number(Inclination.value(), 'f', 1));
+        }
+        return;
+    }
+
     // --- Command/response channel (same char used for writes) ---
     // FE 86 01 [id0 id1 id2 id3] ... → store device ID, send 87+id
     if (len >= 7 && (uint8_t)newValue.at(0) == 0xFE && (uint8_t)newValue.at(1) == 0x86 &&

src/devices/wahookickruntreadmill/wahookickruntreadmill.h

@@ -48,7 +48,13 @@
 class wahookickruntreadmill : public treadmill {
     Q_OBJECT
   public:
+    struct FtmsTreadmillData {
+        bool hasInclination = false;
+        double inclination = 0.0;
+    };
+
     wahookickruntreadmill(bool noWriteResistance, bool noHeartService);
+    static FtmsTreadmillData parseFtmsTreadmillData(const QByteArray &data);
     bool connected() override;
     bool autoPauseWhenSpeedIsZero() override;
     bool autoStartWhenSpeedIsGreaterThenZero() override;

tst/Devices/TestWahooKickrRunParser.cpp

@@ -0,0 +1 @@
+#include "TestWahooKickrRunParser.h"

tst/Devices/TestWahooKickrRunParser.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <QByteArray>
+#include <gtest/gtest.h>
+
+#include "devices/wahookickruntreadmill/wahookickruntreadmill.h"
+
+TEST(WahooKickrRunFtmsRegressionTest, ParsesActualInclinationFromStephanLoggedTreadmillData) {
+    const auto onePercent = wahookickruntreadmill::parseFtmsTreadmillData(
+        QByteArray::fromHex("0c002c018d00000a00ff7f"));
+    const auto twoPercent = wahookickruntreadmill::parseFtmsTreadmillData(
+        QByteArray::fromHex("0c002c018f00001400ff7f"));
+
+    ASSERT_TRUE(onePercent.hasInclination);
+    EXPECT_NEAR(onePercent.inclination, 1.0, 0.001);
+    ASSERT_TRUE(twoPercent.hasInclination);
+    EXPECT_NEAR(twoPercent.inclination, 2.0, 0.001);
+}
+
+TEST(WahooKickrRunFtmsRegressionTest, HandlesTreadmillDataWithoutAnInclinationField) {
+    const auto data = wahookickruntreadmill::parseFtmsTreadmillData(
+        QByteArray::fromHex("00002c01"));
+
+    EXPECT_FALSE(data.hasInclination);
+}

tst/qdomyos-zwift-tests.pro

@@ -32,6 +32,7 @@ SOURCES += \
         Devices/TestZwiftRideController.cpp \
         Devices/TestApexBikeParser.cpp \
         Devices/TestKeepBikeParser.cpp \
+        Devices/TestWahooKickrRunParser.cpp \
         main.cpp
 
 # Avoid the "File too big" error building in Windows. This has happened when a template class is used with Google Test / typed tests
@@ -63,6 +64,7 @@ HEADERS += \
     Devices/TestSchwinn411510EParser.h \
     Devices/TestApexBikeParser.h \
     Devices/TestKeepBikeParser.h \
+    Devices/TestWahooKickrRunParser.h \
     Devices/TestOctaneTreadmillZR8.h \
     Devices/TestSunnyfitStepper.h \
     Erg/ergtabletestsuite.h \