Treadmill Modbus GPIO

.github/workflows/main.yml

@@ -88,7 +88,7 @@ jobs:
 
       - uses: msys2/setup-msys2@v2
         with:
-          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-qt5-webview
+          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-qt5-webview mingw-w64-x86_64-protobuf mingw-w64-x86_64-abseil-cpp
           msystem: mingw64
           release: false
 
@@ -135,6 +135,10 @@ jobs:
 
       - name: Build
         run: |
+            #cp "C:/mingw64/bin/libabsl*.*" .
+            #cp "C:/mingw64/lib/libabsl*.*" .
+            #cp "C:/mingw64/bin/libproto*.*" .
+            #cp "C:/mingw64/lib/libproto*.*" .            
             qmake
             make -j8
             cd src/debug
@@ -146,6 +150,11 @@ jobs:
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
             cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
             cp "C:/mingw64/bin/libstdc++-6.dll" .
+            cp "C:/mingw64/bin/zlib1.dll" .
+            cp "C:/mingw64/bin/libabsl*.*" .
+            cp "C:/mingw64/lib/libabsl*.*" .
+            cp "C:/mingw64/bin/libproto*.*" .
+            cp "C:/mingw64/lib/libproto*.*" .            
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../windows/*.py .
@@ -162,6 +171,10 @@ jobs:
 
       - name: Build without python
         run: |
+            #cp "C:/mingw64/bin/libabsl*.*" .
+            #cp "C:/mingw64/lib/libabsl*.*" .
+            #cp "C:/mingw64/bin/libproto*.*" .
+            #cp "C:/mingw64/lib/libproto*.*" .                    
             qmake
             make -j8
             cd src/debug
@@ -173,6 +186,11 @@ jobs:
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
             cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
             cp "C:/mingw64/bin/libstdc++-6.dll" .
+            cp "C:/mingw64/bin/zlib1.dll" .
+            cp "C:/mingw64/bin/libabsl*.*" .
+            cp "C:/mingw64/lib/libabsl*.*" .
+            cp "C:/mingw64/bin/libproto*.*" .
+            cp "C:/mingw64/lib/libproto*.*" .                  
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../../windows_openssl/*.* .
@@ -406,14 +424,14 @@ jobs:
           path: "src/qthttpserver"
 
       - name: Install packages required to run QZ inside workflow
-        run: sudo apt update -y && sudo apt-get install -y qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 libqt5networkauth5-dev libqt5websockets5* libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev
+        run: sudo apt update -y && sudo apt-get install -y qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 libqt5networkauth5-dev libqt5serialbus* libqt5websockets5* libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev  cmake protobuf-compiler libprotobuf-dev
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: '5.15.2'
           host: 'linux'
-          modules: 'qtnetworkauth qtcharts'
+          modules: 'qtnetworkauth qtcharts qtserial'
           cache: 'true'
           cache-key-prefix: 'install-qt-action-linux'                    
 
@@ -824,8 +842,23 @@ jobs:
           echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
           cd ..        
 
+      - name: Clone vcpkg
+        run: git clone https://github.com/microsoft/vcpkg.git
+        working-directory: ${{ runner.workspace }}
+
+      - name: Bootstrap vcpkg
+        run: .\vcpkg\bootstrap-vcpkg.bat
+        working-directory: ${{ runner.workspace }}
+
+      - name: Install dependencies
+        run: .\vcpkg\vcpkg install protobuf protobuf-c abseil
+        working-directory: ${{ runner.workspace }}
+
       - name: Build
         run: |
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose           
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
             qmake            
             nmake
             cd src/debug
@@ -839,6 +872,7 @@ jobs:
             cp ../../windows/*.py .
             cp ../../windows/*.bat .
             cp ../../../windows_openssl/*.* .
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\bin\*.* -Destination . -Verbose
             mkdir adb
             mkdir python
             Copy-Item -Path C:\hostedtoolcache\windows\Python\3.7.9\x64 -Destination python -Recurse
@@ -849,7 +883,10 @@ jobs:
         if: matrix.config.python
 
       - name: Build without python
-        run: |
+        run: |          
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose      
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
             qmake           
             nmake
             cd src/debug
@@ -860,10 +897,11 @@ jobs:
             windeployqt --qmldir ../../ qdomyos-zwift.exe
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
             cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
-            cp "C:/mingw64/bin/libstdc++-6.dll" .
+            cp "C:/mingw64/bin/libstdc++-6.dll" .              
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../../windows_openssl/*.* .
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\bin\*.* -Destination . -Verbose
             mkdir adb
             cp ../../adb/* adb/
             cd ..
@@ -930,6 +968,19 @@ jobs:
           repository: qt-labs/qthttpserver
           path: "src/qthttpserver"      
 
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Download protobuf
+        run: |
+          Invoke-WebRequest -Uri "https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.zip" -OutFile "protobuf.zip"
+          Expand-Archive protobuf.zip -DestinationPath "protobuf"
+          cd protobuf/protobuf-25.1
+          Invoke-WebRequest -Uri "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.zip" -OutFile "abseil-cpp.zip"
+          Expand-Archive  abseil-cpp.zip -DestinationPath "abseil-temp"
+          cp abseil-temp/abseil-cpp-20230802.1/* third_party/abseil-cpp/                    
+          cmake -Dprotobuf_BUILD_TESTS=OFF CMakeLists.txt
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:

src/ConsoleReader.cpp

@@ -0,0 +1,89 @@
+//#if defined(Q_OS_LINUX)
+#if 1
+#include "ConsoleReader.h"
+#include <stdio.h>
+#include <termios.h>
+#include <unistd.h>
+
+static struct termios oldSettings;
+static struct termios newSettings;
+
+/* Initialize new terminal i/o settings */
+void initTermios(int echo) {
+    tcgetattr(0, &oldSettings);                 /* grab old terminal i/o settings */
+    newSettings = oldSettings;                  /* make new settings same as old settings */
+    newSettings.c_lflag &= ~ICANON;             /* disable buffered i/o */
+    newSettings.c_lflag &= echo ? ECHO : ~ECHO; /* set echo mode */
+    tcsetattr(0, TCSANOW, &newSettings);        /* use these new terminal i/o settings now */
+}
+
+/* Restore old terminal i/o settings */
+void resetTermios(void) { tcsetattr(0, TCSANOW, &oldSettings); }
+
+/* Read 1 character without echo */
+char getch(void) { return getchar(); }
+
+ConsoleReader::ConsoleReader(bluetooth *bt) {
+    bluetoothManager = bt;
+    initTermios(0);
+}
+
+ConsoleReader::~ConsoleReader() { resetTermios(); }
+
+void ConsoleReader::run() {
+    forever {
+        char key = getch();
+        qDebug() << "key pressed" << key;
+        if (key == 'q') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double speed = ((treadmill *)bluetoothManager->device())->currentSpeed().value();
+                ((treadmill *)bluetoothManager->device())->changeSpeed(speed + 0.5);
+            }
+        } else if (key == 'w') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double speed = ((treadmill *)bluetoothManager->device())->currentSpeed().value();
+                ((treadmill *)bluetoothManager->device())->changeSpeed(speed - 0.5);
+            }
+        } else if (key == 'a') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double inclination = ((treadmill *)bluetoothManager->device())->currentInclination().value();
+                ((treadmill *)bluetoothManager->device())->changeInclination(inclination + 0.5, inclination + 0.5);
+            }
+        } else if (key == 's') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double inclination = ((treadmill *)bluetoothManager->device())->currentInclination().value();
+                ((treadmill *)bluetoothManager->device())->changeInclination(inclination - 0.5, inclination - 0.5);
+            }
+        } else if (key == '1') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                ((treadmill *)bluetoothManager->device())->changeSpeed(5);
+            }
+        } else if (key == '2') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double inclination = ((treadmill *)bluetoothManager->device())->currentInclination().value();
+                ((treadmill *)bluetoothManager->device())->changeInclination(inclination + 0.5, inclination + 0.5);
+            }
+        } else if (key == '3') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                ((treadmill *)bluetoothManager->device())->changeSpeed(10);
+            }
+        } else if (key == '4') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double speed = ((treadmill *)bluetoothManager->device())->currentSpeed().value();
+                ((treadmill *)bluetoothManager->device())->changeSpeed(speed - 0.5);
+            }
+        } else if (key == '5') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double inclination = ((treadmill *)bluetoothManager->device())->currentInclination().value();
+                ((treadmill *)bluetoothManager->device())->changeInclination(inclination - 0.5, inclination - 0.5);
+            }
+        } else if (key == '6') {
+            if (bluetoothManager->device() && bluetoothManager->device()->deviceType() == bluetoothdevice::TREADMILL) {
+                double speed = ((treadmill *)bluetoothManager->device())->currentSpeed().value();
+                ((treadmill *)bluetoothManager->device())->changeSpeed(speed + 0.5);
+            }
+        }
+        emit KeyPressed(key);
+    }
+}
+#endif

