DeerRun S500 Bike Integration (Issue #2932)

cagnulein · Dec 26, 2024 · c156cbf · c156cbf
1 parent 268be8e
commit c156cbf
Show file tree

Hide file tree

Showing 5 changed files with 604 additions and 1 deletion.
diff --git a/src/devices/bluetooth.cpp b/src/devices/bluetooth.cpp
@@ -2064,7 +2064,7 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
                 // SLOT(inclinationChanged(double)));
                 eslinkerTreadmill->deviceDiscovered(b);
                 this->signalBluetoothDeviceConnected(eslinkerTreadmill);
-            } else if (b.name().toUpper().startsWith(QStringLiteral("PITPAT")) && !deerrunTreadmill && filter) {
+            } else if (b.name().toUpper().startsWith(QStringLiteral("PITPAT-T")) && !deerrunTreadmill && filter) {
                 this->setLastBluetoothDevice(b);
                 this->stopDiscovery();
                 deerrunTreadmill = new deerruntreadmill(this->pollDeviceTime, noConsole, noHeartService);
@@ -2470,6 +2470,28 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
                     emit searchingStop();
                 }
                 this->signalBluetoothDeviceConnected(chronoBike);
+            } else if (b.name().toUpper().startsWith(QStringLiteral("PITPAT-S")) && !pitpatBike && filter) {
+                this->setLastBluetoothDevice(b);
+                this->stopDiscovery();
+                pitpatBike = new pitpatbike(noWriteResistance, noHeartService, bikeResistanceOffset,
+                                            bikeResistanceGain);
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+                stateFileRead();
+#endif
+                emit deviceConnected(b);
+                connect(pitpatBike, &bluetoothdevice::connectedAndDiscovered, this, &bluetooth::connectedAndDiscovered);
+                //connect(pitpatBike, &pitpatbike::debug, this, &bluetooth::debug);
+                // NOTE: Commented due to #358
+                // connect(chronoBike, SIGNAL(speedChanged(double)), this, SLOT(speedChanged(double)));
+                // NOTE: Commented due to #358
+                // connect(chronoBike, SIGNAL(inclinationChanged(double)), this, SLOT(inclinationChanged(double)));
+                pitpatBike->deviceDiscovered(b);
+                // NOTE: Commented due to #358
+                // connect(this, SIGNAL(searchingStop()), chronoBike, SLOT(searchingStop()));
+                if (this->discoveryAgent && !this->discoveryAgent->isActive()) {
+                    emit searchingStop();
+                }
+                this->signalBluetoothDeviceConnected(pitpatBike);
             }
         }
     }
@@ -3369,6 +3391,11 @@ void bluetooth::restart() {
         delete chronoBike;
         chronoBike = nullptr;
     }
+    if (pitpatBike) {
+
+        delete pitpatBike;
+        pitpatBike = nullptr;
+    }
     if (snodeBike) {
 
         delete snodeBike;
@@ -3662,6 +3689,8 @@ bluetoothdevice *bluetooth::device() {
         return inspireBike;
     } else if (chronoBike) {
         return chronoBike;
+    } else if (pitpatBike) {
+        return pitpatBike;
     } else if (m3iBike) {
         return m3iBike;
     } else if (snodeBike) {

diff --git a/src/devices/bluetooth.h b/src/devices/bluetooth.h
@@ -88,6 +88,7 @@
 #include "devices/pafersbike/pafersbike.h"
 #include "devices/paferstreadmill/paferstreadmill.h"
 #include "devices/pelotonbike/pelotonbike.h"
+#include "devices/pitpatbike/pitpatbike.h"
 #include "devices/proformbike/proformbike.h"
 #include "devices/proformelliptical/proformelliptical.h"
 #include "devices/proformellipticaltrainer/proformellipticaltrainer.h"
@@ -260,6 +261,7 @@ class bluetooth : public QObject, public SignalHandler {
     pafersbike *pafersBike = nullptr;
     paferstreadmill *pafersTreadmill = nullptr;
     tacxneo2 *tacxneo2Bike = nullptr;
+    pitpatbike *pitpatBike = nullptr;
     renphobike *renphoBike = nullptr;
     shuaa5treadmill *shuaA5Treadmill = nullptr;
     heartratebelt *heartRateBelt = nullptr;