#855 Support for the Trixter X-Dream V1 bike

docs/10_Installation.md

@@ -8,7 +8,7 @@ Once you've installed QDomyos-Zwift, you can access the [operation guide](30_usa
 
 ```buildoutcfg
 $ sudo apt update && sudo apt upgrade # this is very important on raspberry pi: you need the bluetooth firmware updated!
-$ sudo apt install git qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qml-module* libqt5texttospeech5-dev libqt5texttospeech5 libqt5location5-plugins qtlocation5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5
+$ sudo apt install git qtquickcontrols2-5-dev libqt5serialport5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qml-module* libqt5texttospeech5-dev libqt5texttospeech5 libqt5location5-plugins qtlocation5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5
 $ git clone https://github.com/cagnulein/qdomyos-zwift.git
 $ cd qdomyos-zwift
 $ git submodule update --init src/smtpclient/
@@ -102,7 +102,7 @@ This operation takes a moment to complete.
 
 #### Install qdomyos-zwift from sources
 
-`sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 qtlocation5-dev qtquickcontrols2-5-dev libqt5texttospeech5-dev libqt5texttospeech5`
+`$ sudo apt install git qtquickcontrols2-5-dev libqt5serialport5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qml-module* libqt5texttospeech5-dev libqt5texttospeech5 libqt5location5-plugins qtlocation5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5`
 
 `git clone https://github.com/cagnulein/qdomyos-zwift.git`  
 `cd qdomyos-zwift`  

src/bluetooth.cpp