src/ConsoleReader.h

@@ -0,0 +1,21 @@
+#ifndef CONSOLEREADER_H
+#define CONSOLEREADER_H
+
+#include "bluetooth.h"
+#include <QThread>
+
+class ConsoleReader : public QThread {
+    Q_OBJECT
+  signals:
+    void KeyPressed(char ch);
+
+  public:
+    ConsoleReader(bluetooth *bt);
+    ~ConsoleReader();
+    void run();
+
+  private:
+    bluetooth *bluetoothManager;
+};
+
+#endif /* CONSOLEREADER_H */

src/Home.qml

@@ -23,6 +23,13 @@ HomeForm{
     signal plus_clicked(string name)
     signal minus_clicked(string name)
     signal largeButton_clicked(string name)
+    signal keyPressed(int key)
+
+    Keys.onPressed: (event)=> {
+        console.log("Keys.onPressed " + event.key)
+        // Emit a signal with the pressed key
+        keyPressed(event.key)
+    }
 
     Settings {
         id: settings

src/devices/bluetooth.cpp

@@ -110,6 +110,7 @@ void bluetooth::finished() {
     QString nordictrack_2950_ip =
         settings.value(QZSettings::nordictrack_2950_ip, QZSettings::default_nordictrack_2950_ip).toString();
     QString tdf_10_ip = settings.value(QZSettings::tdf_10_ip, QZSettings::default_tdf_10_ip).toString();
+    bool gpio_treadmill = settings.value(QStringLiteral("gpio_treadmill"), false).toBool();
     bool fake_bike =
         settings.value(QZSettings::applewatch_fakedevice, QZSettings::default_applewatch_fakedevice).toBool();
     bool fakedevice_elliptical =
@@ -118,7 +119,7 @@ void bluetooth::finished() {
     bool fakedevice_treadmill =
         settings.value(QZSettings::fakedevice_treadmill, QZSettings::default_fakedevice_treadmill).toBool();
     // wifi devices on windows
-    if (!nordictrack_2950_ip.isEmpty() || !tdf_10_ip.isEmpty() || fake_bike || fakedevice_elliptical || fakedevice_rower || fakedevice_treadmill) {
+    if (!nordictrack_2950_ip.isEmpty() || !tdf_10_ip.isEmpty() || fake_bike || fakedevice_elliptical || fakedevice_rower || fakedevice_treadmill || gpio_treadmill) {
         // faking a bluetooth device
         qDebug() << "faking a bluetooth device for nordictrack_2950_ip";
         deviceDiscovered(QBluetoothDeviceInfo());
@@ -409,6 +410,7 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
         powerSensorName.startsWith(QStringLiteral("Disabled")) || power_as_bike || power_as_treadmill;
     bool eliteRizerFound = eliteRizerName.startsWith(QStringLiteral("Disabled"));
     bool eliteSterzoSmartFound = eliteSterzoSmartName.startsWith(QStringLiteral("Disabled"));
+    bool gpio_treadmill = settings.value(QStringLiteral("gpio_treadmill"), false).toBool();
     bool fake_bike =
         settings.value(QZSettings::applewatch_fakedevice, QZSettings::default_applewatch_fakedevice).toBool();
     bool fakedevice_elliptical =
@@ -628,6 +630,23 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
                     emit searchingStop();
                 }
                 this->signalBluetoothDeviceConnected(fakeBike);
+#if defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+            } else if (gpio_treadmill && !gpioTreadmill) {
+                discoveryAgent->stop();
+                gpioTreadmill = new gpiotreadmill(pollDeviceTime, noConsole, noHeartService, 0.8, 0);
+                emit deviceConnected(b);
+                connect(gpioTreadmill, &bluetoothdevice::connectedAndDiscovered, this,
+                        &bluetooth::connectedAndDiscovered);
+                connect(gpioTreadmill, &gpiotreadmill::debug, this, &bluetooth::debug);
+                connect(gpioTreadmill, &gpiotreadmill::inclinationChanged, this, &bluetooth::inclinationChanged);
+                // connect(cscBike, SIGNAL(disconnected()), this, SLOT(restart()));
+                // connect(this, SIGNAL(searchingStop()), gpioTreadmill, SLOT(searchingStop())); //NOTE: Commented due
+                // to #358
+                if (!discoveryAgent->isActive()) {
+                    emit searchingStop();
+                }
+                this->signalBluetoothDeviceConnected(gpioTreadmill);
+#endif
             } else if (fakedevice_elliptical && !fakeElliptical) {
                 this->stopDiscovery();
                 fakeElliptical = new fakeelliptical(noWriteResistance, noHeartService, false);
@@ -2756,6 +2775,13 @@ void bluetooth::restart() {
         delete fakeBike;
         fakeBike = nullptr;
     }
+#if defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+    if (gpioTreadmill) {
+
+        delete gpioTreadmill;
+        gpioTreadmill = nullptr;
+    }
+#endif
     if (fakeElliptical) {
 
         delete fakeElliptical;
@@ -3160,6 +3186,10 @@ bluetoothdevice *bluetooth::device() {
         return powerTreadmill;
     } else if (fakeBike) {
         return fakeBike;
+#if defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+    } else if (gpioTreadmill) {
+        return gpioTreadmill;
+#endif
     } else if (fakeElliptical) {
         return fakeElliptical;
     } else if (fakeRower) {

src/devices/bluetooth.h

@@ -92,6 +92,9 @@
 #include "devices/proformwifitreadmill/proformwifitreadmill.h"
 #include "devices/schwinn170bike/schwinn170bike.h"
 #include "devices/schwinnic4bike/schwinnic4bike.h"
+#if defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+#include "gpiotreadmill.h"
+#endif
 #include "signalhandler.h"
 #include "devices/skandikawiribike/skandikawiribike.h"
 #include "devices/smartrowrower/smartrowrower.h"
@@ -187,6 +190,9 @@ class bluetooth : public QObject, public SignalHandler {
     trxappgateusbelliptical *trxappgateusbElliptical = nullptr;
     echelonconnectsport *echelonConnectSport = nullptr;
     yesoulbike *yesoulBike = nullptr;
+#if defined(Q_OS_WIN) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
+    gpiotreadmill *gpioTreadmill = nullptr;
+#endif
     flywheelbike *flywheelBike = nullptr;
     nordictrackelliptical *nordictrackElliptical = nullptr;
     nordictrackifitadbtreadmill *nordictrackifitadbTreadmill = nullptr;

src/devices/faketreadmill/faketreadmill.cpp

@@ -131,3 +131,4 @@ void faketreadmill::changeInclinationRequested(double grade, double percentage)
 }
 
 bool faketreadmill::connected() { return true; }
+double faketreadmill::minStepSpeed() { return 0.1; }

src/devices/faketreadmill/faketreadmill.h

@@ -39,6 +39,7 @@ class faketreadmill : public treadmill {
   public:
     faketreadmill(bool noWriteResistance, bool noHeartService, bool noVirtualDevice);
     bool connected() override;
+    double minStepSpeed();
 
   private:
     QTimer *refresh;