Don't adjust speed by inclination when using PID (Issue #3254)

cagnulein · Feb 28, 2025 · 4b6611a · 4b6611a
1 parent 1a58636
commit 4b6611a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/src/homeform.cpp b/src/homeform.cpp
@@ -5443,7 +5443,8 @@ void homeform::update() {
                 delta = trainProgram->currentRow().loopTimeHR;
             }
 
-            if (bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL && 
+            if (bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL &&
+                !settings.value(QZSettings::trainprogram_pid_ignore_inclination, QZSettings::default_trainprogram_pid_ignore_inclination).toBool() &&
                 bluetoothManager->device()->currentInclination().value() != lastInclination && lastWattage != 0) {
                 last_seconds_pid_heart_zone = seconds;
 

diff --git a/src/qzsettings.cpp b/src/qzsettings.cpp
@@ -890,8 +890,9 @@ const QString QZSettings::proform_xbike = QStringLiteral("proform_xbike");
 const QString QZSettings::peloton_current_user_id = QStringLiteral("peloton_current_user_id");
 const QString QZSettings::default_peloton_current_user_id = QStringLiteral("");
 const QString QZSettings::proform_225_csx_PFEX32925_INT_0 = QStringLiteral("proform_225_csx_PFEX32925_INT_0");
+const QString QZSettings::trainprogram_pid_ignore_inclination = QStringLiteral("trainprogram_pid_ignore_inclination");
 
-const uint32_t allSettingsCount = 735;
+const uint32_t allSettingsCount = 736;
 
 QVariant allSettings[allSettingsCount][2] = {
     {QZSettings::cryptoKeySettingsProfiles, QZSettings::default_cryptoKeySettingsProfiles},
@@ -1641,6 +1642,7 @@ QVariant allSettings[allSettingsCount][2] = {
     {QZSettings::proform_xbike, QZSettings::default_proform_xbike},
     {QZSettings::peloton_current_user_id, QZSettings::default_peloton_current_user_id},
     {QZSettings::proform_225_csx_PFEX32925_INT_0, QZSettings::proform_225_csx_PFEX32925_INT_0},
+    {QZSettings::trainprogram_pid_ignore_inclination, QZSettings::default_trainprogram_pid_ignore_inclination},
 };
 
 void QZSettings::qDebugAllSettings(bool showDefaults) {

diff --git a/src/qzsettings.h b/src/qzsettings.h
@@ -2403,6 +2403,8 @@ class QZSettings {
     static const QString default_peloton_current_user_id;
     static const QString proform_225_csx_PFEX32925_INT_0;
     static constexpr bool default_proform_225_csx_PFEX32925_INT_0 = false;
+    static const QString trainprogram_pid_ignore_inclination;
+    static constexpr bool default_trainprogram_pid_ignore_inclination = false;
 
     /**
      * @brief Write the QSettings values using the constants from this namespace.

diff --git a/src/settings.qml b/src/settings.qml
@@ -1114,6 +1114,9 @@ import Qt.labs.platform 1.1
             property bool proform_xbike: false            
             property bool proform_225_csx_PFEX32925_INT_0: false
             property string peloton_current_user_id: ""
+
+            // 2.18.22
+            property bool trainprogram_pid_ignore_inclination: false
         }
 
         function paddingZeros(text, limit) {
@@ -5567,6 +5570,33 @@ import Qt.labs.platform 1.1
                         color: Material.color(Material.Lime)
                     }
 
+                    IndicatorOnlySwitch {
+                        text: qsTr("PID Ignore Inclination")
+                        spacing: 0
+                        bottomPadding: 0
+                        topPadding: 0
+                        rightPadding: 0
+                        leftPadding: 0
+                        clip: false
+                        checked: settings.trainprogram_pid_ignore_inclination
+                        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                        Layout.fillWidth: true
+                        onClicked: settings.trainprogram_pid_ignore_inclination = checked
+                    }
+
+                    Label {
+                        text: qsTr("Enabling this the PID will ignore the inclination changes. Default: Disabled.")
+                        font.bold: true
+                        font.italic: true
+                        font.pixelSize: Qt.application.font.pixelSize - 2
+                        textFormat: Text.PlainText
+                        wrapMode: Text.WordWrap
+                        verticalAlignment: Text.AlignVCenter
+                        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                        Layout.fillWidth: true
+                        color: Material.color(Material.Lime)
+                    }
+
                     RowLayout {
                         spacing: 10
                         Label {