@@ -15,10 +15,6 @@ bluetooth::bluetooth(bool logs, const QString &deviceName, bool noWriteResistanc
                      uint32_t pollDeviceTime, bool noConsole, bool testResistance, uint8_t bikeResistanceOffset,
                      double bikeResistanceGain) {
     QSettings settings;
-    bool trx_route_key = settings.value(QStringLiteral("trx_route_key"), false).toBool();
-    bool bh_spada_2 = settings.value(QStringLiteral("bh_spada_2"), false).toBool();
-    bool technogym_myrun_treadmill_experimental =
-        settings.value(QStringLiteral("technogym_myrun_treadmill_experimental"), false).toBool();
 
     QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true"));
     filterDevice = deviceName;
@@ -48,6 +44,7 @@ bluetooth::bluetooth(bool logs, const QString &deviceName, bool noWriteResistanc
     connectedAndDiscovered();
     return;
 #endif
+
 #if !defined(WIN32) && !defined(Q_OS_IOS)
     if (QBluetoothLocalDevice::allDevices().isEmpty()) {
         debug(QStringLiteral("no bluetooth dongle found!"));
@@ -104,18 +101,48 @@ bluetooth::bluetooth(bool logs, const QString &deviceName, bool noWriteResistanc
         }
 #endif
 
-#ifndef Q_OS_IOS
-        if (!trx_route_key && !bh_spada_2 && !technogym_myrun_treadmill_experimental)
-#endif
-            discoveryAgent->start(QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
-#ifndef Q_OS_IOS
-        else
-            discoveryAgent->start(QBluetoothDeviceDiscoveryAgent::ClassicMethod |
-                                  QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
-#endif
+        this->startDiscovery();
     }
 }
 
+void bluetooth::nonBluetoothDeviceDiscovery() {
+    bluetoothdevice * nonBluetoothDevice = this->discoverNonBluetoothDevices();
+
+    if(nonBluetoothDevice) {
+        if(this->discoveryAgent) discoveryAgent->stop();
+        this->userTemplateManager->start(nonBluetoothDevice);
+        this->innerTemplateManager->start(nonBluetoothDevice);
+        emit this->deviceConnected(nonBluetoothDevice->bluetoothDevice);
+        connect(nonBluetoothDevice, &bluetoothdevice::connectedAndDiscovered, this, &bluetooth::connectedAndDiscovered);
+        this->connectedAndDiscovered();
+    }
+}
+
+bluetoothdevice * bluetooth::discoverNonBluetoothDevices() {
+    QSettings settings;
+
+    /*
+    Calling code expects the returned bluetoothdevice subclass object to have set fake bluetooth device info.
+
+    Do this in the class constructor as follows:
+    1. Go to a website and generate a Bluetooth UUID.
+    2. Set bluetoothdevice::bluetoothDevice as follows, using the UUID you have obtained, and a user-friendly name.
+
+        this->bluetoothDevice =
+            QBluetoothDeviceInfo(QBluetoothUuid {QStringLiteral("775f25bd-6636-4cdc-9398-839ae026be1d")}, "Device Name", 0);
+    */
+
+    // Try to connect to a Trixter X-Dream V1 bike if the setting is enabled.
+    this->trixterXDreamV1Bike = this->findTrixterXDreamV1Bike(settings);
+    if(this->trixterXDreamV1Bike)
+        return this->trixterXDreamV1Bike;
+
+    // Test for other devices
+
+    // nothing found
+    return nullptr;
+}
+
 bluetooth::~bluetooth() {
 
     /*if(device())
@@ -153,12 +180,11 @@ void bluetooth::finished() {
         powerSensorName.startsWith(QStringLiteral("Disabled")) && !power_as_bike && !power_as_treadmill;
     bool eliteRizerFound = eliteRizerName.startsWith(QStringLiteral("Disabled"));
     bool eliteSterzoSmartFound = eliteSterzoSmartName.startsWith(QStringLiteral("Disabled"));
-    bool trx_route_key = settings.value(QStringLiteral("trx_route_key"), false).toBool();
-    bool bh_spada_2 = settings.value(QStringLiteral("bh_spada_2"), false).toBool();
+
+
     bool heartRateBeltFound = heartRateBeltName.startsWith(QStringLiteral("Disabled"));
     bool ftmsAccessoryFound = ftmsAccessoryName.startsWith(QStringLiteral("Disabled"));
-    bool technogym_myrun_treadmill_experimental =
-        settings.value(QStringLiteral("technogym_myrun_treadmill_experimental"), false).toBool();
+
 
     // since i can have multiple fanfit i can't wait more because i don't have the full list of the fanfit
     // devices connected to QZ
@@ -172,18 +198,33 @@ void bluetooth::finished() {
         forceHeartBeltOffForTimeout = true;
     }
 
-#ifndef Q_OS_IOS
-    if (!trx_route_key && !bh_spada_2 && !technogym_myrun_treadmill_experimental) {
-#endif
-        discoveryAgent->start(QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
-#ifndef Q_OS_IOS
-    } else {
-        discoveryAgent->start(QBluetoothDeviceDiscoveryAgent::ClassicMethod |
-                              QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
-    }
-#endif
+    this->startDiscovery();
+}
+
+void bluetooth::startDiscovery() {
+
+    #ifndef Q_OS_IOS
+        QSettings settings;
+        bool technogym_myrun_treadmill_experimental =
+            settings.value(QStringLiteral("technogym_myrun_treadmill_experimental"), false).toBool();
+        bool trx_route_key = settings.value(QStringLiteral("trx_route_key"), false).toBool();
+        bool bh_spada_2 = settings.value(QStringLiteral("bh_spada_2"), false).toBool();
+
+        if (!trx_route_key && !bh_spada_2 && !technogym_myrun_treadmill_experimental) {
+    #endif
+            discoveryAgent->start(QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
+    #ifndef Q_OS_IOS
+        } else {
+            discoveryAgent->start(QBluetoothDeviceDiscoveryAgent::ClassicMethod |
+                                  QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
+        }
+    #endif
+
+
+    QTimer::singleShot(1, this, &bluetooth::nonBluetoothDeviceDiscovery);
 }
 
+
 void bluetooth::canceled() {
     debug(QStringLiteral("BTLE scanning stops"));
 
@@ -197,6 +238,23 @@ void bluetooth::debug(const QString &text) {
     }
 }
 
+
+trixterxdreamv1bike * bluetooth::findTrixterXDreamV1Bike(const QSettings& settings)
+{
+    bool trixterxdreamv1bikeEnabled = settings.value(trixterxdreamv1settings::keys::Enabled, false).toBool();
+    trixterxdreamv1bike * result = nullptr;
+    if(trixterxdreamv1bikeEnabled) {
+        debug("Looking for Trixter X-Dream V1 Bike");
+        result = trixterxdreamv1bike::tryCreate(this->noWriteResistance, this->noHeartService, false);
+        if(!result)
+            debug("Failed to find a Trixter X-Dream V1 Bike");
+    } else {
+        debug("Not looking for Trixter X-Dream V1 Bike - disabled in settings");
+    }
+
+    return result;
+}
+
 bool bluetooth::cscSensorAvaiable() {
 
     QSettings settings;
@@ -338,6 +396,8 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
     QString proformtreadmillip = settings.value(QStringLiteral("proformtreadmillip"), "").toString();
     QString nordictrack_2950_ip = settings.value(QStringLiteral("nordictrack_2950_ip"), "").toString();
 
+
+
     if (!heartRateBeltFound) {
 
         heartRateBeltFound = heartRateBeltAvaiable();
@@ -1918,9 +1978,8 @@ void bluetooth::restart() {
     QSettings settings;
 
     if (onlyDiscover) {
-
         onlyDiscover = false;
-        discoveryAgent->start();
+        this->startDiscovery();
         return;
     }
 
@@ -2356,7 +2415,11 @@ void bluetooth::restart() {
         delete eliteSterzoSmart;
         eliteSterzoSmart = nullptr;
     }
-    discoveryAgent->start();
+    if (trixterXDreamV1Bike) {
+        delete trixterXDreamV1Bike;
+        trixterXDreamV1Bike = nullptr;
+    }
+    this->startDiscovery();
 }
 
 bluetoothdevice *bluetooth::device() {
@@ -2507,7 +2570,10 @@ bluetoothdevice *bluetooth::device() {
         return fitPlusBike;
     } else if (skandikaWiriBike) {
         return skandikaWiriBike;
+    } else if (trixterXDreamV1Bike){
+        return trixterXDreamV1Bike;
     }
+
     return nullptr;
 }
 

src/bluetooth.h

@@ -98,6 +98,7 @@
 #include "templateinfosenderbuilder.h"
 #include "toorxtreadmill.h"
 #include "treadmill.h"
+#include "trixterxdreamv1bike.h"
 #include "truetreadmill.h"
 #include "trxappgateusbbike.h"
 #include "trxappgateusbtreadmill.h"
@@ -120,7 +121,23 @@ class bluetooth : public QObject, public SignalHandler {
     bool onlyDiscover = false;
     TemplateInfoSenderBuilder *getUserTemplateManager() const { return userTemplateManager; }
     TemplateInfoSenderBuilder *getInnerTemplateManager() const { return innerTemplateManager; }
+protected:
+    /**
+     * @brief startDiscovery Start the Bluetooth docscovery agent and the thread that discovers non-bluetooth devices.
+     */
+    void startDiscovery();
 
+    /**
+     * @brief discoverNonBluetoothDevices Discover non-bluetooth devices and create an object for the first.
+     * @return An object for the first non-bluetooth device found.
+     */
+    bluetoothdevice * discoverNonBluetoothDevices();
+
+    /**
+     * @brief nonBluetoothDeviceDiscovery Called by the non-bluetooth discovery thread to identify using
+     * discoverNonBluetoothDevices() and connect non-Bluetooth devices.
+     */
+    void nonBluetoothDeviceDiscovery();
   private:
     TemplateInfoSenderBuilder *userTemplateManager = nullptr;
     TemplateInfoSenderBuilder *innerTemplateManager = nullptr;
@@ -209,6 +226,7 @@ class bluetooth : public QObject, public SignalHandler {
     fakeelliptical *fakeElliptical = nullptr;
     QList<fitmetria_fanfit *> fitmetriaFanfit;
     QString filterDevice = QLatin1String("");
+    trixterxdreamv1bike * trixterXDreamV1Bike = nullptr;
 
     bool testResistance = false;
     bool noWriteResistance = false;
@@ -231,11 +249,18 @@ class bluetooth : public QObject, public SignalHandler {
     bool eliteSterzoSmartAvaiable();
     bool fitmetria_fanfit_isconnected(QString name);
 
+    /**
+     * @brief findTrixterXDreamV1Bike Searches serial ports for a Trixter X-Dream V1 Bike
+     * @param settings The application settings.
+     * @return A trixterxdreamv1bike object if a bike has been found, nullptr otherwise.
+     */
+    class trixterxdreamv1bike * findTrixterXDreamV1Bike(const QSettings& settings);
+
 #ifdef Q_OS_WIN
     QTimer discoveryTimeout;
 #endif
 
-  signals:
+signals:
     void deviceConnected(QBluetoothDeviceInfo b);
     void deviceFound(QString name);
     void searchingStop();
@@ -257,7 +282,8 @@ class bluetooth : public QObject, public SignalHandler {
     void inclinationChanged(double, double);
     void connectedAndDiscovered();
 
-  signals:
+signals:
+
 };
 
 #endif // BLUETOOTH_H

src/qdomyos-zwift.pro

@@ -2,6 +2,9 @@ QT += bluetooth widgets xml positioning quick networkauth websockets texttospeec
 QTPLUGIN += qavfmediaplayer
 QT+= charts
 
+windows: QT += serialport
+unix:!android: QT += serialport
+
 unix:android: QT += androidextras gui-private
 qtHaveModule(httpserver) {
     QT += httpserver
@@ -219,6 +222,10 @@ SOURCES += \
    stagesbike.cpp \
 	     toorxtreadmill.cpp \
 		  treadmill.cpp \
+    trixterxdreamv1bike.cpp \
+    trixterxdreamv1client.cpp \
+    trixterxdreamv1serial.cpp \
+    trixterxdreamv1settings.cpp \
    truetreadmill.cpp \
    trxappgateusbbike.cpp \
    ultrasportbike.cpp \
@@ -617,6 +624,10 @@ HEADERS += \
 	treadmill.h \
 	mainwindow.h \
 	trainprogram.h \
+    trixterxdreamv1bike.h \
+    trixterxdreamv1client.h \
+    trixterxdreamv1serial.h \
+    trixterxdreamv1settings.h \
    truetreadmill.h \
    trxappgateusbbike.h \
 	trxappgateusbtreadmill.h \