Merge remote-tracking branch 'origin/master' into fixing_trainprogram_jitter

https://github.com/cagnulein/qdomyos-zwift/issues/2897#issuecomment-2671383599

.github/workflows/main.yml

@@ -1,3 +1,4 @@
+
 # This is a basic workflow to help you get started with Actions
 
 name: CI
@@ -127,6 +128,7 @@ jobs:
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
           echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
           echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
           echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
@@ -140,7 +142,7 @@ jobs:
             cd src/debug
             mkdir output
             mkdir appx
-            cp qdomyos-zwift.exe output/
+            cp qdomyos-zwift.* output/
             cd output
             windeployqt --qmldir ../../ qdomyos-zwift.exe
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
@@ -167,7 +169,7 @@ jobs:
             cd src/debug
             mkdir output
             mkdir appx
-            cp qdomyos-zwift.exe output/
+            cp qdomyos-zwift.* output/
             cd output
             windeployqt --qmldir ../../ qdomyos-zwift.exe
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
@@ -195,14 +197,14 @@ jobs:
         if:  ${{ ! matrix.config.python }}
 
       - name: Archive windows binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows-binary
           path: windows-binary.zip
         if: matrix.config.python
 
       - name: Archive windows binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows-binary-no-python
           path: windows-binary-no-python.zip
@@ -303,6 +305,7 @@ jobs:
 #            qmake
 #            cd src
 #            echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+#            echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
 #            echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
 #            echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
 #            echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
@@ -337,7 +340,7 @@ jobs:
   # This workflow contains a single job called "build"
   linux-x86-build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -433,7 +436,7 @@ jobs:
         run: qmake; make -j8
 
       - name: Archive linux-desktop binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: linux-desktop-binary
           path: src/qdomyos-zwift         
@@ -442,7 +445,7 @@ jobs:
         run: cd tst; GTEST_OUTPUT=xml:test-results/ GTEST_COLOR=1 ./qdomyos-zwift-tests; cd ..
 
       - name: Upload test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test_results_xml
@@ -585,7 +588,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '11'
+          java-version: '11.0.23+9'
           
       - name: patching qt for bluetooth
         run: cp qt-patches/android/5.15.0/jar/*.* ${{ github.workspace }}/output/android/Qt/5.15.0/android/jar/
@@ -593,14 +596,6 @@ jobs:
       - name: download 3rd party files for qthttpserver
         run: cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
 
-      - name: Build qthttpserver
-        run: |
-            cd src/qthttpserver 
-            qmake
-            make -j8
-            make install
-            cd ../..
-
       - name: Set Android NDK 21 && build
         run: |
           # Install NDK 21 after GitHub update
@@ -613,6 +608,7 @@ jobs:
           export ANDROID_NDK_ROOT="${ANDROID_NDK}"
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
           echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
           echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
           echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
@@ -622,6 +618,14 @@ jobs:
 
           ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK
           rm -rf /usr/local/lib/android/sdk/ndk/25.1.8937393
+
+          # QTHTTPSERVER must use the same NDK
+          cd src/qthttpserver 
+          qmake
+          make -j8
+          make install
+          cd ../..          
+          
           qmake -spec android-clang 'ANDROID_ABIS=armeabi-v7a arm64-v8a x86 x86_64' 'ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/21.4.7075529' && make -j4 && make INSTALL_ROOT=${{ github.workspace }}/output/android/ install
           sed -i '1s|{|{\n   "android-extra-libs": "${{ github.workspace }}/android_openssl/no-asm/latest/arm/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm64/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm64/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86_64/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86_64/libssl_1_1.so",|' src/android-qdomyos-zwift-deployment-settings.json
           cat src/android-qdomyos-zwift-deployment-settings.json
@@ -630,7 +634,7 @@ jobs:
         run: cd src; androiddeployqt --input android-qdomyos-zwift-deployment-settings.json --output ${{ github.workspace }}/output/android/ --android-platform android-31 --gradle --aab
 
       - name: Archive apk binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: fdroid-android-trial
           path: ${{ github.workspace }}/output/android/build/outputs/apk/debug/
@@ -651,7 +655,7 @@ jobs:
 
   ios-build:
     # The type of runner that the job will run on
-    runs-on: macos-12
+    runs-on: macos-latest
     permissions:
       contents: write
 
@@ -708,6 +712,7 @@ jobs:
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
           echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
           echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
           echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
@@ -818,20 +823,51 @@ jobs:
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
           echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
           echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
           echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
           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: Create vcpkg.json
+        working-directory: ${{ runner.workspace }}
+        run: |
+          echo '{
+            "name": "qdomyos-zwift",
+            "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+            "dependencies": [
+              "protobuf",
+              "protobuf-c",
+              "abseil"
+            ],
+            "builtin-baseline": "8c2fcacefba009d63672f9d137f192765e632c9f"
+          }' > vcpkg.json
+      
+      - name: Install dependencies
+        run: |
+          .\vcpkg\vcpkg install --triplet x64-windows --x-install-root=D:\a\qdomyos-zwift\vcpkg\installed
+        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
             mkdir output
             mkdir appx
-            cp qdomyos-zwift.exe output/
+            cp qdomyos-zwift.* output/
             cd output
             windeployqt --qmldir ../../ qdomyos-zwift.exe
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
@@ -839,6 +875,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,21 +886,25 @@ 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
             mkdir output
             mkdir appx
-            cp qdomyos-zwift.exe output/
+            cp qdomyos-zwift.* output/
             cd output
             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 ..
@@ -883,14 +924,14 @@ jobs:
         if:  ${{ ! matrix.config.python }}
 
       - name: Archive windows binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows-msvc2019-binary
           path: windows-msvc2019-binary.zip
         if: matrix.config.python
 
       - name: Archive windows binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows-msvc2019-binary-no-python
           path: windows-msvc2019-binary-no-python.zip
@@ -930,6 +971,9 @@ jobs:
           repository: qt-labs/qthttpserver
           path: "src/qthttpserver"      
 
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
+  
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -967,14 +1011,45 @@ jobs:
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
           echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
           echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
           echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h          
           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: Create vcpkg.json
+        working-directory: ${{ runner.workspace }}
+        run: |
+          echo '{
+            "name": "qdomyos-zwift",
+            "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+            "dependencies": [
+              "protobuf",
+              "protobuf-c",
+              "abseil"
+            ],
+            "builtin-baseline": "8c2fcacefba009d63672f9d137f192765e632c9f"
+          }' > vcpkg.json
+      
+      - name: Install dependencies
+        run: |
+          .\vcpkg\vcpkg install --triplet x64-windows --x-install-root=D:\a\qdomyos-zwift\vcpkg\installed
+        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
             cd src
             echo "#define AISERVER" >> aiserver.h
             cd ..
@@ -983,7 +1058,7 @@ jobs:
             cd src/debug
             mkdir output
             mkdir appx
-            cp qdomyos-zwift.exe output/
+            cp qdomyos-zwift.* output/
             cd output
             windeployqt --qmldir ../../ qdomyos-zwift.exe
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
@@ -993,6 +1068,7 @@ jobs:
             cp ../../windows/zwift-workout-ai-server.py zwift-workout.py
             cp ../../windows/*.bat .
             cp ../../../windows_openssl/*.* .
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\bin\*.* -Destination . -Verbose
             mkdir adb
             cp ../../adb/* adb/
             cd ..
@@ -1006,19 +1082,127 @@ jobs:
         run: Compress-Archive src/debug/output windows-msvc2019-ai-server-binary.zip
 
       - name: Archive windows binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows-msvc2019-ai-server-binary
           path: windows-msvc2019-ai-server-binary.zip
 
+  raspberry-pi-build:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Secrets
+        run: |
+          cd src
+          echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
+          echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
+          echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
+          echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
+          echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
+          echo "#define LICENSE" >> secret.h
+          cd ..
+
+      - name: Build for Raspberry Pi
+        uses: docker://arm32v7/debian:bullseye-20241016
+        with:
+          args: >
+            bash -c "
+            set -ex &&
+            apt-get update && 
+            apt-get install -y build-essential git cmake qtbase5-dev qtbase5-private-dev qtchooser qt5-qmake qtbase5-dev-tools qttools5-dev-tools libqt5svg5-dev qtmultimedia5-dev libqt5charts5-dev qtpositioning5-dev qtconnectivity5-dev libqt5websockets5-dev libqt5texttospeech5-dev libqt5bluetooth5 libqt5networkauth5-dev qml-module-qtlocation qml-module-qtpositioning qtlocation5-dev libqt5quickcontrols2-5 qtquickcontrols2-5-dev qml-module-qtquick-controls2 &&
+            export QT_SELECT=qt5 &&
+            export PATH=/usr/lib/qt5/bin:$PATH &&
+            cd /github/workspace &&
+            sed -i '/QtHttpServer/d' qdomyos-zwift.pro &&
+            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/#include <QtHttpServer/\/\/#include <QtHttpServer/' {} + &&
+            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/QHttpServer/\/\/QHttpServer/' {} + &&
+            cat qdomyos-zwift.pro &&
+            qmake &&
+            make -j$(nproc)
+            "
+
+      - name: Rename binary
+        run: mv src/qdomyos-zwift src/qdomyos-zwift-32bit
+      
+      - name: Archive Raspberry Pi binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: raspberry-pi-binary
+          path: src/qdomyos-zwift-32bit
+
+  raspberry-pi-build-and-image-64bit:
+    runs-on: ubuntu-22.04
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:qemu-v7.0.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          version: v0.19.3
+
+      - name: Secrets
+        run: |
+          cd src
+          echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" > secret.h
+          echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
+          echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
+          echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
+          echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
+          echo "#define LICENSE" >> secret.h
+          cd ..
+
+      - name: Build for Raspberry Pi 64-bit
+        uses: docker://arm64v8/debian:bullseye-20241016
+        with:
+          args: >
+            bash -c "
+            set -ex &&
+            apt-get update && 
+            apt-get install -y build-essential git cmake qtbase5-dev qtbase5-private-dev qtchooser qt5-qmake qtbase5-dev-tools qttools5-dev-tools libqt5svg5-dev qtmultimedia5-dev libqt5charts5-dev qtpositioning5-dev qtconnectivity5-dev libqt5websockets5-dev libqt5texttospeech5-dev libqt5bluetooth5 libqt5networkauth5-dev qml-module-qtlocation qml-module-qtpositioning qtlocation5-dev libqt5quickcontrols2-5 qtquickcontrols2-5-dev qml-module-qtquick-controls2 &&
+            export QT_SELECT=qt5 &&
+            export PATH=/usr/lib/qt5/bin:$PATH &&
+            cd /github/workspace &&
+            sed -i '/QtHttpServer/d' qdomyos-zwift.pro &&
+            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/#include <QtHttpServer/\/\/#include <QtHttpServer/' {} + &&
+            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/QHttpServer/\/\/QHttpServer/' {} + &&
+            cat qdomyos-zwift.pro &&
+            qmake &&
+            make -j$(nproc)
+            "
+
+      - name: Rename binary
+        run: mv src/qdomyos-zwift src/qdomyos-zwift-64bit
+  
   upload_to_release:
     permissions: write-all
     runs-on: ubuntu-20.04 
     if: github.event_name == 'schedule'
-    needs: [linux-x86-build, window-msvc2019-build, ios-build, window-build, android-build]  # Specify the job dependencies
+    needs: [linux-x86-build, window-msvc2019-build, ios-build, window-build, android-build, raspberry-pi-build]  # Specify the job dependencies
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Update nightly release
         uses: andelf/nightly-release@main
         env:
@@ -1044,3 +1228,6 @@ jobs:
             windows-binary-no-python/*
             windows-binary/*
             fdroid-android-trial/*
+            raspberry-pi-binary/qdomyos-zwift-32bit
+            #raspberry-pi-64bit-binary/qdomyos-zwift-64bit
+            #2024-10-22-raspios-bookworm-arm64-lite.img.xz

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(Windows) Launch",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "C://Users//violarob//Downloads//windows-msvc2019-binary-no-python (1)//output/qdomyos-zwift.exe",
+            "symbolSearchPath": "C://Users//violarob//Downloads//windows-msvc2019-binary-no-python (1)//output/qdomyos-zwift.pdb",
+            "sourceFileMap": {
+                "d:/a/qdomyos-zwift/qdomyos-zwift": "c:/work/qdomyos-zwift/",
+                "compiled_source_path": "C://Users//violarob//Downloads//windows-msvc2019-binary-no-python (1)//output/"
+            }
+        }
+    ]
+    }

QZ_ESP32/ftms_rower.ino/ftms_rower.ino.ino

@@ -0,0 +1,53 @@
+#include <NimBLEDevice.h>
+
+#define INDOOR_BIKE_DATA_UUID   "00002AD2-0000-1000-8000-00805f9b34fb"
+#define CUSTOM_SERVICE_UUID     "ce060000-43e5-11e4-916c-0800200c9a66"
+
+NimBLEServer* pServer = nullptr;
+NimBLECharacteristic* pIndoorBikeDataChar = nullptr;
+
+class ServerCallbacks: public NimBLEServerCallbacks {
+    void onConnect(NimBLEServer* pServer) {
+        Serial.println("Client connected");
+    };
+
+    void onDisconnect(NimBLEServer* pServer) {
+        Serial.println("Client disconnected");
+    }
+};
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println("Starting NimBLE Server");
+
+  NimBLEDevice::init("PM5 431431183 Row");
+
+  pServer = NimBLEDevice::createServer();
+  pServer->setCallbacks(new ServerCallbacks());
+
+  NimBLEService* pFtmService = pServer->createService("1826");
+  //NimBLEService* pCustomService = pServer->createService(CUSTOM_SERVICE_UUID);
+
+  pIndoorBikeDataChar = pFtmService->createCharacteristic(
+                          INDOOR_BIKE_DATA_UUID,
+                          NIMBLE_PROPERTY::READ |
+                          NIMBLE_PROPERTY::NOTIFY
+                        );
+
+  pFtmService->start();
+  //pCustomService->start();
+
+  NimBLEAdvertising* pAdvertising = NimBLEDevice::getAdvertising();
+  pAdvertising->addServiceUUID(pFtmService->getUUID());
+  //pAdvertising->addServiceUUID(CUSTOM_SERVICE_UUID);
+  const std::string data = { 0x01, 0x10, 0x00 }; // Imposta i valori desiderati
+  pAdvertising->setServiceData(pFtmService->getUUID(), data);
+  pAdvertising->start();
+
+  Serial.println("Advertising started");
+}
+
+void loop() {
+  // Metti qui il tuo codice principale, da eseguire ripetutamente
+  // Ad esempio, potresti aggiornare il valore della caratteristica Indoor Bike Data
+}

README.md

@@ -96,34 +96,36 @@ Zwift bridge for Treadmills and Bike!
 |:---|:---:|:---:|:---:|:---:|---:|
 |Resistance shifting with bluetooth remote|X||X|||
 |TTS support|X|X|X|X||
+|Zwift Play & Click support|X|||||
+|MQTT integration|X|X|X|X||
+|OpenSoundControl integration|X|X|X|X||
 
 
 ### Installation 
 
-You can install it on multiple platforms.
-Read the [installation procedure](docs/10_Installation.md)
+  You can install it on multiple platforms.
+  Read the [installation procedure](docs/10_Installation.md)
 
 
 ### Tested on
 
-You can run the app on [Macintosh or Linux devices](docs/10_Installation.md). IOS and Android are also supported.
-
-QDomyos-Zwift works on every [FTMS-compatible application](docs/20_supported_devices_and_applications.md), and virtually any [bluetooth enabled device](docs/20_supported_devices_and_applications.md).
+  The QDomyos-Zwift application can run on [Macintosh or Linux devices](docs/10_Installation.md) iOS, and Android. 
+  It supports any [FTMS-compatible application](docs/20_supported_devices_and_applications.md) software and most [bluetooth enabled device](docs/20_supported_devices_and_applications.md).
 
 ### No GUI version
 
 run as
 
-$ sudo ./qdomyos-zwift -no-gui
+  $ sudo ./qdomyos-zwift -no-gui
 
 ### Reference
 
-https://github.com/ProH4Ck/treadmill-bridge
+  => GitHub Repository: [QDomyos-Zwift on GitHub](https://github.com/ProH4Ck/treadmill-bridge)
 
-https://www.livestrong.com/article/422012-what-is-10-degrees-in-incline-on-a-treadmill/
+  => Treadmill Incline Reference: [What Is 10 Degrees in Incline on a Treadmill?](https://www.livestrong.com/article/422012-what-is-10-degrees-in-incline-on-a-treadmill/)
 
-Icons used in this documentation come from [flaticon.com](https://www.flaticon.com)
+  => Icon Attribution: Icons used in this documentation are from [Flaticon.com](https://www.flaticon.com)
 
 ### Blog
 
-https://robertoviola.cloud
+  => Related Blog: [Roberto Viola's Blog](https://robertoviola.cloud)

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift.xcodeproj/project.pbxproj

@@ -6,21 +6,6 @@
 	objectVersion = 54;
 	objects = {
 
-/* Begin PBXAggregateTarget section */
-		E9F0AFC024A6F2D65CE84E08 /* Qt Preprocess */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 6CC3B5D2136C7CD6A5CF5A59 /* Build configuration list for PBXNativeTarget "qdomyoszwift" */;
-			buildPhases = (
-				5E618435888B9D49F8540165 /* Qt Qmake */,
-				7EF0942E79C014DCEC8976BC /* Qt Preprocessors */,
-			);
-			dependencies = (
-			);
-			name = "Qt Preprocess";
-			productName = "Qt Preprocess";
-		};
-/* End PBXAggregateTarget section */
-
 /* Begin PBXBuildFile section */
 		023642106C14651D2E1F4D5D /* dialogplugin in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = B9CCC4658EA620ABBD832E71 /* dialogplugin */; };
 		0317752B0C295CAB82D37E45 /* virtualtreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 3088C65BF5992B009FFC93B5 /* virtualtreadmill.cpp */; settings = {ATTRIBUTES = (); }; };
@@ -143,6 +128,8 @@
 		87083D9626678EFA0072410D /* zwiftworkout.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87083D9526678EFA0072410D /* zwiftworkout.cpp */; };
 		87097D2F275EA9A30020EE6F /* sportsplusbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87097D2D275EA9A20020EE6F /* sportsplusbike.cpp */; };
 		87097D31275EA9AF0020EE6F /* moc_sportsplusbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87097D30275EA9AE0020EE6F /* moc_sportsplusbike.cpp */; };
+		870A5DB32CEF8FB100839641 /* moc_technogymbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 870A5DB22CEF8FB100839641 /* moc_technogymbike.cpp */; };
+		870A5DB52CEF8FD200839641 /* technogymbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 870A5DB42CEF8FD200839641 /* technogymbike.cpp */; };
 		8710706C29C48AEA0094D0F3 /* handleurl.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8710706B29C48AEA0094D0F3 /* handleurl.cpp */; };
 		8710706E29C48AF30094D0F3 /* moc_handleurl.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8710706D29C48AF30094D0F3 /* moc_handleurl.cpp */; };
 		8710707329C4A5E70094D0F3 /* GarminConnect.swift in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8710707229C4A5E70094D0F3 /* GarminConnect.swift */; };
@@ -152,6 +139,8 @@
 		871189192893CECF006A04D1 /* libqavfmediaplayer.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 871189182893CECC006A04D1 /* libqavfmediaplayer.a */; };
 		871235BF26B297670012D0F2 /* kingsmithr1protreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 871235BE26B297660012D0F2 /* kingsmithr1protreadmill.cpp */; };
 		871235C126B297720012D0F2 /* moc_kingsmithr1protreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 871235C026B297720012D0F2 /* moc_kingsmithr1protreadmill.cpp */; };
+		8715A3E72C75E6C9009BAC05 /* moc_antbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8715A3E62C75E6C9009BAC05 /* moc_antbike.cpp */; };
+		8715A3EA2C75E6DB009BAC05 /* antbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8715A3E82C75E6DB009BAC05 /* antbike.cpp */; };
 		87182A09276BBAF600141463 /* virtualrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87182A08276BBAF600141463 /* virtualrower.cpp */; };
 		87182A0B276BBB1200141463 /* moc_virtualrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87182A0A276BBB1200141463 /* moc_virtualrower.cpp */; };
 		8718CBA2263063BD004BF4EE /* soleelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8718CB9A263063BC004BF4EE /* soleelliptical.cpp */; };
@@ -166,6 +155,24 @@
 		871B9FD2265E6A8800DB41F4 /* powerzonepack.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 871B9FD1265E6A8800DB41F4 /* powerzonepack.cpp */; };
 		871B9FD4265E6A9A00DB41F4 /* moc_powerzonepack.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 871B9FD3265E6A9A00DB41F4 /* moc_powerzonepack.cpp */; };
 		871E4CD125A6FB5A00E18D6D /* BLEPeripheralManager.swift in Compile Sources */ = {isa = PBXBuildFile; fileRef = 871E4CD025A6FB5A00E18D6D /* BLEPeripheralManager.swift */; };
+		872088EB2CE6543C008C2C17 /* moc_mqttpublisher.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088E62CE6543C008C2C17 /* moc_mqttpublisher.cpp */; };
+		872088EC2CE6543C008C2C17 /* moc_qmqttclient.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088E72CE6543C008C2C17 /* moc_qmqttclient.cpp */; };
+		872088ED2CE6543C008C2C17 /* moc_qmqttmessage.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088E92CE6543C008C2C17 /* moc_qmqttmessage.cpp */; };
+		872088EE2CE6543C008C2C17 /* moc_qmqttsubscription.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088EA2CE6543C008C2C17 /* moc_qmqttsubscription.cpp */; };
+		872088EF2CE6543C008C2C17 /* moc_qmqttconnection_p.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088E82CE6543C008C2C17 /* moc_qmqttconnection_p.cpp */; };
+		8720890E2CE65451008C2C17 /* qmqttsubscriptionproperties.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872089072CE65451008C2C17 /* qmqttsubscriptionproperties.cpp */; };
+		8720890F2CE65451008C2C17 /* qmqttconnectionproperties.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088F82CE65451008C2C17 /* qmqttconnectionproperties.cpp */; };
+		872089102CE65451008C2C17 /* qmqttconnection.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088F52CE65451008C2C17 /* qmqttconnection.cpp */; };
+		872089112CE65451008C2C17 /* qmqttsubscription.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872089042CE65451008C2C17 /* qmqttsubscription.cpp */; };
+		872089122CE65451008C2C17 /* qmqttclient.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088F32CE65451008C2C17 /* qmqttclient.cpp */; };
+		872089132CE65451008C2C17 /* qmqtttopicfilter.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872089092CE65451008C2C17 /* qmqtttopicfilter.cpp */; };
+		872089142CE65451008C2C17 /* qmqtttype.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8720890D2CE65451008C2C17 /* qmqtttype.cpp */; };
+		872089152CE65451008C2C17 /* qmqttcontrolpacket.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088FA2CE65451008C2C17 /* qmqttcontrolpacket.cpp */; };
+		872089162CE65451008C2C17 /* qmqttmessage.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088FE2CE65451008C2C17 /* qmqttmessage.cpp */; };
+		872089172CE65451008C2C17 /* qmqtttopicname.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8720890B2CE65451008C2C17 /* qmqtttopicname.cpp */; };
+		872089182CE65451008C2C17 /* qmqttpublishproperties.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872089012CE65451008C2C17 /* qmqttpublishproperties.cpp */; };
+		872089192CE65451008C2C17 /* qmqttauthenticationproperties.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872088F12CE65451008C2C17 /* qmqttauthenticationproperties.cpp */; };
+		8720891B2CE6567D008C2C17 /* mqttpublisher.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8720891A2CE6567D008C2C17 /* mqttpublisher.cpp */; };
 		872261EE289EA873006A6F75 /* nordictrackelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872261EC289EA873006A6F75 /* nordictrackelliptical.cpp */; };
 		872261F0289EA887006A6F75 /* moc_nordictrackelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872261EF289EA887006A6F75 /* moc_nordictrackelliptical.cpp */; };
 		8727A47727849EA600019B5D /* paferstreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8727A47627849EA600019B5D /* paferstreadmill.cpp */; };
@@ -174,6 +181,8 @@
 		8727C7D12B3BF1B8005429EB /* QTelnet.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8727C7CF2B3BF1B8005429EB /* QTelnet.cpp */; };
 		8727C7D42B3BF1E4005429EB /* moc_QTelnet.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8727C7D22B3BF1E4005429EB /* moc_QTelnet.cpp */; };
 		8727C7D52B3BF1E4005429EB /* moc_proformtelnetbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8727C7D32B3BF1E4005429EB /* moc_proformtelnetbike.cpp */; };
+		872973822C6F13B100D6D9A4 /* moc_nordictrackifitadbelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872973812C6F13B000D6D9A4 /* moc_nordictrackifitadbelliptical.cpp */; };
+		872973852C6F13C400D6D9A4 /* nordictrackifitadbelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872973832C6F13C300D6D9A4 /* nordictrackifitadbelliptical.cpp */; };
 		872A20DA28C5EC380037774D /* faketreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872A20D928C5EC380037774D /* faketreadmill.cpp */; };
 		872A20DC28C5F5CE0037774D /* moc_faketreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 872A20DB28C5F5CE0037774D /* moc_faketreadmill.cpp */; };
 		872BAB4E261750EE006A59AB /* libQt5Charts.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 872BAB4D261750EE006A59AB /* libQt5Charts.a */; };
@@ -254,6 +263,8 @@
 		873CD23027EF8EF5000131BC /* iosinapppurchasetransaction.mm in Compile Sources */ = {isa = PBXBuildFile; fileRef = 873CD22727EF8E4B000131BC /* iosinapppurchasetransaction.mm */; };
 		873D388B29B0D745006A2611 /* ConnectIQ.xcframework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 873D388A29B0D744006A2611 /* ConnectIQ.xcframework */; };
 		873D388C29B0D745006A2611 /* ConnectIQ.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 873D388A29B0D744006A2611 /* ConnectIQ.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		873D3C4A2C296B0100770CB9 /* moc_jumprope.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 873D3C492C296B0100770CB9 /* moc_jumprope.cpp */; };
+		873D3C4D2C296B3800770CB9 /* jumprope.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 873D3C4B2C296B3700770CB9 /* jumprope.cpp */; };
 		873F022F274BE471002D0349 /* mcfbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 873F022D274BE471002D0349 /* mcfbike.cpp */; };
 		873F0231274BE47D002D0349 /* moc_mcfbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 873F0230274BE47D002D0349 /* moc_mcfbike.cpp */; };
 		87420DF6269D770F000C5EC6 /* libQt5WebView.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 87420DF5269D770F000C5EC6 /* libQt5WebView.a */; };
@@ -277,6 +288,10 @@
 		8754D24C27F786F0003D7054 /* virtualrower.swift in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8754D24B27F786F0003D7054 /* virtualrower.swift */; };
 		87586A4125B8340E00A243C4 /* proformbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87586A4025B8340E00A243C4 /* proformbike.cpp */; };
 		87586A4325B8341B00A243C4 /* moc_proformbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87586A4225B8341B00A243C4 /* moc_proformbike.cpp */; };
+		875CA9462D0C740000667EE6 /* moc_kineticinroadbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 875CA9452D0C740000667EE6 /* moc_kineticinroadbike.cpp */; };
+		875CA9492D0C742500667EE6 /* kineticinroadbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 875CA9482D0C742500667EE6 /* kineticinroadbike.cpp */; };
+		875CA94C2D130F8100667EE6 /* moc_osc.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 875CA94B2D130F8100667EE6 /* moc_osc.cpp */; };
+		875CA9552D130FBC00667EE6 /* osc.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 875CA9502D130FBC00667EE6 /* osc.cpp */; };
 		875F69B926342E8D0009FD78 /* spirittreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 875F69B826342E8D0009FD78 /* spirittreadmill.cpp */; };
 		875F69BB26342E9A0009FD78 /* moc_spirittreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 875F69BA26342E9A0009FD78 /* moc_spirittreadmill.cpp */; };
 		8762D50F2601F7EA00F6F049 /* M3iNS.mm in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8762D50B2601F7EA00F6F049 /* M3iNS.mm */; };
@@ -350,8 +365,13 @@
 		876F9B61275385D8006AE6FA /* moc_fitmetria_fanfit.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 876F9B60275385D8006AE6FA /* moc_fitmetria_fanfit.cpp */; };
 		8772A0E625E43ADB0080718C /* trxappgateusbbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8772A0E525E43ADA0080718C /* trxappgateusbbike.cpp */; };
 		8772A0E825E43AE70080718C /* moc_trxappgateusbbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8772A0E725E43AE70080718C /* moc_trxappgateusbbike.cpp */; };
+		8772B7F42CB55E80004AB8E9 /* moc_deerruntreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8772B7F32CB55E80004AB8E9 /* moc_deerruntreadmill.cpp */; };
+		8772B7F72CB55E98004AB8E9 /* deerruntreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8772B7F62CB55E98004AB8E9 /* deerruntreadmill.cpp */; };
+		877350F72D1C08E60070CBD8 /* SmartControl.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 877350F62D1C08E50070CBD8 /* SmartControl.cpp */; };
 		8775008329E876F8008E48B7 /* iconceptelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8775008129E876F7008E48B7 /* iconceptelliptical.cpp */; };
 		8775008529E87713008E48B7 /* moc_iconceptelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8775008429E87712008E48B7 /* moc_iconceptelliptical.cpp */; };
+		877758B32C98627300BB1697 /* moc_sportstechelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 877758B22C98627300BB1697 /* moc_sportstechelliptical.cpp */; };
+		877758B62C98629B00BB1697 /* sportstechelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 877758B52C98629B00BB1697 /* sportstechelliptical.cpp */; };
 		877A080D2893DC4300C0F0AB /* CoreVideo.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 879F74122893D705009A64C8 /* CoreVideo.framework */; };
 		877A7609269D8E9F0024DD2C /* WebKit.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 877A7608269D8E9F0024DD2C /* WebKit.framework */; };
 		877FBA29276E684500F6C0C9 /* bowflextreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 877FBA27276E684400F6C0C9 /* bowflextreadmill.cpp */; };
@@ -370,6 +390,8 @@
 		878531692711A3EC004B153D /* moc_fakebike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 878531672711A3EB004B153D /* moc_fakebike.cpp */; };
 		8785D5432B3DD105005A2EB7 /* moc_PlayerStateWrapper.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8785D5412B3DD105005A2EB7 /* moc_PlayerStateWrapper.cpp */; };
 		8785D5442B3DD105005A2EB7 /* moc_zwift_client_auth.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8785D5422B3DD105005A2EB7 /* moc_zwift_client_auth.cpp */; };
+		87873AEE2D09A8AA005F86B4 /* moc_sportsplusrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87873AED2D09A8AA005F86B4 /* moc_sportsplusrower.cpp */; };
+		87873AF12D09A8CE005F86B4 /* sportsplusrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87873AF02D09A8CE005F86B4 /* sportsplusrower.cpp */; };
 		878A331A25AB4FF800BD13E1 /* yesoulbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 878A331725AB4FF800BD13E1 /* yesoulbike.cpp */; };
 		878A331D25AB50C300BD13E1 /* moc_yesoulbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 878A331B25AB50C200BD13E1 /* moc_yesoulbike.cpp */; };
 		878C9E6928B77E7C00669129 /* nordictrackifitadbbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 878C9E6828B77E7B00669129 /* nordictrackifitadbbike.cpp */; };
@@ -391,6 +413,7 @@
 		87958F1B27628D5400124B24 /* moc_elitesterzosmart.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87958F1A27628D5400124B24 /* moc_elitesterzosmart.cpp */; };
 		8798C8872733E103003148B3 /* strydrunpowersensor.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798C8862733E103003148B3 /* strydrunpowersensor.cpp */; };
 		8798C8892733E10E003148B3 /* moc_strydrunpowersensor.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798C8882733E10E003148B3 /* moc_strydrunpowersensor.cpp */; };
+		8798FDC52D66075B00CF8EE8 /* OSXBtManagerInternal.mm in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798FDC32D66075B00CF8EE8 /* OSXBtManagerInternal.mm */; };
 		879A38C8281BD83300F78B2A /* characteristicnotifier2ad9.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 879A38C7281BD83300F78B2A /* characteristicnotifier2ad9.cpp */; };
 		879E5AA8289C057E00FEA38A /* proformwifitreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 879E5AA6289C057E00FEA38A /* proformwifitreadmill.cpp */; };
 		879E5AAA289C05A500FEA38A /* moc_proformwifitreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 879E5AA9289C05A500FEA38A /* moc_proformwifitreadmill.cpp */; };
@@ -413,11 +436,17 @@
 		87A18F072660D5C1002D7C96 /* ftmsrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A18F052660D5C0002D7C96 /* ftmsrower.cpp */; };
 		87A18F092660D5D9002D7C96 /* moc_ftmsrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A18F082660D5D9002D7C96 /* moc_ftmsrower.cpp */; };
 		87A2E0222B2B053E00E6168F /* swiftDebug.mm in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A2E0212B2B053E00E6168F /* swiftDebug.mm */; };
+		87A33F1A2D611D8400BFFF29 /* moc_logwriter.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A33F192D611D8400BFFF29 /* moc_logwriter.cpp */; };
+		87A33F1D2D611D9500BFFF29 /* logwriter.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A33F1C2D611D9500BFFF29 /* logwriter.cpp */; };
 		87A3BC222656429600D302E3 /* rower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A3BC1F2656429400D302E3 /* rower.cpp */; };
 		87A3BC232656429600D302E3 /* echelonrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A3BC202656429400D302E3 /* echelonrower.cpp */; };
 		87A3BC26265642A300D302E3 /* moc_rower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A3BC24265642A200D302E3 /* moc_rower.cpp */; };
 		87A3BC27265642A300D302E3 /* moc_echelonrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A3BC25265642A200D302E3 /* moc_echelonrower.cpp */; };
+		87A3DD9B2D3413790060BAEB /* moc_lifespantreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A3DD9A2D3413790060BAEB /* moc_lifespantreadmill.cpp */; };
+		87A3DD9C2D3413790060BAEB /* lifespantreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A3DD992D3413790060BAEB /* lifespantreadmill.cpp */; };
 		87A4B76125AF27CB0027EF3C /* metric.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A4B75F25AF27CB0027EF3C /* metric.cpp */; };
+		87A6825A2CE3AB3100586A2A /* moc_sramAXSController.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A682592CE3AB3100586A2A /* moc_sramAXSController.cpp */; };
+		87A6825D2CE3AB4000586A2A /* sramAXSController.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87A6825C2CE3AB4000586A2A /* sramAXSController.cpp */; };
 		87ADD2BB27634C1500B7A0AB /* technogymmyruntreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87ADD2B927634C1400B7A0AB /* technogymmyruntreadmill.cpp */; };
 		87ADD2BD27634C2100B7A0AB /* moc_technogymmyruntreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87ADD2BC27634C2100B7A0AB /* moc_technogymmyruntreadmill.cpp */; };
 		87AE0CB227760DCB00E547E9 /* virtualtreadmill_zwift.swift in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87AE0CB127760DCB00E547E9 /* virtualtreadmill_zwift.swift */; };
@@ -429,6 +458,8 @@
 		87B617F225F260150094A1CB /* moc_fitshowtreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87B617EF25F260140094A1CB /* moc_fitshowtreadmill.cpp */; };
 		87B617F325F260150094A1CB /* moc_snodebike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87B617F025F260140094A1CB /* moc_snodebike.cpp */; };
 		87B617F425F260150094A1CB /* moc_screencapture.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87B617F125F260150094A1CB /* moc_screencapture.cpp */; };
+		87B871902CE1E837009B06CA /* Zwift hub.pb.swift in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87B8718F2CE1E837009B06CA /* Zwift hub.pb.swift */; };
+		87B871932CE1E94D009B06CA /* zwifthubbike.swift in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87B871922CE1E94D009B06CA /* zwifthubbike.swift */; };
 		87BAC3BF2BA497160003E925 /* PrivacyInfo.xcprivacy in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 87BAC3BE2BA497160003E925 /* PrivacyInfo.xcprivacy */; };
 		87BAC3C12BA497350003E925 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 87BAC3C02BA497350003E925 /* PrivacyInfo.xcprivacy */; };
 		87BAFE482B8CA7AA00065FCD /* moc_focustreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87BAFE472B8CA7AA00065FCD /* moc_focustreadmill.cpp */; };
@@ -444,6 +475,8 @@
 		87C424262BC1294000503687 /* moc_treadmillErgTable.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C424252BC1294000503687 /* moc_treadmillErgTable.cpp */; };
 		87C481FA26DFA7C3006211AD /* eliterizer.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C481F926DFA7C3006211AD /* eliterizer.cpp */; };
 		87C481FC26DFA7D1006211AD /* moc_eliterizer.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C481FB26DFA7D1006211AD /* moc_eliterizer.cpp */; };
+		87C4E5BB2C1C1D0900D0750E /* crossrope.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C4E5BA2C1C1D0900D0750E /* crossrope.cpp */; };
+		87C4E5BD2C1C1D2600D0750E /* moc_crossrope.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C4E5BC2C1C1D2600D0750E /* moc_crossrope.cpp */; };
 		87C5F0B526285E5F0067A1B5 /* mimemessage.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F09726285E5A0067A1B5 /* mimemessage.cpp */; };
 		87C5F0B626285E5F0067A1B5 /* quotedprintable.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F09A26285E5B0067A1B5 /* quotedprintable.cpp */; };
 		87C5F0B726285E5F0067A1B5 /* mimecontentformatter.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F09B26285E5B0067A1B5 /* mimecontentformatter.cpp */; };
@@ -516,6 +549,8 @@
 		87E5D2C825E69F4700BDBE6C /* moc_horizontreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87E5D2C725E69F4700BDBE6C /* moc_horizontreadmill.cpp */; };
 		87E6A85825B5C88E00371D28 /* moc_flywheelbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87E6A85725B5C88E00371D28 /* moc_flywheelbike.cpp */; };
 		87E6A85B25B5C8B900371D28 /* flywheelbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87E6A85925B5C8B900371D28 /* flywheelbike.cpp */; };
+		87EAC3D32D1D8D1D004FE975 /* moc_pitpatbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87EAC3D22D1D8D1D004FE975 /* moc_pitpatbike.cpp */; };
+		87EAC3D62D1D8D34004FE975 /* pitpatbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87EAC3D52D1D8D34004FE975 /* pitpatbike.cpp */; };
 		87EB917627EE5FB3002535E1 /* nautilusbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87EB917427EE5FB3002535E1 /* nautilusbike.cpp */; };
 		87EB918227EE5FE7002535E1 /* moc_inapptransaction.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87EB917727EE5FE7002535E1 /* moc_inapptransaction.cpp */; };
 		87EB918327EE5FE7002535E1 /* moc_inappstore.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87EB917827EE5FE7002535E1 /* moc_inappstore.cpp */; };
@@ -540,6 +575,10 @@
 		87FA11AB27C5ECD1008AC5D1 /* ultrasportbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FA11AA27C5ECD1008AC5D1 /* ultrasportbike.cpp */; };
 		87FA11AD27C5ECE4008AC5D1 /* moc_ultrasportbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FA11AC27C5ECE4008AC5D1 /* moc_ultrasportbike.cpp */; };
 		87FA94672B6B89FD00B6AB9A /* SwiftUI.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 87FA94662B6B89FD00B6AB9A /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		87FC40BC2D2E74F9008BA736 /* cycleopsphantombike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FC40BA2D2E74F9008BA736 /* cycleopsphantombike.cpp */; };
+		87FC40BD2D2E74F9008BA736 /* moc_cycleopsphantombike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FC40BB2D2E74F9008BA736 /* moc_cycleopsphantombike.cpp */; };
+		87FE06812D170D3C00CDAAF6 /* moc_trxappgateusbrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FE06802D170D3C00CDAAF6 /* moc_trxappgateusbrower.cpp */; };
+		87FE06842D170D5600CDAAF6 /* trxappgateusbrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FE06832D170D5600CDAAF6 /* trxappgateusbrower.cpp */; };
 		87FE5BAF2692F3130056EFC8 /* tacxneo2.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FE5BAD2692F3130056EFC8 /* tacxneo2.cpp */; };
 		87FE5BB12692F31E0056EFC8 /* moc_tacxneo2.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FE5BB02692F31E0056EFC8 /* moc_tacxneo2.cpp */; };
 		87FFA13727BBE3FF00924E4E /* solebike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87FFA13527BBE3FE00924E4E /* solebike.cpp */; };
@@ -612,13 +651,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		876E4E0E2594739400BD5714 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6DB9C3763D02B1415CD9D565 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = E9F0AFC024A6F2D65CE84E08;
-			remoteInfo = "Qt Preprocess";
-		};
 		876E4E1C2594748000BD5714 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6DB9C3763D02B1415CD9D565 /* Project object */;
@@ -901,6 +933,8 @@
 		87097D2D275EA9A20020EE6F /* sportsplusbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sportsplusbike.cpp; path = ../src/devices/sportsplusbike/sportsplusbike.cpp; sourceTree = "<group>"; };
 		87097D2E275EA9A20020EE6F /* sportsplusbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sportsplusbike.h; path = ../src/devices/sportsplusbike/sportsplusbike.h; sourceTree = "<group>"; };
 		87097D30275EA9AE0020EE6F /* moc_sportsplusbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_sportsplusbike.cpp; sourceTree = "<group>"; };
+		870A5DB22CEF8FB100839641 /* moc_technogymbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_technogymbike.cpp; sourceTree = "<group>"; };
+		870A5DB42CEF8FD200839641 /* technogymbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = technogymbike.cpp; path = ../src/devices/technogymbike/technogymbike.cpp; sourceTree = SOURCE_ROOT; };
 		8710706A29C48AE90094D0F3 /* handleurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = handleurl.h; path = ../src/handleurl.h; sourceTree = "<group>"; };
 		8710706B29C48AEA0094D0F3 /* handleurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = handleurl.cpp; path = ../src/handleurl.cpp; sourceTree = "<group>"; };
 		8710706D29C48AF30094D0F3 /* moc_handleurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_handleurl.cpp; sourceTree = "<group>"; };
@@ -912,6 +946,9 @@
 		871235BD26B297660012D0F2 /* kingsmithr1protreadmill.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kingsmithr1protreadmill.h; path = ../src/devices/kingsmithr1protreadmill/kingsmithr1protreadmill.h; sourceTree = "<group>"; };
 		871235BE26B297660012D0F2 /* kingsmithr1protreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = kingsmithr1protreadmill.cpp; path = ../src/devices/kingsmithr1protreadmill/kingsmithr1protreadmill.cpp; sourceTree = "<group>"; };
 		871235C026B297720012D0F2 /* moc_kingsmithr1protreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_kingsmithr1protreadmill.cpp; sourceTree = "<group>"; };
+		8715A3E62C75E6C9009BAC05 /* moc_antbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_antbike.cpp; sourceTree = "<group>"; };
+		8715A3E82C75E6DB009BAC05 /* antbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = antbike.cpp; path = ../src/devices/antbike/antbike.cpp; sourceTree = "<group>"; };
+		8715A3E92C75E6DB009BAC05 /* antbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = antbike.h; path = ../src/devices/antbike/antbike.h; sourceTree = "<group>"; };
 		87182A07276BBAF600141463 /* virtualrower.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = virtualrower.h; path = ../src/virtualdevices/virtualrower.h; sourceTree = "<group>"; };
 		87182A08276BBAF600141463 /* virtualrower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = virtualrower.cpp; path = ../src/virtualdevices/virtualrower.cpp; sourceTree = "<group>"; };
 		87182A0A276BBB1200141463 /* moc_virtualrower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_virtualrower.cpp; sourceTree = "<group>"; };
@@ -934,6 +971,42 @@
 		871B9FD1265E6A8800DB41F4 /* powerzonepack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = powerzonepack.cpp; path = ../src/powerzonepack.cpp; sourceTree = "<group>"; };
 		871B9FD3265E6A9A00DB41F4 /* moc_powerzonepack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_powerzonepack.cpp; sourceTree = "<group>"; };
 		871E4CD025A6FB5A00E18D6D /* BLEPeripheralManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BLEPeripheralManager.swift; path = ../src/ios/BLEPeripheralManager.swift; sourceTree = "<group>"; };
+		872088E62CE6543C008C2C17 /* moc_mqttpublisher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_mqttpublisher.cpp; sourceTree = "<group>"; };
+		872088E72CE6543C008C2C17 /* moc_qmqttclient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_qmqttclient.cpp; sourceTree = "<group>"; };
+		872088E82CE6543C008C2C17 /* moc_qmqttconnection_p.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_qmqttconnection_p.cpp; sourceTree = "<group>"; };
+		872088E92CE6543C008C2C17 /* moc_qmqttmessage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_qmqttmessage.cpp; sourceTree = "<group>"; };
+		872088EA2CE6543C008C2C17 /* moc_qmqttsubscription.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_qmqttsubscription.cpp; sourceTree = "<group>"; };
+		872088F02CE65451008C2C17 /* qmqttauthenticationproperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttauthenticationproperties.h; path = ../src/mqtt/qmqttauthenticationproperties.h; sourceTree = SOURCE_ROOT; };
+		872088F12CE65451008C2C17 /* qmqttauthenticationproperties.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttauthenticationproperties.cpp; path = ../src/mqtt/qmqttauthenticationproperties.cpp; sourceTree = SOURCE_ROOT; };
+		872088F22CE65451008C2C17 /* qmqttclient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttclient.h; path = ../src/mqtt/qmqttclient.h; sourceTree = SOURCE_ROOT; };
+		872088F32CE65451008C2C17 /* qmqttclient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttclient.cpp; path = ../src/mqtt/qmqttclient.cpp; sourceTree = SOURCE_ROOT; };
+		872088F42CE65451008C2C17 /* qmqttclient_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttclient_p.h; path = ../src/mqtt/qmqttclient_p.h; sourceTree = SOURCE_ROOT; };
+		872088F52CE65451008C2C17 /* qmqttconnection.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttconnection.cpp; path = ../src/mqtt/qmqttconnection.cpp; sourceTree = SOURCE_ROOT; };
+		872088F62CE65451008C2C17 /* qmqttconnection_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttconnection_p.h; path = ../src/mqtt/qmqttconnection_p.h; sourceTree = SOURCE_ROOT; };
+		872088F72CE65451008C2C17 /* qmqttconnectionproperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttconnectionproperties.h; path = ../src/mqtt/qmqttconnectionproperties.h; sourceTree = SOURCE_ROOT; };
+		872088F82CE65451008C2C17 /* qmqttconnectionproperties.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttconnectionproperties.cpp; path = ../src/mqtt/qmqttconnectionproperties.cpp; sourceTree = SOURCE_ROOT; };
+		872088F92CE65451008C2C17 /* qmqttconnectionproperties_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttconnectionproperties_p.h; path = ../src/mqtt/qmqttconnectionproperties_p.h; sourceTree = SOURCE_ROOT; };
+		872088FA2CE65451008C2C17 /* qmqttcontrolpacket.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttcontrolpacket.cpp; path = ../src/mqtt/qmqttcontrolpacket.cpp; sourceTree = SOURCE_ROOT; };
+		872088FB2CE65451008C2C17 /* qmqttcontrolpacket_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttcontrolpacket_p.h; path = ../src/mqtt/qmqttcontrolpacket_p.h; sourceTree = SOURCE_ROOT; };
+		872088FC2CE65451008C2C17 /* qmqttglobal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttglobal.h; path = ../src/mqtt/qmqttglobal.h; sourceTree = SOURCE_ROOT; };
+		872088FD2CE65451008C2C17 /* qmqttmessage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttmessage.h; path = ../src/mqtt/qmqttmessage.h; sourceTree = SOURCE_ROOT; };
+		872088FE2CE65451008C2C17 /* qmqttmessage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttmessage.cpp; path = ../src/mqtt/qmqttmessage.cpp; sourceTree = SOURCE_ROOT; };
+		872088FF2CE65451008C2C17 /* qmqttmessage_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttmessage_p.h; path = ../src/mqtt/qmqttmessage_p.h; sourceTree = SOURCE_ROOT; };
+		872089002CE65451008C2C17 /* qmqttpublishproperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttpublishproperties.h; path = ../src/mqtt/qmqttpublishproperties.h; sourceTree = SOURCE_ROOT; };
+		872089012CE65451008C2C17 /* qmqttpublishproperties.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttpublishproperties.cpp; path = ../src/mqtt/qmqttpublishproperties.cpp; sourceTree = SOURCE_ROOT; };
+		872089022CE65451008C2C17 /* qmqttpublishproperties_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttpublishproperties_p.h; path = ../src/mqtt/qmqttpublishproperties_p.h; sourceTree = SOURCE_ROOT; };
+		872089032CE65451008C2C17 /* qmqttsubscription.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttsubscription.h; path = ../src/mqtt/qmqttsubscription.h; sourceTree = SOURCE_ROOT; };
+		872089042CE65451008C2C17 /* qmqttsubscription.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttsubscription.cpp; path = ../src/mqtt/qmqttsubscription.cpp; sourceTree = SOURCE_ROOT; };
+		872089052CE65451008C2C17 /* qmqttsubscription_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttsubscription_p.h; path = ../src/mqtt/qmqttsubscription_p.h; sourceTree = SOURCE_ROOT; };
+		872089062CE65451008C2C17 /* qmqttsubscriptionproperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqttsubscriptionproperties.h; path = ../src/mqtt/qmqttsubscriptionproperties.h; sourceTree = SOURCE_ROOT; };
+		872089072CE65451008C2C17 /* qmqttsubscriptionproperties.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqttsubscriptionproperties.cpp; path = ../src/mqtt/qmqttsubscriptionproperties.cpp; sourceTree = SOURCE_ROOT; };
+		872089082CE65451008C2C17 /* qmqtttopicfilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqtttopicfilter.h; path = ../src/mqtt/qmqtttopicfilter.h; sourceTree = SOURCE_ROOT; };
+		872089092CE65451008C2C17 /* qmqtttopicfilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqtttopicfilter.cpp; path = ../src/mqtt/qmqtttopicfilter.cpp; sourceTree = SOURCE_ROOT; };
+		8720890A2CE65451008C2C17 /* qmqtttopicname.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqtttopicname.h; path = ../src/mqtt/qmqtttopicname.h; sourceTree = SOURCE_ROOT; };
+		8720890B2CE65451008C2C17 /* qmqtttopicname.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqtttopicname.cpp; path = ../src/mqtt/qmqtttopicname.cpp; sourceTree = SOURCE_ROOT; };
+		8720890C2CE65451008C2C17 /* qmqtttype.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = qmqtttype.h; path = ../src/mqtt/qmqtttype.h; sourceTree = SOURCE_ROOT; };
+		8720890D2CE65451008C2C17 /* qmqtttype.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = qmqtttype.cpp; path = ../src/mqtt/qmqtttype.cpp; sourceTree = SOURCE_ROOT; };
+		8720891A2CE6567D008C2C17 /* mqttpublisher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mqttpublisher.cpp; path = ../src/mqttpublisher.cpp; sourceTree = SOURCE_ROOT; };
 		872261EC289EA873006A6F75 /* nordictrackelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nordictrackelliptical.cpp; path = ../src/devices/nordictrackelliptical/nordictrackelliptical.cpp; sourceTree = "<group>"; };
 		872261ED289EA873006A6F75 /* nordictrackelliptical.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nordictrackelliptical.h; path = ../src/devices/nordictrackelliptical/nordictrackelliptical.h; sourceTree = "<group>"; };
 		872261EF289EA887006A6F75 /* moc_nordictrackelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_nordictrackelliptical.cpp; sourceTree = "<group>"; };
@@ -947,6 +1020,9 @@
 		8727C7D22B3BF1E4005429EB /* moc_QTelnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_QTelnet.cpp; sourceTree = "<group>"; };
 		8727C7D32B3BF1E4005429EB /* moc_proformtelnetbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_proformtelnetbike.cpp; sourceTree = "<group>"; };
 		8729149E2B2B010600565E33 /* qdomyoszwift-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "qdomyoszwift-Bridging-Header.h"; sourceTree = "<group>"; };
+		872973812C6F13B000D6D9A4 /* moc_nordictrackifitadbelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_nordictrackifitadbelliptical.cpp; sourceTree = "<group>"; };
+		872973832C6F13C300D6D9A4 /* nordictrackifitadbelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nordictrackifitadbelliptical.cpp; path = ../src/devices/nordictrackifitadbelliptical/nordictrackifitadbelliptical.cpp; sourceTree = "<group>"; };
+		872973842C6F13C400D6D9A4 /* nordictrackifitadbelliptical.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nordictrackifitadbelliptical.h; path = ../src/devices/nordictrackifitadbelliptical/nordictrackifitadbelliptical.h; sourceTree = "<group>"; };
 		872A20D828C5EC380037774D /* faketreadmill.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = faketreadmill.h; path = ../src/devices/faketreadmill/faketreadmill.h; sourceTree = "<group>"; };
 		872A20D928C5EC380037774D /* faketreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = faketreadmill.cpp; path = ../src/devices/faketreadmill/faketreadmill.cpp; sourceTree = "<group>"; };
 		872A20DB28C5F5CE0037774D /* moc_faketreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_faketreadmill.cpp; sourceTree = "<group>"; };
@@ -1060,6 +1136,9 @@
 		873CD22A27EF8E4B000131BC /* iosinapppurchasetransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iosinapppurchasetransaction.h; path = ../src/purchasing/ios/iosinapppurchasetransaction.h; sourceTree = "<group>"; };
 		873CD22E27EF8EC1000131BC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		873D388A29B0D744006A2611 /* ConnectIQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ConnectIQ.xcframework; path = ../src/ConnectIQ/iOS/ConnectIQ.xcframework; sourceTree = "<group>"; };
+		873D3C492C296B0100770CB9 /* moc_jumprope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_jumprope.cpp; sourceTree = "<group>"; };
+		873D3C4B2C296B3700770CB9 /* jumprope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jumprope.cpp; path = ../src/devices/jumprope.cpp; sourceTree = "<group>"; };
+		873D3C4C2C296B3700770CB9 /* jumprope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jumprope.h; path = ../src/devices/jumprope.h; sourceTree = "<group>"; };
 		873F022D274BE471002D0349 /* mcfbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mcfbike.cpp; path = ../src/devices/mcfbike/mcfbike.cpp; sourceTree = "<group>"; };
 		873F022E274BE471002D0349 /* mcfbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mcfbike.h; path = ../src/devices/mcfbike/mcfbike.h; sourceTree = "<group>"; };
 		873F0230274BE47D002D0349 /* moc_mcfbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_mcfbike.cpp; sourceTree = "<group>"; };
@@ -1096,6 +1175,18 @@
 		87586A3F25B8340D00A243C4 /* proformbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = proformbike.h; path = ../src/devices/proformbike/proformbike.h; sourceTree = "<group>"; };
 		87586A4025B8340E00A243C4 /* proformbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proformbike.cpp; path = ../src/devices/proformbike/proformbike.cpp; sourceTree = "<group>"; };
 		87586A4225B8341B00A243C4 /* moc_proformbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_proformbike.cpp; sourceTree = "<group>"; };
+		875CA9452D0C740000667EE6 /* moc_kineticinroadbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_kineticinroadbike.cpp; sourceTree = "<group>"; };
+		875CA9472D0C742500667EE6 /* kineticinroadbike.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = kineticinroadbike.h; path = ../src/devices/kineticinroadbike/kineticinroadbike.h; sourceTree = SOURCE_ROOT; };
+		875CA9482D0C742500667EE6 /* kineticinroadbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = kineticinroadbike.cpp; path = ../src/devices/kineticinroadbike/kineticinroadbike.cpp; sourceTree = SOURCE_ROOT; };
+		875CA94B2D130F8100667EE6 /* moc_osc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_osc.cpp; sourceTree = "<group>"; };
+		875CA94D2D130FBC00667EE6 /* client.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = client.hpp; path = ../src/oscpp/client.hpp; sourceTree = SOURCE_ROOT; };
+		875CA94E2D130FBC00667EE6 /* error.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = error.hpp; path = ../src/oscpp/error.hpp; sourceTree = SOURCE_ROOT; };
+		875CA94F2D130FBC00667EE6 /* osc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = osc.h; path = ../src/osc.h; sourceTree = SOURCE_ROOT; };
+		875CA9502D130FBC00667EE6 /* osc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = osc.cpp; path = ../src/osc.cpp; sourceTree = SOURCE_ROOT; };
+		875CA9512D130FBC00667EE6 /* print.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = print.hpp; path = ../src/oscpp/print.hpp; sourceTree = SOURCE_ROOT; };
+		875CA9522D130FBC00667EE6 /* server.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = server.hpp; path = ../src/oscpp/server.hpp; sourceTree = SOURCE_ROOT; };
+		875CA9532D130FBC00667EE6 /* types.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = types.hpp; path = ../src/oscpp/types.hpp; sourceTree = SOURCE_ROOT; };
+		875CA9542D130FBC00667EE6 /* util.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = util.hpp; path = ../src/oscpp/util.hpp; sourceTree = SOURCE_ROOT; };
 		875F69B726342E8D0009FD78 /* spirittreadmill.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spirittreadmill.h; path = ../src/devices/spirittreadmill/spirittreadmill.h; sourceTree = "<group>"; };
 		875F69B826342E8D0009FD78 /* spirittreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = spirittreadmill.cpp; path = ../src/devices/spirittreadmill/spirittreadmill.cpp; sourceTree = "<group>"; };
 		875F69BA26342E9A0009FD78 /* moc_spirittreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_spirittreadmill.cpp; sourceTree = "<group>"; };
@@ -1215,9 +1306,17 @@
 		8772A0E425E43AD90080718C /* trxappgateusbbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = trxappgateusbbike.h; path = ../src/devices/trxappgateusbbike/trxappgateusbbike.h; sourceTree = "<group>"; };
 		8772A0E525E43ADA0080718C /* trxappgateusbbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = trxappgateusbbike.cpp; path = ../src/devices/trxappgateusbbike/trxappgateusbbike.cpp; sourceTree = "<group>"; };
 		8772A0E725E43AE70080718C /* moc_trxappgateusbbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_trxappgateusbbike.cpp; sourceTree = "<group>"; };
+		8772B7F32CB55E80004AB8E9 /* moc_deerruntreadmill.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_deerruntreadmill.cpp; sourceTree = "<group>"; };
+		8772B7F62CB55E98004AB8E9 /* deerruntreadmill.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = deerruntreadmill.cpp; sourceTree = "<group>"; };
+		8772B7F92CB5603A004AB8E9 /* deerruntreadmill.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = deerruntreadmill.h; path = ../src/devices/deeruntreadmill/deerruntreadmill.h; sourceTree = SOURCE_ROOT; };
+		877350F52D1C08E50070CBD8 /* SmartControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SmartControl.h; path = ../src/devices/kineticinroadbike/SmartControl.h; sourceTree = SOURCE_ROOT; };
+		877350F62D1C08E50070CBD8 /* SmartControl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SmartControl.cpp; path = ../src/devices/kineticinroadbike/SmartControl.cpp; sourceTree = SOURCE_ROOT; };
 		8775008129E876F7008E48B7 /* iconceptelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iconceptelliptical.cpp; path = ../src/devices/iconceptelliptical/iconceptelliptical.cpp; sourceTree = "<group>"; };
 		8775008229E876F7008E48B7 /* iconceptelliptical.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iconceptelliptical.h; path = ../src/devices/iconceptelliptical/iconceptelliptical.h; sourceTree = "<group>"; };
 		8775008429E87712008E48B7 /* moc_iconceptelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_iconceptelliptical.cpp; sourceTree = "<group>"; };
+		877758B22C98627300BB1697 /* moc_sportstechelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_sportstechelliptical.cpp; sourceTree = "<group>"; };
+		877758B42C98629B00BB1697 /* sportstechelliptical.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sportstechelliptical.h; path = ../src/devices/sportstechelliptical/sportstechelliptical.h; sourceTree = "<group>"; };
+		877758B52C98629B00BB1697 /* sportstechelliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sportstechelliptical.cpp; path = ../src/devices/sportstechelliptical/sportstechelliptical.cpp; sourceTree = "<group>"; };
 		877A7606269D8E0F0024DD2C /* libqtwebview_darwin_debug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libqtwebview_darwin_debug.a; path = ../../Qt/5.15.2/ios/plugins/webview/libqtwebview_darwin_debug.a; sourceTree = "<group>"; };
 		877A7608269D8E9F0024DD2C /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		877FBA27276E684400F6C0C9 /* bowflextreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bowflextreadmill.cpp; path = ../src/devices/bowflextreadmill/bowflextreadmill.cpp; sourceTree = "<group>"; };
@@ -1245,6 +1344,9 @@
 		8785D5402B3DD0EC005A2EB7 /* PlayerStateWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlayerStateWrapper.h; path = "../src/zwift-api/PlayerStateWrapper.h"; sourceTree = "<group>"; };
 		8785D5412B3DD105005A2EB7 /* moc_PlayerStateWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_PlayerStateWrapper.cpp; sourceTree = "<group>"; };
 		8785D5422B3DD105005A2EB7 /* moc_zwift_client_auth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_zwift_client_auth.cpp; sourceTree = "<group>"; };
+		87873AED2D09A8AA005F86B4 /* moc_sportsplusrower.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_sportsplusrower.cpp; sourceTree = "<group>"; };
+		87873AF02D09A8CE005F86B4 /* sportsplusrower.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = sportsplusrower.cpp; sourceTree = "<group>"; };
+		87873AF22D09AADF005F86B4 /* sportsplusrower.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sportsplusrower.h; path = ../src/devices/sportsplusrower/sportsplusrower.h; sourceTree = SOURCE_ROOT; };
 		8789DCDB6A4F681A76DF3F92 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/Users/cagnulein/Qt/5.15.2/ios/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		878A331725AB4FF800BD13E1 /* yesoulbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = yesoulbike.cpp; path = ../src/devices/yesoulbike/yesoulbike.cpp; sourceTree = "<group>"; };
 		878A331825AB4FF800BD13E1 /* yesoulbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = yesoulbike.h; path = ../src/devices/yesoulbike/yesoulbike.h; sourceTree = "<group>"; };
@@ -1276,6 +1378,11 @@
 		8798C8852733E103003148B3 /* strydrunpowersensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strydrunpowersensor.h; path = ../src/devices/strydrunpowersensor/strydrunpowersensor.h; sourceTree = "<group>"; };
 		8798C8862733E103003148B3 /* strydrunpowersensor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = strydrunpowersensor.cpp; path = ../src/devices/strydrunpowersensor/strydrunpowersensor.cpp; sourceTree = "<group>"; };
 		8798C8882733E10E003148B3 /* moc_strydrunpowersensor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_strydrunpowersensor.cpp; sourceTree = "<group>"; };
+		8798FDC02D66075B00CF8EE8 /* osxbluetooth_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = osxbluetooth_p.h; path = ../src/ios/BluetoothPatch/osxbluetooth_p.h; sourceTree = SOURCE_ROOT; };
+		8798FDC12D66075B00CF8EE8 /* osxbtcentralmanager_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = osxbtcentralmanager_p.h; path = ../src/ios/BluetoothPatch/osxbtcentralmanager_p.h; sourceTree = SOURCE_ROOT; };
+		8798FDC22D66075B00CF8EE8 /* osxbtgcdtimer_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = osxbtgcdtimer_p.h; path = ../src/ios/BluetoothPatch/osxbtgcdtimer_p.h; sourceTree = SOURCE_ROOT; };
+		8798FDC32D66075B00CF8EE8 /* OSXBtManagerInternal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OSXBtManagerInternal.mm; path = ../src/ios/BluetoothPatch/OSXBtManagerInternal.mm; sourceTree = SOURCE_ROOT; };
+		8798FDC42D66075B00CF8EE8 /* osxbtutility_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = osxbtutility_p.h; path = ../src/ios/BluetoothPatch/osxbtutility_p.h; sourceTree = SOURCE_ROOT; };
 		879A38C7281BD83300F78B2A /* characteristicnotifier2ad9.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = characteristicnotifier2ad9.cpp; path = ../src/characteristics/characteristicnotifier2ad9.cpp; sourceTree = "<group>"; };
 		879E5AA6289C057E00FEA38A /* proformwifitreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proformwifitreadmill.cpp; path = ../src/devices/proformwifitreadmill/proformwifitreadmill.cpp; sourceTree = "<group>"; };
 		879E5AA7289C057E00FEA38A /* proformwifitreadmill.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = proformwifitreadmill.h; path = ../src/devices/proformwifitreadmill/proformwifitreadmill.h; sourceTree = "<group>"; };
@@ -1293,6 +1400,7 @@
 		87A0770E29B641D500A368BF /* wahookickrheadwind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wahookickrheadwind.h; path = ../src/devices/wahookickrheadwind/wahookickrheadwind.h; sourceTree = "<group>"; };
 		87A0770F29B641D500A368BF /* wahookickrheadwind.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wahookickrheadwind.cpp; path = ../src/devices/wahookickrheadwind/wahookickrheadwind.cpp; sourceTree = "<group>"; };
 		87A0771129B6420200A368BF /* moc_wahookickrheadwind.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_wahookickrheadwind.cpp; sourceTree = "<group>"; };
+		87A083062C73361C00567A4E /* characteristicnotifier2ad9.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = characteristicnotifier2ad9.h; path = ../src/characteristics/characteristicnotifier2ad9.h; sourceTree = "<group>"; };
 		87A0C4B7262329A600121A76 /* npecablebike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = npecablebike.cpp; path = ../src/devices/npecablebike/npecablebike.cpp; sourceTree = "<group>"; };
 		87A0C4B8262329A600121A76 /* cscbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cscbike.h; path = ../src/devices/cscbike/cscbike.h; sourceTree = "<group>"; };
 		87A0C4B9262329A600121A76 /* cscbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cscbike.cpp; path = ../src/devices/cscbike/cscbike.cpp; sourceTree = "<group>"; };
@@ -1307,17 +1415,26 @@
 		87A18F082660D5D9002D7C96 /* moc_ftmsrower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_ftmsrower.cpp; sourceTree = "<group>"; };
 		87A2E0202B2B024200E6168F /* swiftDebug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = swiftDebug.h; path = ../src/ios/swiftDebug.h; sourceTree = "<group>"; };
 		87A2E0212B2B053E00E6168F /* swiftDebug.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = swiftDebug.mm; path = ../src/ios/swiftDebug.mm; sourceTree = "<group>"; };
+		87A33F192D611D8400BFFF29 /* moc_logwriter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_logwriter.cpp; sourceTree = "<group>"; };
+		87A33F1B2D611D9500BFFF29 /* logwriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = logwriter.h; path = ../src/logwriter.h; sourceTree = SOURCE_ROOT; };
+		87A33F1C2D611D9500BFFF29 /* logwriter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = logwriter.cpp; path = ../src/logwriter.cpp; sourceTree = SOURCE_ROOT; };
 		87A3BC1E2656429300D302E3 /* echelonrower.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = echelonrower.h; path = ../src/devices/echelonrower/echelonrower.h; sourceTree = "<group>"; };
 		87A3BC1F2656429400D302E3 /* rower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rower.cpp; path = ../src/devices/rower.cpp; sourceTree = "<group>"; };
 		87A3BC202656429400D302E3 /* echelonrower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = echelonrower.cpp; path = ../src/devices/echelonrower/echelonrower.cpp; sourceTree = "<group>"; };
 		87A3BC212656429400D302E3 /* rower.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rower.h; path = ../src/devices/rower.h; sourceTree = "<group>"; };
 		87A3BC24265642A200D302E3 /* moc_rower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_rower.cpp; sourceTree = "<group>"; };
 		87A3BC25265642A200D302E3 /* moc_echelonrower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_echelonrower.cpp; sourceTree = "<group>"; };
+		87A3DD982D3413790060BAEB /* lifespantreadmill.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = lifespantreadmill.h; path = ../src/devices/lifespantreadmill/lifespantreadmill.h; sourceTree = SOURCE_ROOT; };
+		87A3DD992D3413790060BAEB /* lifespantreadmill.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lifespantreadmill.cpp; path = ../src/devices/lifespantreadmill/lifespantreadmill.cpp; sourceTree = SOURCE_ROOT; };
+		87A3DD9A2D3413790060BAEB /* moc_lifespantreadmill.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_lifespantreadmill.cpp; sourceTree = "<group>"; };
 		87A3EBB925D2CFED0040EB4C /* sportstechbike.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sportstechbike.h; path = ../src/devices/sportstechbike/sportstechbike.h; sourceTree = "<group>"; };
 		87A3EBBA25D2CFED0040EB4C /* sportstechbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sportstechbike.cpp; path = ../src/devices/sportstechbike/sportstechbike.cpp; sourceTree = "<group>"; };
 		87A4B75F25AF27CB0027EF3C /* metric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = metric.cpp; path = ../src/metric.cpp; sourceTree = "<group>"; };
 		87A4B76025AF27CB0027EF3C /* metric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = metric.h; path = ../src/metric.h; sourceTree = "<group>"; };
 		87A659DB8BE7DBAA7B395EF4 /* fit_monitoring_info_mesg_listener.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fit_monitoring_info_mesg_listener.hpp; path = "/Users/cagnulein/qdomyos-zwift/src/fit-sdk/fit_monitoring_info_mesg_listener.hpp"; sourceTree = "<absolute>"; };
+		87A682592CE3AB3100586A2A /* moc_sramAXSController.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_sramAXSController.cpp; sourceTree = "<group>"; };
+		87A6825B2CE3AB4000586A2A /* sramAXSController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sramAXSController.h; path = ../src/devices/sramAXSController/sramAXSController.h; sourceTree = SOURCE_ROOT; };
+		87A6825C2CE3AB4000586A2A /* sramAXSController.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sramAXSController.cpp; path = ../src/devices/sramAXSController/sramAXSController.cpp; sourceTree = SOURCE_ROOT; };
 		87ADD2B927634C1400B7A0AB /* technogymmyruntreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = technogymmyruntreadmill.cpp; path = ../src/devices/technogymmyruntreadmill/technogymmyruntreadmill.cpp; sourceTree = "<group>"; };
 		87ADD2BA27634C1400B7A0AB /* technogymmyruntreadmill.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = technogymmyruntreadmill.h; path = ../src/devices/technogymmyruntreadmill/technogymmyruntreadmill.h; sourceTree = "<group>"; };
 		87ADD2BC27634C2100B7A0AB /* moc_technogymmyruntreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_technogymmyruntreadmill.cpp; sourceTree = "<group>"; };
@@ -1334,6 +1451,8 @@
 		87B617EF25F260140094A1CB /* moc_fitshowtreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_fitshowtreadmill.cpp; sourceTree = "<group>"; };
 		87B617F025F260140094A1CB /* moc_snodebike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_snodebike.cpp; sourceTree = "<group>"; };
 		87B617F125F260150094A1CB /* moc_screencapture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_screencapture.cpp; sourceTree = "<group>"; };
+		87B8718F2CE1E837009B06CA /* Zwift hub.pb.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Zwift hub.pb.swift"; path = "../src/devices/zwifthubbike/Zwift hub.pb.swift"; sourceTree = SOURCE_ROOT; };
+		87B871922CE1E94D009B06CA /* zwifthubbike.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = zwifthubbike.swift; path = ../src/devices/zwifthubbike/zwifthubbike.swift; sourceTree = SOURCE_ROOT; };
 		87BAC3BE2BA497160003E925 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../src/ios/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		87BAC3C02BA497350003E925 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		87BAFE472B8CA7AA00065FCD /* moc_focustreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_focustreadmill.cpp; sourceTree = "<group>"; };
@@ -1354,6 +1473,9 @@
 		87C481F826DFA7C3006211AD /* eliterizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eliterizer.h; path = ../src/devices/eliterizer/eliterizer.h; sourceTree = "<group>"; };
 		87C481F926DFA7C3006211AD /* eliterizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = eliterizer.cpp; path = ../src/devices/eliterizer/eliterizer.cpp; sourceTree = "<group>"; };
 		87C481FB26DFA7D1006211AD /* moc_eliterizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_eliterizer.cpp; sourceTree = "<group>"; };
+		87C4E5B92C1C1D0900D0750E /* crossrope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crossrope.h; path = ../src/devices/crossrope/crossrope.h; sourceTree = "<group>"; };
+		87C4E5BA2C1C1D0900D0750E /* crossrope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = crossrope.cpp; path = ../src/devices/crossrope/crossrope.cpp; sourceTree = "<group>"; };
+		87C4E5BC2C1C1D2600D0750E /* moc_crossrope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_crossrope.cpp; sourceTree = "<group>"; };
 		87C5F09726285E5A0067A1B5 /* mimemessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mimemessage.cpp; path = ../src/smtpclient/src/mimemessage.cpp; sourceTree = "<group>"; };
 		87C5F09826285E5A0067A1B5 /* mimecontentformatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mimecontentformatter.h; path = ../src/smtpclient/src/mimecontentformatter.h; sourceTree = "<group>"; };
 		87C5F09926285E5B0067A1B5 /* smtpclient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smtpclient.h; path = ../src/smtpclient/src/smtpclient.h; sourceTree = "<group>"; };
@@ -1462,6 +1584,9 @@
 		87E6A85725B5C88E00371D28 /* moc_flywheelbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_flywheelbike.cpp; sourceTree = "<group>"; };
 		87E6A85925B5C8B900371D28 /* flywheelbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flywheelbike.cpp; path = ../src/devices/flywheelbike/flywheelbike.cpp; sourceTree = "<group>"; };
 		87E6A85A25B5C8B900371D28 /* flywheelbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flywheelbike.h; path = ../src/devices/flywheelbike/flywheelbike.h; sourceTree = "<group>"; };
+		87EAC3D22D1D8D1D004FE975 /* moc_pitpatbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_pitpatbike.cpp; sourceTree = "<group>"; };
+		87EAC3D42D1D8D34004FE975 /* pitpatbike.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = pitpatbike.h; path = ../src/devices/pitpatbike/pitpatbike.h; sourceTree = SOURCE_ROOT; };
+		87EAC3D52D1D8D34004FE975 /* pitpatbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pitpatbike.cpp; path = ../src/devices/pitpatbike/pitpatbike.cpp; sourceTree = SOURCE_ROOT; };
 		87EB917427EE5FB3002535E1 /* nautilusbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nautilusbike.cpp; path = ../src/devices/nautilusbike/nautilusbike.cpp; sourceTree = "<group>"; };
 		87EB917527EE5FB3002535E1 /* nautilusbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nautilusbike.h; path = ../src/devices/nautilusbike/nautilusbike.h; sourceTree = "<group>"; };
 		87EB917727EE5FE7002535E1 /* moc_inapptransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_inapptransaction.cpp; sourceTree = "<group>"; };
@@ -1497,7 +1622,13 @@
 		87FA11AC27C5ECE4008AC5D1 /* moc_ultrasportbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_ultrasportbike.cpp; sourceTree = "<group>"; };
 		87FA94662B6B89FD00B6AB9A /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
 		87FA94682B6B8A5A00B6AB9A /* libSystem.B.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libSystem.B.tbd; path = usr/lib/libSystem.B.tbd; sourceTree = SDKROOT; };
+		87FC40B92D2E74F9008BA736 /* cycleopsphantombike.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cycleopsphantombike.h; path = ../src/devices/cycleopsphantombike/cycleopsphantombike.h; sourceTree = SOURCE_ROOT; };
+		87FC40BA2D2E74F9008BA736 /* cycleopsphantombike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cycleopsphantombike.cpp; path = ../src/devices/cycleopsphantombike/cycleopsphantombike.cpp; sourceTree = SOURCE_ROOT; };
+		87FC40BB2D2E74F9008BA736 /* moc_cycleopsphantombike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_cycleopsphantombike.cpp; sourceTree = "<group>"; };
 		87FD05DDC378E9BAD82A818F /* fit_ohr_settings_mesg_listener.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fit_ohr_settings_mesg_listener.hpp; path = "/Users/cagnulein/qdomyos-zwift/src/fit-sdk/fit_ohr_settings_mesg_listener.hpp"; sourceTree = "<absolute>"; };
+		87FE06802D170D3C00CDAAF6 /* moc_trxappgateusbrower.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_trxappgateusbrower.cpp; sourceTree = "<group>"; };
+		87FE06822D170D5600CDAAF6 /* trxappgateusbrower.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = trxappgateusbrower.h; path = ../src/devices/trxappgateusbrower/trxappgateusbrower.h; sourceTree = SOURCE_ROOT; };
+		87FE06832D170D5600CDAAF6 /* trxappgateusbrower.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = trxappgateusbrower.cpp; path = ../src/devices/trxappgateusbrower/trxappgateusbrower.cpp; sourceTree = SOURCE_ROOT; };
 		87FE5BAD2692F3130056EFC8 /* tacxneo2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tacxneo2.cpp; path = ../src/devices/tacxneo2/tacxneo2.cpp; sourceTree = "<group>"; };
 		87FE5BAE2692F3130056EFC8 /* tacxneo2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tacxneo2.h; path = ../src/devices/tacxneo2/tacxneo2.h; sourceTree = "<group>"; };
 		87FE5BB02692F31E0056EFC8 /* moc_tacxneo2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_tacxneo2.cpp; sourceTree = "<group>"; };
@@ -1876,6 +2007,7 @@
 		25B08E2869634E9BCBA333A2 /* Generated Sources */ = {
 			isa = PBXGroup;
 			children = (
+				87C4E5BC2C1C1D2600D0750E /* moc_crossrope.cpp */,
 				87C424252BC1294000503687 /* moc_treadmillErgTable.cpp */,
 				874823FD2B935ADA006F3CA1 /* moc_ergtable.cpp */,
 				87E1CA7C2B8DF04900E3C414 /* moc_trxappgateusbelliptical.cpp */,
@@ -2047,6 +2179,100 @@
 		2EB56BE3C2D93CDAB0C52E67 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				8798FDC02D66075B00CF8EE8 /* osxbluetooth_p.h */,
+				8798FDC12D66075B00CF8EE8 /* osxbtcentralmanager_p.h */,
+				8798FDC22D66075B00CF8EE8 /* osxbtgcdtimer_p.h */,
+				8798FDC32D66075B00CF8EE8 /* OSXBtManagerInternal.mm */,
+				8798FDC42D66075B00CF8EE8 /* osxbtutility_p.h */,
+				87A33F1B2D611D9500BFFF29 /* logwriter.h */,
+				87A33F1C2D611D9500BFFF29 /* logwriter.cpp */,
+				87A33F192D611D8400BFFF29 /* moc_logwriter.cpp */,
+				87A3DD982D3413790060BAEB /* lifespantreadmill.h */,
+				87A3DD992D3413790060BAEB /* lifespantreadmill.cpp */,
+				87A3DD9A2D3413790060BAEB /* moc_lifespantreadmill.cpp */,
+				87FC40B92D2E74F9008BA736 /* cycleopsphantombike.h */,
+				87FC40BA2D2E74F9008BA736 /* cycleopsphantombike.cpp */,
+				87FC40BB2D2E74F9008BA736 /* moc_cycleopsphantombike.cpp */,
+				87EAC3D42D1D8D34004FE975 /* pitpatbike.h */,
+				87EAC3D52D1D8D34004FE975 /* pitpatbike.cpp */,
+				87EAC3D22D1D8D1D004FE975 /* moc_pitpatbike.cpp */,
+				877350F52D1C08E50070CBD8 /* SmartControl.h */,
+				877350F62D1C08E50070CBD8 /* SmartControl.cpp */,
+				875CA94D2D130FBC00667EE6 /* client.hpp */,
+				875CA94E2D130FBC00667EE6 /* error.hpp */,
+				875CA94F2D130FBC00667EE6 /* osc.h */,
+				875CA9502D130FBC00667EE6 /* osc.cpp */,
+				875CA9512D130FBC00667EE6 /* print.hpp */,
+				875CA9522D130FBC00667EE6 /* server.hpp */,
+				875CA9532D130FBC00667EE6 /* types.hpp */,
+				875CA9542D130FBC00667EE6 /* util.hpp */,
+				875CA94B2D130F8100667EE6 /* moc_osc.cpp */,
+				875CA9472D0C742500667EE6 /* kineticinroadbike.h */,
+				875CA9482D0C742500667EE6 /* kineticinroadbike.cpp */,
+				875CA9452D0C740000667EE6 /* moc_kineticinroadbike.cpp */,
+				87873AF22D09AADF005F86B4 /* sportsplusrower.h */,
+				87873AF02D09A8CE005F86B4 /* sportsplusrower.cpp */,
+				87873AED2D09A8AA005F86B4 /* moc_sportsplusrower.cpp */,
+				870A5DB42CEF8FD200839641 /* technogymbike.cpp */,
+				870A5DB22CEF8FB100839641 /* moc_technogymbike.cpp */,
+				8720891A2CE6567D008C2C17 /* mqttpublisher.cpp */,
+				872088F02CE65451008C2C17 /* qmqttauthenticationproperties.h */,
+				872088F12CE65451008C2C17 /* qmqttauthenticationproperties.cpp */,
+				872088F22CE65451008C2C17 /* qmqttclient.h */,
+				872088F32CE65451008C2C17 /* qmqttclient.cpp */,
+				872088F42CE65451008C2C17 /* qmqttclient_p.h */,
+				872088F52CE65451008C2C17 /* qmqttconnection.cpp */,
+				872088F62CE65451008C2C17 /* qmqttconnection_p.h */,
+				872088F72CE65451008C2C17 /* qmqttconnectionproperties.h */,
+				872088F82CE65451008C2C17 /* qmqttconnectionproperties.cpp */,
+				872088F92CE65451008C2C17 /* qmqttconnectionproperties_p.h */,
+				872088FA2CE65451008C2C17 /* qmqttcontrolpacket.cpp */,
+				872088FB2CE65451008C2C17 /* qmqttcontrolpacket_p.h */,
+				872088FC2CE65451008C2C17 /* qmqttglobal.h */,
+				872088FD2CE65451008C2C17 /* qmqttmessage.h */,
+				872088FE2CE65451008C2C17 /* qmqttmessage.cpp */,
+				872088FF2CE65451008C2C17 /* qmqttmessage_p.h */,
+				872089002CE65451008C2C17 /* qmqttpublishproperties.h */,
+				872089012CE65451008C2C17 /* qmqttpublishproperties.cpp */,
+				872089022CE65451008C2C17 /* qmqttpublishproperties_p.h */,
+				872089032CE65451008C2C17 /* qmqttsubscription.h */,
+				872089042CE65451008C2C17 /* qmqttsubscription.cpp */,
+				872089052CE65451008C2C17 /* qmqttsubscription_p.h */,
+				872089062CE65451008C2C17 /* qmqttsubscriptionproperties.h */,
+				872089072CE65451008C2C17 /* qmqttsubscriptionproperties.cpp */,
+				872089082CE65451008C2C17 /* qmqtttopicfilter.h */,
+				872089092CE65451008C2C17 /* qmqtttopicfilter.cpp */,
+				8720890A2CE65451008C2C17 /* qmqtttopicname.h */,
+				8720890B2CE65451008C2C17 /* qmqtttopicname.cpp */,
+				8720890C2CE65451008C2C17 /* qmqtttype.h */,
+				8720890D2CE65451008C2C17 /* qmqtttype.cpp */,
+				872088E62CE6543C008C2C17 /* moc_mqttpublisher.cpp */,
+				872088E72CE6543C008C2C17 /* moc_qmqttclient.cpp */,
+				872088E82CE6543C008C2C17 /* moc_qmqttconnection_p.cpp */,
+				872088E92CE6543C008C2C17 /* moc_qmqttmessage.cpp */,
+				872088EA2CE6543C008C2C17 /* moc_qmqttsubscription.cpp */,
+				87B8718F2CE1E837009B06CA /* Zwift hub.pb.swift */,
+				87A6825B2CE3AB4000586A2A /* sramAXSController.h */,
+				87A6825C2CE3AB4000586A2A /* sramAXSController.cpp */,
+				87A682592CE3AB3100586A2A /* moc_sramAXSController.cpp */,
+				87A083062C73361C00567A4E /* characteristicnotifier2ad9.h */,
+				8772B7F92CB5603A004AB8E9 /* deerruntreadmill.h */,
+				8772B7F62CB55E98004AB8E9 /* deerruntreadmill.cpp */,
+				8772B7F32CB55E80004AB8E9 /* moc_deerruntreadmill.cpp */,
+				877758B52C98629B00BB1697 /* sportstechelliptical.cpp */,
+				877758B42C98629B00BB1697 /* sportstechelliptical.h */,
+				877758B22C98627300BB1697 /* moc_sportstechelliptical.cpp */,
+				8715A3E82C75E6DB009BAC05 /* antbike.cpp */,
+				8715A3E92C75E6DB009BAC05 /* antbike.h */,
+				8715A3E62C75E6C9009BAC05 /* moc_antbike.cpp */,
+				872973832C6F13C300D6D9A4 /* nordictrackifitadbelliptical.cpp */,
+				872973842C6F13C400D6D9A4 /* nordictrackifitadbelliptical.h */,
+				872973812C6F13B000D6D9A4 /* moc_nordictrackifitadbelliptical.cpp */,
+				873D3C4B2C296B3700770CB9 /* jumprope.cpp */,
+				873D3C4C2C296B3700770CB9 /* jumprope.h */,
+				873D3C492C296B0100770CB9 /* moc_jumprope.cpp */,
+				87C4E5BA2C1C1D0900D0750E /* crossrope.cpp */,
+				87C4E5B92C1C1D0900D0750E /* crossrope.h */,
 				874823FF2B935AE6006F3CA1 /* ergtable.h */,
 				87E1CA7E2B8DF06100E3C414 /* trxappgateusbelliptical.cpp */,
 				87E1CA7F2B8DF06100E3C414 /* trxappgateusbelliptical.h */,
@@ -2444,6 +2670,10 @@
 				8710707229C4A5E70094D0F3 /* GarminConnect.swift */,
 				87A2E0202B2B024200E6168F /* swiftDebug.h */,
 				8730A3912B404159007E336D /* zwift_protobuf_layer.swift */,
+				87B871922CE1E94D009B06CA /* zwifthubbike.swift */,
+				87FE06822D170D5600CDAAF6 /* trxappgateusbrower.h */,
+				87FE06832D170D5600CDAAF6 /* trxappgateusbrower.cpp */,
+				87FE06802D170D3C00CDAAF6 /* moc_trxappgateusbrower.cpp */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
@@ -3045,7 +3275,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				F8E0E95C27758CAC67EF1CD4 /* PBXTargetDependency */,
 				876E4E312594748100BD5714 /* PBXTargetDependency */,
 			);
 			name = qdomyoszwift;
@@ -3115,9 +3344,6 @@
 						DevelopmentTeam = 6335M7T29D;
 						ProvisioningStyle = Automatic;
 					};
-					E9F0AFC024A6F2D65CE84E08 = {
-						DevelopmentTeam = 6335M7T29D;
-					};
 				};
 			};
 			buildConfigurationList = DAC4C1AA5EDEA1C85E9CA5E6 /* Build configuration list for PBXProject "qdomyoszwift" */;
@@ -3137,7 +3363,6 @@
 			projectRoot = "";
 			targets = (
 				799833E5566DEFFC37E4BF1E /* qdomyoszwift */,
-				E9F0AFC024A6F2D65CE84E08 /* Qt Preprocess */,
 				876E4E102594747F00BD5714 /* watchkit */,
 				876E4E192594748000BD5714 /* watchkit Extension */,
 			);
@@ -3188,31 +3413,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		5E618435888B9D49F8540165 /* Qt Qmake */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			name = "Qt Qmake";
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "make -C /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug -f qdomyoszwift.xcodeproj/qt_makeqmake.mak";
-			showEnvVarsInLog = 0;
-		};
-		7EF0942E79C014DCEC8976BC /* Qt Preprocessors */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			name = "Qt Preprocessors";
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "make -C /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug -f qdomyoszwift.xcodeproj/qt_preprocess.mak";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		876E4E162594748000BD5714 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -3234,6 +3434,7 @@
 			files = (
 				8738249627E646E3004F1B46 /* characteristicnotifier2acd.cpp in Compile Sources */,
 				8738249127E646E3004F1B46 /* dirconpacket.cpp in Compile Sources */,
+				870A5DB52CEF8FD200839641 /* technogymbike.cpp in Compile Sources */,
 				87C5F0BB26285E5F0067A1B5 /* mimetext.cpp in Compile Sources */,
 				8732C17F27353464006DF424 /* iconceptbike.cpp in Compile Sources */,
 				87CF5169293C879800A7CABC /* characteristicwriteprocessore005.cpp in Compile Sources */,
@@ -3260,6 +3461,7 @@
 				873824BC27E64707004F1B46 /* moc_resolver.cpp in Compile Sources */,
 				87FA11AD27C5ECE4008AC5D1 /* moc_ultrasportbike.cpp in Compile Sources */,
 				871235BF26B297670012D0F2 /* kingsmithr1protreadmill.cpp in Compile Sources */,
+				8772B7F72CB55E98004AB8E9 /* deerruntreadmill.cpp in Compile Sources */,
 				20A50533946A39CBD2C89104 /* bluetoothdevice.cpp in Compile Sources */,
 				87C5F0D126285E7E0067A1B5 /* moc_stagesbike.cpp in Compile Sources */,
 				873824E927E647A8004F1B46 /* mdns.cpp in Compile Sources */,
@@ -3309,6 +3511,7 @@
 				8768C8C92BBC11C80099DBE1 /* adb_client.c in Compile Sources */,
 				873063C0259DF2C500DA0F44 /* moc_heartratebelt.cpp in Compile Sources */,
 				DD5ED224478CB82859C61B9F /* fit_buffered_record_mesg_broadcaster.cpp in Compile Sources */,
+				872973852C6F13C400D6D9A4 /* nordictrackifitadbelliptical.cpp in Compile Sources */,
 				87368825259C602800C71C7E /* watchAppStart.swift in Compile Sources */,
 				87BCE6BF29F28F95001F70EB /* moc_ypooelliptical.cpp in Compile Sources */,
 				876ED21925C3E9000065F3DC /* moc_ftmsbike.cpp in Compile Sources */,
@@ -3321,6 +3524,7 @@
 				E7F190E59DC975BA4CA65F0C /* fit_crc.cpp in Compile Sources */,
 				87A18F092660D5D9002D7C96 /* moc_ftmsrower.cpp in Compile Sources */,
 				DA1DC0B761BD7A3004BCF43D /* fit_date_time.cpp in Compile Sources */,
+				873D3C4D2C296B3800770CB9 /* jumprope.cpp in Compile Sources */,
 				87E1CA7D2B8DF04900E3C414 /* moc_trxappgateusbelliptical.cpp in Compile Sources */,
 				87A3BC232656429600D302E3 /* echelonrower.cpp in Compile Sources */,
 				87DAE16526E9FF3A00B0527E /* solef80treadmill.cpp in Compile Sources */,
@@ -3330,6 +3534,7 @@
 				879F16462847E55C00CE4945 /* proformellipticaltrainer.cpp in Compile Sources */,
 				8730A3922B404159007E336D /* zwift_protobuf_layer.swift in Compile Sources */,
 				87917A7728E768D200F8D9AC /* Client.swift in Compile Sources */,
+				872973822C6F13B100D6D9A4 /* moc_nordictrackifitadbelliptical.cpp in Compile Sources */,
 				873824B927E64707004F1B46 /* moc_provider.cpp in Compile Sources */,
 				8727A47727849EA600019B5D /* paferstreadmill.cpp in Compile Sources */,
 				DF1FD9718B75FA591A7E3D80 /* fit_decode.cpp in Compile Sources */,
@@ -3362,11 +3567,13 @@
 				87BE6FDE272D2A3E00C35795 /* moc_horizongr7bike.cpp in Compile Sources */,
 				A4BD6DF51CFFF867B7B5AED4 /* fit_developer_field_definition.cpp in Compile Sources */,
 				87EB918B27EE5FE7002535E1 /* moc_inappproductqmltype.cpp in Compile Sources */,
+				87873AF12D09A8CE005F86B4 /* sportsplusrower.cpp in Compile Sources */,
 				8762D5132601F89500F6F049 /* scanrecordresult.cpp in Compile Sources */,
 				3015F9B9FF4CA6D653D46CCA /* fit_developer_field_description.cpp in Compile Sources */,
 				87310B22266FBB78008BA0D6 /* moc_homefitnessbuddy.cpp in Compile Sources */,
 				87958F1B27628D5400124B24 /* moc_elitesterzosmart.cpp in Compile Sources */,
 				8768C8D82BBC12890099DBE1 /* centraldir.c in Compile Sources */,
+				8772B7F42CB55E80004AB8E9 /* moc_deerruntreadmill.cpp in Compile Sources */,
 				87CC3BA425A0885F001EC5A8 /* elliptical.cpp in Compile Sources */,
 				4AD2C93A2B8FD5855E521630 /* fit_encode.cpp in Compile Sources */,
 				87EB918C27EE5FE7002535E1 /* moc_inappproduct.cpp in Compile Sources */,
@@ -3387,9 +3594,11 @@
 				87D269A325F535340076AA48 /* moc_skandikawiribike.cpp in Compile Sources */,
 				87F4FB5C29D550E00061BB4A /* moc_schwinn170bike.cpp in Compile Sources */,
 				87C5F0C226285E5F0067A1B5 /* emailaddress.cpp in Compile Sources */,
+				87B871902CE1E837009B06CA /* Zwift hub.pb.swift in Compile Sources */,
 				873824AF27E64706004F1B46 /* moc_characteristicwriteprocessor2ad9.cpp in Compile Sources */,
 				25F2400F80DAFBD41FE5CC75 /* fit_field.cpp in Compile Sources */,
 				873824E227E647A8004F1B46 /* dns.cpp in Compile Sources */,
+				8715A3EA2C75E6DB009BAC05 /* antbike.cpp in Compile Sources */,
 				87A3BC27265642A300D302E3 /* moc_echelonrower.cpp in Compile Sources */,
 				8768C9092BBC12B80099DBE1 /* socket_local_server.c in Compile Sources */,
 				87EFB56E25BD703D0039DD5A /* proformtreadmill.cpp in Compile Sources */,
@@ -3408,23 +3617,42 @@
 				87E6A85B25B5C8B900371D28 /* flywheelbike.cpp in Compile Sources */,
 				87182A09276BBAF600141463 /* virtualrower.cpp in Compile Sources */,
 				87C424262BC1294000503687 /* moc_treadmillErgTable.cpp in Compile Sources */,
+				877350F72D1C08E60070CBD8 /* SmartControl.cpp in Compile Sources */,
 				873824ED27E647A9004F1B46 /* resolver.cpp in Compile Sources */,
+				875CA9552D130FBC00667EE6 /* osc.cpp in Compile Sources */,
 				878531652711A3E1004B153D /* activiotreadmill.cpp in Compile Sources */,
 				87DAE16926E9FF5000B0527E /* moc_shuaa5treadmill.cpp in Compile Sources */,
 				48BA9CE9D6F256A15E8FB25D /* fit_mesg.cpp in Compile Sources */,
 				DD2E0091F3318F053D2995AA /* fit_mesg_broadcaster.cpp in Compile Sources */,
 				FE77C778768741F1A161682E /* fit_mesg_definition.cpp in Compile Sources */,
 				875F69B926342E8D0009FD78 /* spirittreadmill.cpp in Compile Sources */,
+				87A6825D2CE3AB4000586A2A /* sramAXSController.cpp in Compile Sources */,
 				87DF68B825E2673B00FCDA46 /* eslinkertreadmill.cpp in Compile Sources */,
+				8720890E2CE65451008C2C17 /* qmqttsubscriptionproperties.cpp in Compile Sources */,
+				8720890F2CE65451008C2C17 /* qmqttconnectionproperties.cpp in Compile Sources */,
+				872089102CE65451008C2C17 /* qmqttconnection.cpp in Compile Sources */,
+				872089112CE65451008C2C17 /* qmqttsubscription.cpp in Compile Sources */,
+				872089122CE65451008C2C17 /* qmqttclient.cpp in Compile Sources */,
+				872089132CE65451008C2C17 /* qmqtttopicfilter.cpp in Compile Sources */,
+				872089142CE65451008C2C17 /* qmqtttype.cpp in Compile Sources */,
+				872089152CE65451008C2C17 /* qmqttcontrolpacket.cpp in Compile Sources */,
+				872089162CE65451008C2C17 /* qmqttmessage.cpp in Compile Sources */,
+				872089172CE65451008C2C17 /* qmqtttopicname.cpp in Compile Sources */,
+				872089182CE65451008C2C17 /* qmqttpublishproperties.cpp in Compile Sources */,
+				872089192CE65451008C2C17 /* qmqttauthenticationproperties.cpp in Compile Sources */,
+				87FE06842D170D5600CDAAF6 /* trxappgateusbrower.cpp in Compile Sources */,
 				87BCE6BD29F28F72001F70EB /* ypooelliptical.cpp in Compile Sources */,
 				87C7074327E4CF5900E79C46 /* keepbike.cpp in Compile Sources */,
+				87B871932CE1E94D009B06CA /* zwifthubbike.swift in Compile Sources */,
 				878C9E6928B77E7C00669129 /* nordictrackifitadbbike.cpp in Compile Sources */,
+				87A33F1D2D611D9500BFFF29 /* logwriter.cpp in Compile Sources */,
 				8798C8892733E10E003148B3 /* moc_strydrunpowersensor.cpp in Compile Sources */,
 				8781907E2615089D0085E656 /* peloton.cpp in Compile Sources */,
 				2B800DC34C91D8B080DEFBE8 /* fit_mesg_with_event_broadcaster.cpp in Compile Sources */,
 				6DC5D7C695B8763F9E2E029F /* fit_profile.cpp in Compile Sources */,
 				8710706C29C48AEA0094D0F3 /* handleurl.cpp in Compile Sources */,
 				87C5F0B726285E5F0067A1B5 /* mimecontentformatter.cpp in Compile Sources */,
+				873D3C4A2C296B0100770CB9 /* moc_jumprope.cpp in Compile Sources */,
 				23191C28CB29474279752FD3 /* fit_protocol_validator.cpp in Compile Sources */,
 				275D55B5D956B2E5F1B7E46E /* fit_unicode.cpp in Compile Sources */,
 				87F527BE28EEB5AA00A9F8D5 /* qzsettings.cpp in Compile Sources */,
@@ -3443,6 +3671,7 @@
 				7CF08714869DA569C2EA551C /* keepawakehelper.cpp in Compile Sources */,
 				87EB918727EE5FE7002535E1 /* moc_nautilusbike.cpp in Compile Sources */,
 				873824B827E64707004F1B46 /* moc_cache.cpp in Compile Sources */,
+				87873AEE2D09A8AA005F86B4 /* moc_sportsplusrower.cpp in Compile Sources */,
 				873824E427E647A8004F1B46 /* cache.cpp in Compile Sources */,
 				87A2E0222B2B053E00E6168F /* swiftDebug.mm in Compile Sources */,
 				87310B1E266FBB59008BA0D6 /* smartrowrower.cpp in Compile Sources */,
@@ -3476,6 +3705,7 @@
 				87C5F0C026285E5F0067A1B5 /* mimepart.cpp in Compile Sources */,
 				47E45EE0BB22C1E4332F1D1D /* trxappgateusbtreadmill.cpp in Compile Sources */,
 				873824BB27E64707004F1B46 /* moc_prober_p.cpp in Compile Sources */,
+				877758B32C98627300BB1697 /* moc_sportstechelliptical.cpp in Compile Sources */,
 				8742C2B227C92C30007D3FA0 /* wahookickrsnapbike.cpp in Compile Sources */,
 				87EB918327EE5FE7002535E1 /* moc_inappstore.cpp in Compile Sources */,
 				87CF516B293C87B000A7CABC /* moc_characteristicwriteprocessore005.cpp in Compile Sources */,
@@ -3490,9 +3720,11 @@
 				87EB918A27EE5FE7002535E1 /* qdomyoszwift_qmltyperegistrations.cpp in Compile Sources */,
 				87182A0B276BBB1200141463 /* moc_virtualrower.cpp in Compile Sources */,
 				872DCC3B2A18D4C000EC9F68 /* moc_virtualdevice.cpp in Compile Sources */,
+				87C4E5BB2C1C1D0900D0750E /* crossrope.cpp in Compile Sources */,
 				0317752B0C295CAB82D37E45 /* virtualtreadmill.cpp in Compile Sources */,
 				8742C2B427C92C48007D3FA0 /* moc_wahookickrsnapbike.cpp in Compile Sources */,
 				878531692711A3EC004B153D /* moc_fakebike.cpp in Compile Sources */,
+				870A5DB32CEF8FB100839641 /* moc_technogymbike.cpp in Compile Sources */,
 				873824B027E64706004F1B46 /* moc_cache_p.cpp in Compile Sources */,
 				87EB918627EE5FE7002535E1 /* moc_inapppurchasebackend.cpp in Compile Sources */,
 				87097D31275EA9AF0020EE6F /* moc_sportsplusbike.cpp in Compile Sources */,
@@ -3503,6 +3735,12 @@
 				87A0C4BB262329A600121A76 /* npecablebike.cpp in Compile Sources */,
 				873CD22D27EF8E4B000131BC /* iosinapppurchaseproduct.mm in Compile Sources */,
 				873CD20727EF8D8A000131BC /* inappproduct.cpp in Compile Sources */,
+				872088EB2CE6543C008C2C17 /* moc_mqttpublisher.cpp in Compile Sources */,
+				872088EC2CE6543C008C2C17 /* moc_qmqttclient.cpp in Compile Sources */,
+				875CA94C2D130F8100667EE6 /* moc_osc.cpp in Compile Sources */,
+				872088ED2CE6543C008C2C17 /* moc_qmqttmessage.cpp in Compile Sources */,
+				872088EE2CE6543C008C2C17 /* moc_qmqttsubscription.cpp in Compile Sources */,
+				872088EF2CE6543C008C2C17 /* moc_qmqttconnection_p.cpp in Compile Sources */,
 				87A3BC26265642A300D302E3 /* moc_rower.cpp in Compile Sources */,
 				87EFE45B27A51901006EA1C3 /* moc_nautiluselliptical.cpp in Compile Sources */,
 				872DCC392A18D4A800EC9F68 /* virtualdevice.cpp in Compile Sources */,
@@ -3527,9 +3765,11 @@
 				873824AE27E64706004F1B46 /* moc_browser.cpp in Compile Sources */,
 				8738249727E646E3004F1B46 /* characteristicnotifier2a53.cpp in Compile Sources */,
 				DF373364C5474D877506CB26 /* FitMesg.mm in Compile Sources */,
+				87FE06812D170D3C00CDAAF6 /* moc_trxappgateusbrower.cpp in Compile Sources */,
 				872261F0289EA887006A6F75 /* moc_nordictrackelliptical.cpp in Compile Sources */,
 				873824E327E647A8004F1B46 /* bitmap.cpp in Compile Sources */,
 				87FE5BB12692F31E0056EFC8 /* moc_tacxneo2.cpp in Compile Sources */,
+				8798FDC52D66075B00CF8EE8 /* OSXBtManagerInternal.mm in Compile Sources */,
 				873824E827E647A8004F1B46 /* provider.cpp in Compile Sources */,
 				8791A8AA25C8603F003B50B2 /* moc_inspirebike.cpp in Compile Sources */,
 				03F49BBCF19B73B18385B13D /* FitMesgDefinition.mm in Compile Sources */,
@@ -3539,6 +3779,7 @@
 				8783153C25E8DAFD0007817C /* sportstechbike.cpp in Compile Sources */,
 				873824E527E647A8004F1B46 /* message.cpp in Compile Sources */,
 				210F6A0A7E2FA7CDD3CA0084 /* qdomyoszwift_qml_plugin_import.cpp in Compile Sources */,
+				8715A3E72C75E6C9009BAC05 /* moc_antbike.cpp in Compile Sources */,
 				87062644259480A600D06586 /* APIFetcher.swift in Compile Sources */,
 				8768C8C72BBC11C80099DBE1 /* adb_auth_host.c in Compile Sources */,
 				87F02E4029178524000DB52C /* octaneelliptical.cpp in Compile Sources */,
@@ -3556,6 +3797,7 @@
 				8768C9062BBC12B80099DBE1 /* socket_local_client.c in Compile Sources */,
 				8727C7D42B3BF1E4005429EB /* moc_QTelnet.cpp in Compile Sources */,
 				C3D1FD2587BF6F15B58BA675 /* moc_bluetooth.cpp in Compile Sources */,
+				8720891B2CE6567D008C2C17 /* mqttpublisher.cpp in Compile Sources */,
 				87062648259480B700D06586 /* WorkoutTracking.swift in Compile Sources */,
 				8C3422A825EF7ECD78951307 /* moc_bluetoothdevice.cpp in Compile Sources */,
 				8785D5432B3DD105005A2EB7 /* moc_PlayerStateWrapper.cpp in Compile Sources */,
@@ -3579,14 +3821,17 @@
 				E62DA5FF2436135448C94671 /* moc_toorxtreadmill.cpp in Compile Sources */,
 				87586A4325B8341B00A243C4 /* moc_proformbike.cpp in Compile Sources */,
 				87CC3BA325A0885F001EC5A8 /* domyoselliptical.cpp in Compile Sources */,
+				87A33F1A2D611D8400BFFF29 /* moc_logwriter.cpp in Compile Sources */,
 				87D105542909971100B3935B /* moc_mepanelbike.cpp in Compile Sources */,
 				87B617F325F260150094A1CB /* moc_snodebike.cpp in Compile Sources */,
 				87DA8467284933DE00B550E9 /* moc_fakeelliptical.cpp in Compile Sources */,
 				87C5F0D726285E7E0067A1B5 /* moc_mimefile.cpp in Compile Sources */,
 				877FBA29276E684500F6C0C9 /* bowflextreadmill.cpp in Compile Sources */,
+				877758B62C98629B00BB1697 /* sportstechelliptical.cpp in Compile Sources */,
 				8762D5102601F7EA00F6F049 /* M3iNSQT.cpp in Compile Sources */,
 				872261EE289EA873006A6F75 /* nordictrackelliptical.cpp in Compile Sources */,
 				8718CBA3263063BD004BF4EE /* templateinfosender.cpp in Compile Sources */,
+				87EAC3D62D1D8D34004FE975 /* pitpatbike.cpp in Compile Sources */,
 				E8B499F921FB0AB55C7A8A8B /* moc_gpx.cpp in Compile Sources */,
 				87E6A85825B5C88E00371D28 /* moc_flywheelbike.cpp in Compile Sources */,
 				8754D24C27F786F0003D7054 /* virtualrower.swift in Compile Sources */,
@@ -3599,6 +3844,7 @@
 				879E5AA8289C057E00FEA38A /* proformwifitreadmill.cpp in Compile Sources */,
 				873824B227E64706004F1B46 /* moc_hostname.cpp in Compile Sources */,
 				873824EB27E647A8004F1B46 /* prober.cpp in Compile Sources */,
+				875CA9462D0C740000667EE6 /* moc_kineticinroadbike.cpp in Compile Sources */,
 				8767EF1E29448D6700810C0F /* characteristicwriteprocessor.cpp in Compile Sources */,
 				87B617F425F260150094A1CB /* moc_screencapture.cpp in Compile Sources */,
 				87B617ED25F25FED0094A1CB /* fitshowtreadmill.cpp in Compile Sources */,
@@ -3611,10 +3857,13 @@
 				8727C7D12B3BF1B8005429EB /* QTelnet.cpp in Compile Sources */,
 				8775008329E876F8008E48B7 /* iconceptelliptical.cpp in Compile Sources */,
 				87B187BD29B8C577007EEF9D /* moc_ziprotreadmill.cpp in Compile Sources */,
+				875CA9492D0C742500667EE6 /* kineticinroadbike.cpp in Compile Sources */,
 				877FBA2B276E684E00F6C0C9 /* moc_bowflextreadmill.cpp in Compile Sources */,
 				874D272229AFA13B0007C079 /* moc_apexbike.cpp in Compile Sources */,
 				8738248127E646C1004F1B46 /* characteristicnotifier2ad2.cpp in Compile Sources */,
+				87A6825A2CE3AB3100586A2A /* moc_sramAXSController.cpp in Compile Sources */,
 				87A0771029B641D600A368BF /* wahookickrheadwind.cpp in Compile Sources */,
+				87EAC3D32D1D8D1D004FE975 /* moc_pitpatbike.cpp in Compile Sources */,
 				8791A8AB25C861BD003B50B2 /* inspirebike.cpp in Compile Sources */,
 				876BFC9D27BE35C5001D7645 /* bowflext216treadmill.cpp in Compile Sources */,
 				871235C126B297720012D0F2 /* moc_kingsmithr1protreadmill.cpp in Compile Sources */,
@@ -3626,6 +3875,7 @@
 				873824BE27E64707004F1B46 /* moc_server.cpp in Compile Sources */,
 				AFEC086E92015064EB841234 /* moc_trainprogram.cpp in Compile Sources */,
 				87EB918227EE5FE7002535E1 /* moc_inapptransaction.cpp in Compile Sources */,
+				87C4E5BD2C1C1D2600D0750E /* moc_crossrope.cpp in Compile Sources */,
 				878531642711A3E1004B153D /* fakebike.cpp in Compile Sources */,
 				87A0C4C0262329B500121A76 /* moc_npecablebike.cpp in Compile Sources */,
 				87DAE16B26E9FF5000B0527E /* moc_solef80treadmill.cpp in Compile Sources */,
@@ -3652,6 +3902,8 @@
 				87EB918827EE5FE7002535E1 /* moc_inappstoreqmltype.cpp in Compile Sources */,
 				87083D9626678EFA0072410D /* zwiftworkout.cpp in Compile Sources */,
 				87C5F0B826285E5F0067A1B5 /* stagesbike.cpp in Compile Sources */,
+				87FC40BC2D2E74F9008BA736 /* cycleopsphantombike.cpp in Compile Sources */,
+				87FC40BD2D2E74F9008BA736 /* moc_cycleopsphantombike.cpp in Compile Sources */,
 				87C5F0D526285E7E0067A1B5 /* moc_mimehtml.cpp in Compile Sources */,
 				871B9FD4265E6A9A00DB41F4 /* moc_powerzonepack.cpp in Compile Sources */,
 				87A0C4BF262329B500121A76 /* moc_cscbike.cpp in Compile Sources */,
@@ -3659,6 +3911,8 @@
 				8790FDE1277B0AC600247550 /* moc_nautilustreadmill.cpp in Compile Sources */,
 				8727A47927849EB200019B5D /* moc_paferstreadmill.cpp in Compile Sources */,
 				8783153B25E8D81E0007817C /* moc_sportstechbike.cpp in Compile Sources */,
+				87A3DD9B2D3413790060BAEB /* moc_lifespantreadmill.cpp in Compile Sources */,
+				87A3DD9C2D3413790060BAEB /* lifespantreadmill.cpp in Compile Sources */,
 				875F69BB26342E9A0009FD78 /* moc_spirittreadmill.cpp in Compile Sources */,
 				8768C8BF2BBC11C80099DBE1 /* transport.c in Compile Sources */,
 			);
@@ -3678,11 +3932,6 @@
 			target = 876E4E102594747F00BD5714 /* watchkit */;
 			targetProxy = 876E4E302594748100BD5714 /* PBXContainerItemProxy */;
 		};
-		F8E0E95C27758CAC67EF1CD4 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = E9F0AFC024A6F2D65CE84E08 /* Qt Preprocess */;
-			targetProxy = 876E4E0E2594739400BD5714 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -4006,7 +4255,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 791;
+				CURRENT_PROJECT_VERSION = 1035;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "ADB_HOST=1";
@@ -4039,6 +4288,9 @@
 					../../Qt/5.15.2/ios/include/QtMultimedia,
 					../src/devices,
 					../src/ios/adb/include,
+					../../Qt/5.15.2/ios/include/QtCore/5.15.2/QtCore/private,
+					../../Qt/5.15.2/ios/include/QtCore/5.15.2,
+					../../Qt/5.15.2/ios/include/QtCore/5.15.2/QtCore/,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/platforms,
@@ -4085,7 +4337,7 @@
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/audio,
 					"/Users/cagnulein/qdomyos-zwift/src/ios/adb",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				OTHER_CFLAGS = (
 					"-pipe",
 					"-g",
@@ -4197,7 +4449,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 791;
+				CURRENT_PROJECT_VERSION = 1035;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = NO;
@@ -4232,6 +4484,9 @@
 					../../Qt/5.15.2/ios/include/QtMultimedia,
 					../src/devices,
 					../src/ios/adb/include,
+					../../Qt/5.15.2/ios/include/QtCore/5.15.2/QtCore/private,
+					../../Qt/5.15.2/ios/include/QtCore/5.15.2,
+					../../Qt/5.15.2/ios/include/QtCore/5.15.2/QtCore/,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/platforms,
@@ -4278,7 +4533,7 @@
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/audio,
 					"/Users/cagnulein/qdomyos-zwift/src/ios/adb",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-pipe",
@@ -4424,7 +4679,7 @@
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 791;
+				CURRENT_PROJECT_VERSION = 1035;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4449,7 +4704,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_CODE_SIGN_FLAGS = "--generate-entitlement-der";
@@ -4520,7 +4775,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 791;
+				CURRENT_PROJECT_VERSION = 1035;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = YES;
@@ -4541,7 +4796,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_CODE_SIGN_FLAGS = "--generate-entitlement-der";
@@ -4612,7 +4867,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 791;
+				CURRENT_PROJECT_VERSION = 1035;
 				DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
 				ENABLE_BITCODE = YES;
 				ENABLE_PREVIEWS = YES;
@@ -4657,7 +4912,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_CODE_SIGN_FLAGS = "--generate-entitlement-der";
@@ -4677,6 +4932,8 @@
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				STRIP_INSTALLED_PRODUCT = NO;
+				STRIP_SWIFT_SYMBOLS = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -4726,7 +4983,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 791;
+				CURRENT_PROJECT_VERSION = 1035;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
 				ENABLE_BITCODE = YES;
@@ -4767,7 +5024,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_CODE_SIGN_FLAGS = "--generate-entitlement-der";
@@ -4787,6 +5044,8 @@
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				STRIP_INSTALLED_PRODUCT = NO;
+				STRIP_SWIFT_SYMBOLS = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/MainController.swift

@@ -107,6 +107,7 @@ extension MainController: WorkoutTrackingDelegate {
         WorkoutTracking.speed = WatchKitConnection.speed
         WorkoutTracking.power = WatchKitConnection.power
         WorkoutTracking.cadence = WatchKitConnection.cadence
+        WorkoutTracking.steps = WatchKitConnection.steps
                 
 		if Locale.current.measurementSystem != "Metric" {
 			self.distanceLabel.setText("Distance \(String(format:"%.2f", WorkoutTracking.distance))")

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/WatchKitConnection.swift

@@ -27,6 +27,7 @@ class WatchKitConnection: NSObject {
     public static var speed = 0.0
     public static var cadence = 0.0
     public static var power = 0.0
+    public static var steps = 0
     weak var delegate: WatchKitConnectionDelegate?
     
     private override init() {
@@ -76,6 +77,10 @@ extension WatchKitConnection: WatchKitConnectionProtocol {
             WatchKitConnection.power = dPower
             let dCadence = Double(result["cadence"] as! Double)
             WatchKitConnection.cadence = dCadence
+            if let stepsDouble = result["steps"] as? Double {
+                let iSteps = Int(stepsDouble)
+                WatchKitConnection.steps = iSteps
+            }
         }, errorHandler: { (error) in
             print(error)
         })

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/WatchWorkoutTracking.swift

@@ -33,6 +33,7 @@ class WorkoutTracking: NSObject {
     public static var cadenceSteps = 0
     public static var speed = Double()
     public static var power = Double()
+    public static var steps = Int()
     public static var cadence = Double()
     public static var lastDateMetric = Date()
     var sport: Int = 0
@@ -269,6 +270,43 @@ extension WorkoutTracking: WorkoutTrackingProtocol {
             }
         } else {
             
+            // Guard to check if steps quantity type is available
+            guard let quantityTypeSteps = HKQuantityType.quantityType(
+                forIdentifier: .stepCount) else {
+                return
+            }
+
+            let stepsQuantity = HKQuantity(unit: HKUnit.count(), doubleValue: Double(WorkoutTracking.steps))
+            
+            // Create a sample for total steps
+            let sampleSteps = HKCumulativeQuantitySeriesSample(
+                type: quantityTypeSteps,
+                quantity: stepsQuantity,  // Use your steps quantity here
+                start: workoutSession.startDate!,
+                end: Date())
+
+            // Add the steps sample to workout builder
+            workoutBuilder.add([sampleSteps]) { (success, error) in
+                if let error = error {
+                    print(error)
+                }
+                
+                // End the data collection
+                self.workoutBuilder.endCollection(withEnd: Date()) { (success, error) in
+                    if let error = error {
+                        print(error)
+                    }
+                    
+                    // Finish the workout and save total steps
+                    self.workoutBuilder.finishWorkout { (workout, error) in
+                        if let error = error {
+                            print(error)
+                        }
+                        workout?.setValue(stepsQuantity, forKey: "totalSteps")
+                    }
+                }
+            }
+            
             guard let quantityTypeDistance = HKQuantityType.quantityType(
                 forIdentifier: .distanceWalkingRunning) else {
               return
@@ -402,7 +440,7 @@ extension WorkoutTracking: HKLiveWorkoutBuilderDelegate {
                 // Fallback on earlier versions
             }
         } else if(sport == 1) {
-            if #available(watchOSApplicationExtension 10.0, *) {            
+            if #available(watchOSApplicationExtension 10.0, *) {
                 let wattPerInterval = HKQuantity(unit: HKUnit.watt(),
                                                 doubleValue: WorkoutTracking.power)
                 
@@ -445,7 +483,7 @@ extension WorkoutTracking: HKLiveWorkoutBuilderDelegate {
                 // Fallback on earlier versions
             }
         } else if(sport == 2) {
-            if #available(watchOSApplicationExtension 10.0, *) {                                      
+            if #available(watchOSApplicationExtension 10.0, *) {
                 let speedPerInterval = HKQuantity(unit: HKUnit.meter().unitDivided(by: HKUnit.second()),
                                                 doubleValue: WorkoutTracking.speed * 0.277778)
                 

docker/linux_gui_vnc/Dockerfile

@@ -0,0 +1,96 @@
+# Define build image
+FROM ubuntu:latest AS build
+
+# Install essential build dependencies
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt upgrade -y \
+    && apt install --no-install-recommends -y \
+        git \
+        ca-certificates \
+        qtquickcontrols2-5-dev \
+        qtconnectivity5-dev \
+        qtbase5-private-dev \
+        qtpositioning5-dev \
+        libqt5charts5-dev \
+        libqt5networkauth5-dev \
+        libqt5websockets5-dev \
+        qml-module* \
+        libqt5texttospeech5-dev \
+        qtlocation5-dev \
+        qtmultimedia5-dev \
+        g++ \
+        make \
+        wget \
+        unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Define runtime image        
+FROM ubuntu:latest AS runtime
+
+# Install essential runtime dependencies
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt upgrade -y \
+    && apt install --no-install-recommends -y \
+        libqt5bluetooth5 \
+        libqt5widgets5 \
+        libqt5positioning5 \
+        libqt5xml5 \
+        libqt5charts5 \
+        qt5-assistant \
+        libqt5networkauth5 \
+        libqt5websockets5 \
+        qml-module* \
+        libqt5texttospeech5 \
+        libqt5location5-plugins \
+        libqt5multimediawidgets5 \
+        libqt5multimedia5-plugins \
+        libqt5multimedia5 \
+        qml-module-qtquick-controls2 \
+        libqt5location5 \
+        bluez \
+        dbus \
+        tigervnc-standalone-server \
+        tigervnc-tools \
+        libgl1-mesa-dri \
+        xfonts-base \
+        x11-xserver-utils \
+        tigervnc-common \
+        net-tools \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Stage 1: Build
+FROM build AS builder
+
+# Clone the project and build it
+WORKDIR /usr/local/src
+RUN git clone --recursive https://github.com/cagnulein/qdomyos-zwift.git
+WORKDIR /usr/local/src/qdomyos-zwift
+RUN git submodule update --init src/smtpclient/ \
+    && git submodule update --init src/qmdnsengine/ \
+    && git submodule update --init tst/googletest/
+WORKDIR /usr/local/src/qdomyos-zwift/src
+RUN qmake qdomyos-zwift.pro \
+    && make -j4
+
+
+# Stage 2: Runtime
+FROM runtime
+
+# Copy the built binary to /usr/local/bin
+COPY --from=builder /usr/local/src/qdomyos-zwift/src/qdomyos-zwift /usr/local/bin/qdomyos-zwift
+
+# VNC configuration
+RUN mkdir -p ~/.vnc && \
+    echo "securepassword" | vncpasswd -f > ~/.vnc/passwd && \
+    chmod 600 ~/.vnc/passwd
+
+# .Xauthority configuration
+RUN touch /root/.Xauthority
+ENV DISPLAY=:99
+
+# Start VNC server with authentication
+CMD vncserver :99 -depth 24 -localhost no -xstartup qdomyos-zwift && \
+    sleep infinity
+

docker/linux_gui_vnc/build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build -t qdomyos-zwift-vnc .

docker/linux_gui_vnc/docker-compose.yml

@@ -0,0 +1,10 @@
+services:
+  qdomyos-zwift-vnc:
+    image: qdomyos-zwift-vnc
+    container_name: qdomyos-zwift-vnc
+    privileged: true  # Required for Bluetooth functionality
+    network_mode: "host"  # Used to access host Bluetooth and D-Bus
+    volumes:
+      - /dev:/dev  # Forward host devices (for Bluetooth)
+      - /run/dbus:/run/dbus  # Forward D-Bus for Bluetooth interaction
+    restart: "no"  # Do not restart the container automatically

docker/linux_webgl/Dockerfile

@@ -0,0 +1,95 @@
+# Define build image
+FROM ubuntu:latest AS build
+
+# Install essential build dependencies
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt upgrade -y \
+    && apt install --no-install-recommends -y \
+        git \
+        ca-certificates \
+        qtquickcontrols2-5-dev \
+        qtconnectivity5-dev \
+        qtbase5-private-dev \
+        qtpositioning5-dev \
+        libqt5charts5-dev \
+        libqt5networkauth5-dev \
+        libqt5websockets5-dev \
+        qml-module* \
+        libqt5texttospeech5-dev \
+        qtlocation5-dev \
+        qtmultimedia5-dev \
+        g++ \
+        make \
+        wget \
+        unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Define runtime image        
+FROM ubuntu:latest AS runtime
+
+# Install essential runtime dependencies
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt upgrade -y \
+    && apt install --no-install-recommends -y \
+        libqt5bluetooth5 \
+        libqt5widgets5 \
+        libqt5positioning5 \
+        libqt5xml5 \
+        libqt5charts5 \
+        qt5-assistant \
+        libqt5networkauth5 \
+        libqt5websockets5 \
+        qml-module* \
+        libqt5texttospeech5 \
+        libqt5location5-plugins \
+        libqt5multimediawidgets5 \
+        libqt5multimedia5-plugins \
+        libqt5multimedia5 \
+        qml-module-qtquick-controls2 \
+        libqt5location5 \
+        bluez \
+        dbus \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Stage 1: Build
+FROM build AS builder
+
+# Define variables for Qt versions
+ARG QT_VERSION=5.15
+ARG QT_SUBVERSION=5.15.13
+ARG QT_WEBPLUGIN_NAME=qtwebglplugin-everywhere-opensource-src
+
+# Build WebGL plugin
+WORKDIR /usr/local/src
+RUN wget https://download.qt.io/official_releases/qt/${QT_VERSION}/${QT_SUBVERSION}/submodules/${QT_WEBPLUGIN_NAME}-${QT_SUBVERSION}.zip \
+    && unzip ${QT_WEBPLUGIN_NAME}-${QT_SUBVERSION}.zip \
+    && mv *-${QT_SUBVERSION} qtwebglplugin-everywhere \
+    && cd qtwebglplugin-everywhere \
+    && qmake \
+    && make
+
+# Clone the project and build it
+WORKDIR /usr/local/src
+RUN git clone --recursive https://github.com/cagnulein/qdomyos-zwift.git
+WORKDIR /usr/local/src/qdomyos-zwift
+RUN git submodule update --init src/smtpclient/ \
+    && git submodule update --init src/qmdnsengine/ \
+    && git submodule update --init tst/googletest/
+WORKDIR /usr/local/src/qdomyos-zwift/src
+RUN qmake qdomyos-zwift.pro \
+    && make -j4
+
+
+# Stage 2: Runtime
+FROM runtime
+
+# Copy the built binary to /usr/local/bin
+COPY --from=builder /usr/local/src/qdomyos-zwift/src/qdomyos-zwift /usr/local/bin/qdomyos-zwift
+
+# Copy WebGL plugin to the appropriate location
+COPY --from=builder /usr/local/src/qtwebglplugin-everywhere/plugins/platforms/libqwebgl.so /usr/lib/x86_64-linux-gnu/qt5/plugins/platforms/libqwebgl.so
+
+# Set the default command to run the application with WebGL
+CMD ["qdomyos-zwift", "-qml", "-platform", "webgl:port=8080"]

docker/linux_webgl/build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build -t qdomyos-zwift-webgl .

docker/linux_webgl/docker-compose.yml

@@ -0,0 +1,19 @@
+services:
+  qdomyos-zwift-webgl:
+    image: qdomyos-zwift-webgl
+    container_name: qdomyos-zwift-webgl
+    privileged: true
+    network_mode: "host"
+    environment:
+      - DISPLAY=${DISPLAY}
+    volumes:
+      - /dev:/dev
+      - /run/dbus:/run/dbus
+      - ./.config:/root/.config
+      - /tmp/.X11-unix:/tmp/.X11-unix
+    stdin_open: true
+    tty: true
+    restart: "no"
+#    command: qdomyos-zwift -qml -platform webgl:port=8080
+#    command: ["qdomyos-zwift", "-no-gui"]
+

docs/10_Installation.md

@@ -10,7 +10,7 @@ These instructions build the app itself, not the test project.
 
 ```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 g++ make
+$ sudo apt install git qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtbase5-private-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 g++ make
 $ git clone https://github.com/cagnulein/qdomyos-zwift.git
 $ cd qdomyos-zwift
 $ git submodule update --init src/smtpclient/
@@ -106,7 +106,7 @@ This operation takes a moment to complete.
 #### Install qdomyos-zwift from sources
 
 ```bash
-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 g++ make
+sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtbase5-private-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 g++ make
 git clone https://github.com/cagnulein/qdomyos-zwift.git
 cd qdomyos-zwift
 git submodule update --init src/smtpclient/  
@@ -117,6 +117,11 @@ qmake qdomyos-zwift.pro
 make  
 ```
 
+If you need GUI also do a
+```
+apt install qml-module*
+```
+
 Please note :
 - Don't build the application with `-j4` option (this will fail)
 - Build operation is circa 45 minutes (subsequent builds are faster)
@@ -172,6 +177,151 @@ If everything is working as expected, **enable your service at boot time** :
 
 Then reboot to check operations (`sudo reboot`)
 
+### (optional) Treadmill Auto-Detection and Service Management
+This section provides a reliable way to manage the QZ service based on the treadmill's power state. Using a `bluetoothctl`-based Bash script, this solution ensures the QZ service starts when the treadmill is detected and stops when it is not.
+
+- **Bluetooth Discovery**: Monitors treadmill availability via `bluetoothctl`.
+- **Service Control**: Automatically starts and stops the QZ service.
+- **Logging**: Tracks treadmill status and actions in a log file.
+
+**Notes:**
+- Ensure `bluetoothctl` is installed and working on your system.
+- Replace `I_TL` in the script with your treadmill's Bluetooth name. You can find your device name via `bluetoothctl scan on`
+- Adjust the sleep interval (`sleep 30`) in the script as needed for your use case.
+
+Step 1: Save the following script as `/root/qz-treadmill-monitor.sh`:
+```bash
+#!/bin/bash
+
+LOG_FILE="/var/log/qz-treadmill-monitor.log"
+TARGET_DEVICE="I_TL"
+SCAN_INTERVAL=30  # Time in seconds between checks
+SERVICE_NAME="qz"
+DEBUG_LOG_DIR="/var/log"  # Directory where QZ debug logs are stored
+ERROR_MESSAGE="BTLE stateChanged InvalidService"
+
+log() {
+    echo "$(date '+%Y-%m-%d %H:%M:%S') - $1" >> "$LOG_FILE"
+}
+
+is_service_running() {
+    systemctl is-active --quiet "$SERVICE_NAME"
+    return $?
+}
+
+scan_for_device() {
+    log "Starting Bluetooth scan for $TARGET_DEVICE..."
+
+    # Run bluetoothctl scan in the background and capture output
+    bluetoothctl scan on &>/dev/null &
+    SCAN_PID=$!
+
+    # Allow some time for devices to appear
+    sleep 5
+
+    # Check if the target device appears in the list
+    bluetoothctl devices | grep -q "$TARGET_DEVICE"
+    DEVICE_FOUND=$?
+
+    # Stop scanning
+    kill "$SCAN_PID"
+    bluetoothctl scan off &>/dev/null
+
+    if [ $DEVICE_FOUND -eq 0 ]; then
+        log "Device '$TARGET_DEVICE' found."
+        return 0
+    else
+        log "Device '$TARGET_DEVICE' not found."
+        return 1
+    fi
+}
+
+restart_qz_on_error() {
+    # Get the current date
+    CURRENT_DATE=$(date '+%a_%b_%d')
+    
+    # Find the latest QZ debug log file for today
+    LATEST_LOG=$(ls -t "$DEBUG_LOG_DIR"/debug-"$CURRENT_DATE"_*.log 2>/dev/null | head -n 1)
+    
+    if [ -z "$LATEST_LOG" ]; then
+        log "No QZ debug log found for today."
+        return 0
+    fi
+
+    log "Checking latest log file: $LATEST_LOG for errors..."
+
+    # Search the latest log for the error message
+    if grep -q "$ERROR_MESSAGE" "$LATEST_LOG"; then
+        log "***** Error detected in QZ log: $ERROR_MESSAGE *****"
+        log "Restarting QZ service..."
+        systemctl restart "$SERVICE_NAME"
+    else
+        log "No errors detected in $LATEST_LOG."
+    fi
+}
+
+manage_service() {
+    local device_found=$1
+    if $device_found; then
+        if ! is_service_running; then
+            log "***** Starting QZ service... *****"
+            systemctl start "$SERVICE_NAME"
+        else
+            log "QZ service is already running."
+            restart_qz_on_error  # Check the log for errors when QZ is already running
+        fi
+    else
+        if is_service_running; then
+            log "***** Stopping QZ service... *****"
+            systemctl stop "$SERVICE_NAME"
+        else
+            log "QZ service is already stopped."
+        fi
+    fi
+}
+
+while true; do
+    log "Checking for treadmill status..."
+    if scan_for_device; then
+        manage_service true
+    else
+        manage_service false
+    fi
+    log "Waiting for $SCAN_INTERVAL seconds before next check..."
+    sleep "$SCAN_INTERVAL"
+done
+```
+
+Step2: To ensure the script runs continuously, create a systemd service file at `/etc/systemd/system/qz-treadmill-monitor.service`
+```bash
+[Unit]
+Description=QZ Treadmill Monitor Service
+After=bluetooth.service
+
+[Service]
+Type=simple
+ExecStart=/root/qz-treadmill-monitor.sh
+Restart=always
+RestartSec=10
+User=root
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Step 3: Enable and Start the Service
+```bash
+sudo systemctl daemon-reload
+sudo systemctl enable qz-treadmill-monitor
+sudo systemctl start qz-treadmill-monitor
+```
+
+Monitor logs are written to `/var/log/qz-treadmill-monitor.log`. Use the following command to check logs in real-time:
+```bash
+sudo tail -f /var/log/qz-treadmill-monitor.log
+```
+
+
 
 ### (optional) Enable overlay FS
 

docs/50_writing_tests.md

@@ -8,23 +8,21 @@ The testing project tst/qdomyos-zwift-tests.pro contains test code that uses the
 
 New devices are added to the main QZ application by creating or modifying a subclass of the bluetoothdevice class.
 
-At minimum, each device has a corresponding BluetoothDeviceTestData subclass in the test project, which is coded to provide information to the test framework to generate tests for device detection and potentially other things.
+At minimum, each device has a corresponding BluetoothDeviceTestData object constructed in the DeviceTestDataIndex class in the test project, which is coded to provide information to the test framework to generate tests for device detection and potentially other things.
 
 In the test project
-* create a new folder for the device under tst/Devices. This is for anything you define for testing this device.
-* add a new class with header file and optionally .cpp file to the project in that folder. Name the class DeviceNameTestData, substituting an appropriate name in place of "DeviceName".
-* edit the header file to inherit the class from the BluetoothDeviceTestData abstract subclass appropriate to the device type, i.e. BikeTestData, RowerTestData, EllipticalTestData, TreadmillTestData.
-* have this new subclass' constructor pass a unique test name to its superclass.
+* add a new device name constant to the DeviceIndex class.
+* locate the implementation of DeviceTestDataindex::Initialize and build the test data from a call to DeviceTestDataIndex::RegisterNewDeviceTestData(...)
+* pass the device name constant defined in the DeviceIndex class  to the call to DeviceTestDataIndex::RegisterNewDeviceTestData(...).
 
 The tests are not organised around real devices that are handled, but the bluetoothdevice subclass that handles them - the "driver" of sorts.
 
 You need to provide the following:
 - patterns for valid names (e.g. equals a value, starts with a value, case sensitivity, specific length)
 - invalid names to ensure the device is not identified when the name is invalid
-- configuration settings that are required for the device to be detected
+- configuration settings that are required for the device to be detected, including bluetooth device information configuration
 - invalid configurations to test that the device is not detected, e.g. when it's disabled in the settings, but the name is correct
-- exclusion devices: if a device with the same name but of a higher priority type is detected, this device should not be detected
-- valid and invalid QBluetoothDeviceInfo configurations, e.g. to check the device is only detected when the manufacturer data is set correctly, or certain services are available or not.
+- exclusion devices: for example if a device with the same name but of a higher priority type is detected, this device should not be detected
 
 ## Tools in the Test Framework
 
@@ -39,16 +37,18 @@ i.e. a test will
 
 ### DeviceDiscoveryInfo
 
-This class contains a set of fields that store strongly typed QSettings values. 
-It also provides methods to read and write the values it knows about from and to a QSettings object.
+This class:
+* stores values for a specific subset of the QZSettings keys.
+* provides methods to read and write the values it knows about from and to a QSettings object.
+* provides a QBluetoothDeviceInfo object configured with the device name currently being tested.
 
 It is used in conjunction with a TestSettings object to write a configuration during a test.
 
 
 ## Writing a device detection test
 
-Because of the way the TestData classes currently work, it may be necessary to define multiple test data classes to cover the various cases.
-For example, if any of a list of names is enough to identify a device, or another group of names but with a certain service in the bluetooth device info, that will require multiple classes.
+Because of the way the BluetoothDeviceTestDataBuilder currently works, it may be necessary to define multiple test data objects to cover the various cases.
+For example, if any of a list of names is enough to identify a device, or another group of names but with a certain service in the bluetooth device info, that will require multiple test data objects.
 
 ### Recognition by Name
 
@@ -68,133 +68,83 @@ Reading this, to identify this device:
 
 In this case, we are not testing the last two, but can test the first two.
 
+In deviceindex.h:
 
 ```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "devices/domyosbike/domyosbike.h"
-
-class DomyosBikeTestData : public BikeTestData {
-
-public:
-    DomyosBikeTestData() : BikeTestData("Domyos Bike") {
-
-        this->addDeviceName("Domyos-Bike", comparison::StartsWith);
-        this->addInvalidDeviceName("DomyosBridge", comparison::StartsWith);
-    }
-
-	// not used yet
-    deviceType get_expectedDeviceType() const override { return deviceType::DomyosBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<domyosbike*>(detectedDevice)!=nullptr;
-    }
-};
+static const QString DomyosBike;
 ```
 
-The constructor adds a valid device name, and an invalid one. Various overloads of these methods and other members of the comparison enumeration provide other capabilities for specifying test data. If you add a valid device name that says the name should start with a value, additional names will be added automatically to the valid list with additional characters to test that it is in fact a "starts with" relationship. Also, valid and invalid names will be generated base on whether the comparison is case sensitive or not.
+In deviceindex.cpp:
 
-The get_expectedDeviceType() function is not actually used and is part of an unfinished refactoring of the device detection code, whereby the bluetoothdevice object doesn't actually get created intially. You could add a new value to the deviceType enum and return that, but it's not used yet. There's always deviceType::None.
+```
+DEFINE_DEVICE(DomyosBike, "Domyos Bike");
+```
 
-The get_isExpectedDevice(bluetoothdevice *) function must be overridden to indicate if the specified object is of the type expected for this test data.
+This pair adds the "friendly name" for the device as a constant, and also adds the key/value pair to an index.
+
+In DeviceTestDataIndex::Initialize():
+
+```
+// Domyos bike
+RegisterNewDeviceTestData(DeviceIndex::DomyosBike)
+	->expectDevice<domyosbike>()        
+	->acceptDeviceName("Domyos-Bike", DeviceNameComparison::StartsWith)
+	->rejectDeviceName("DomyosBridge", DeviceNameComparison::StartsWith);
+```
+
+This set of instructions adds a valid device name, and an invalid one. Various overloads of these methods, other methods, and other members of the comparison enumeration provide other capabilities for specifying test data. If you add a valid device name that says the name should start with a value, additional names will be added automatically to the valid list with additional characters to test that it is in fact a "starts with" relationship. Also, valid and invalid names will be generated based on whether the comparison is case sensitive or not.
 
 ### Configuration Settings
 
-Consider the CompuTrainerTestData. This device is not detected by name, but only by whether or not it is enabled in the settings.
-To specify this in the test data, we override one of the configureSettings methods, the one for the simple case where there is a single valid and a single invalid configuration. 
+Consider the CompuTrainer bike. This device is not detected by name, but only by whether or not it is enabled in the settings.
+To specify this in the test data, we use one of the BluetoothDeviceTestData::configureSettingsWith(...) methods, the one for the simple case where there is a single QZSetting with a specific enabling and disabling value.
 
 Settings from QSettings that contribute to tests should be put into the DeviceDiscoveryInfo class.
 
-For example, for the Computrainer Bike, the "computrainer_serial_port" value from the QSettings determines if the bike should be detected or not.
+For example, for the Computrainer Bike, the "computrainer_serialport" value from the QSettings determines if the bike should be detected or not.
 
+The computrainer_serialport QZSettings key should be registered in devicediscoveryinfo.cpp
+
+In devicediscoveryinfo.cpp:
 ```
-class DeviceDiscoveryInfo {
-public :
-	...
-	QString computrainer_serial_port = nullptr;	
-	...
-}
-```
+void InitializeTrackedSettings() {
 
-The getValues and setValues methods should be updated to include the addition(s):
-
-```
-
-void DeviceDiscoveryInfo::setValues(QSettings &settings, bool clear) const {
-	if(clear) settings.clear();	
 	...
-	settings.setValue(QZSettings::computrainer_serialport, this->computrainer_serial_port);
-	...
-}
 
-void DeviceDiscoveryInfo::getValues(QSettings &settings){
-	...
-	this->computrainer_serial_port = settings.value(QZSettings::computrainer_serialport, QZSettings::default_computrainer_serialport).toString();
+	trackedSettings.insert(QZSettings::computrainer_serialport, QZSettings::default_computrainer_serialport);
+
 	...
 }
 
 ```
 
-In the following example, the DeviceDiscoveryInfo class has been updated to contain the device's configuration setting (computrainer_serial_port). 
-- if an enabling configuration is requested (enable==true) a string that is known to be accepted is supplied
-- if a disabling configuration is requested (enable==false) an empty string is supplied.
+For this test data,
+* if enabling configurations are requested, the computrainer_serialport setting will be populated with "COMX"
+* if disabling configurations are requested, the computrainer_serialport setting will be populated with ""
 
-This example uses the simpler of 2 configureSettings methods returns true/false to indicate if the configuration should be used for the test.
+DeviceTestDataIndex::Initialize():
 
 ```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "devices/computrainerbike/computrainerbike.h"
-
-class CompuTrainerTestData : public BikeTestData {
-protected:
-    bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
-        info.computrainer_serial_port = enable ? "X":QString();
-        return true;
-    }
-public:
-    CompuTrainerTestData() : BikeTestData("CompuTrainer Bike") {
-        // any name
-        this->addDeviceName("", comparison::StartsWithIgnoreCase);
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::CompuTrainerBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<computrainerbike*>(detectedDevice)!=nullptr;
-    }
-};
+// Computrainer Bike
+RegisterNewDeviceTestData(DeviceIndex::ComputrainerBike)
+	->expectDevice<computrainerbike>()
+	->acceptDeviceName("", DeviceNameComparison::StartsWithIgnoreCase)
+	->configureSettingsWith(QZSettings::computrainer_serialport, "COMX", "");
 ```
 
+
 Similarly, the Pafers Bike has a simple configuration setting:
 
 ```
-#include "Devices/Bike/biketestdata.h"
-#include "devices/pafersbike/pafersbike.h"
-
-
-class PafersBikeTestData : public BikeTestData {
-protected:
-    bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
-        // the treadmill is given priority
-        info.pafers_treadmill = !enable;
-        return true;
-    }
-public:
-    PafersBikeTestData() : BikeTestData("Pafers Bike") {
-        this->addDeviceName("PAFERS_", comparison::StartsWithIgnoreCase);
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::PafersBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<pafersbike*>(detectedDevice)!=nullptr;
-    }
-};
+    // Pafers Bike
+    RegisterNewDeviceTestData(DeviceIndex::PafersBike)
+        ->expectDevice<pafersbike>()
+        ->acceptDeviceName("PAFERS_", DeviceNameComparison::StartsWithIgnoreCase)
+        ->configureSettingsWith(QZSettings::pafers_treadmill,false);
 ```
 
+In that case, ```configureSettingsWith(QZSettings::pafers_treadmill,false)``` indicates that the pafers_treadmill setting will be false for enabling configurations and true for disabling ones.
+
 A more complicated example is the Pafers Treadmill. It involves a name match, but also some configuration settings obtained earlier...
 
 ```
@@ -212,76 +162,60 @@ bool pafers_treadmill_bh_iboxster_plus =
 ```
 
 Here the device could be activated due to a name match and various combinations of settings.
-For this, the configureSettings function that takes a vector of DeviceDiscoveryInfo objects which is populated with configurations that lead to the specified result (enable = detected, !enable=not detected). Instead of returning a boolean to indicate if a configuration has been supplied, it populates a vector of DeviceDiscoveryInfo objects.
+For this, the configureSettingsWith(...) function that takes a lambda function which consumes a vector of DeviceDiscoveryInfo objects which is populated with configurations that lead to the specified result (enable = detected, !enable=not detected).
 
 ```
-#pragma once
+// Pafers Treadmill
+RegisterNewDeviceTestData(DeviceIndex::PafersTreadmill)
+	->expectDevice<paferstreadmill>()
+	->acceptDeviceName("PAFERS_", DeviceNameComparison::StartsWithIgnoreCase)
+	->configureSettingsWith( [](const DeviceDiscoveryInfo& info, bool enable, std::vector<DeviceDiscoveryInfo>& configurations)->void {
+		DeviceDiscoveryInfo config(info);
 
-#include "Devices/Treadmill/treadmilltestdata.h"
-#include "devices/paferstreadmill/paferstreadmill.h"
-
-class PafersTreadmillTestData : public TreadmillTestData {
-protected:
-    void configureSettings(const DeviceDiscoveryInfo& info, bool enable, std::vector<DeviceDiscoveryInfo>& configurations) const override {
-        DeviceDiscoveryInfo config(info);
-
-        if (enable) {
-            for(int x = 1; x<=3; x++) {
-                config.pafers_treadmill = x & 1;
-                config.pafers_treadmill_bh_iboxster_plus = x & 2;
-                configurations.push_back(config);
-            }
-        } else {
-            config.pafers_treadmill = false;
-            config.pafers_treadmill_bh_iboxster_plus = false;
-            configurations.push_back(config);
-        }
-    }
-
-public:
-    PafersTreadmillTestData() : TreadmillTestData("Pafers Treadmill") {
-        this->addDeviceName("PAFERS_", comparison::StartsWithIgnoreCase);
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::PafersTreadmill; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<paferstreadmill*>(detectedDevice)!=nullptr;
-    }
-};
+		if (enable) {
+			for(int x = 1; x<=3; x++) {
+				config.setValue(QZSettings::pafers_treadmill, x & 1);
+				config.setValue(QZSettings::pafers_treadmill_bh_iboxster_plus, x & 2);
+				configurations.push_back(config);
+			}
+		} else {
+			config.setValue(QZSettings::pafers_treadmill, false);
+			config.setValue(QZSettings::pafers_treadmill_bh_iboxster_plus, false);
+			configurations.push_back(config);
+		}
+	});
 ```
 
 ### Considering Extra QBluetoothDeviceInfo Content
 
 Detection of some devices requires some specific bluetooth device information. 
 
-Supplying enabling and disabling QBluetoothDeviceInfo objects is done using a similar pattern to the multiple configurations scenario.
-For example, the M3iBike requires specific manufacturer information.
-
+Supplying enabling and disabling QBluetoothDeviceInfo objects is done by accessing the QBluetoothDeviceInfo member of the DeviceDiscoveryInfo object.
+For example, the M3iBike requires specific manufacturer information, using the simpler of the lambda functions accepted by the configureSettingsWith function.
 
 ```
-void M3IBikeTestData::configureBluetoothDeviceInfos(const QBluetoothDeviceInfo& info,  bool enable, std::vector<QBluetoothDeviceInfo>& bluetoothDeviceInfos) const {
-    // The M3I bike detector looks into the manufacturer data.
+	// M3I Bike
+    RegisterNewDeviceTestData(DeviceIndex::M3IBike)
+        ->expectDevice<m3ibike>()
+        ->acceptDeviceName("M3", DeviceNameComparison::StartsWith)
+        ->configureSettingsWith(
+            [](DeviceDiscoveryInfo& info,  bool enable)->void
+            {
+                // The M3I bike detector looks into the manufacturer data.
+                if(!enable) {
+                    info.DeviceInfo()->setManufacturerData(1, QByteArray("Invalid manufacturer data."));
+                    return;
+                }
 
-    QBluetoothDeviceInfo result = info;
-
-    if(!enable) {
-        result.setManufacturerData(1, QByteArray("Invalid manufacturer data."));
-        bluetoothDeviceInfos.push_back(result);
-
-        return;
-    }
-
-    int key=0;
-    result.setManufacturerData(key++, hex2bytes("02010639009F00000000000000000014008001"));
-
-    bluetoothDeviceInfos.push_back(result);
-}
+                int key=0;
+                info.DeviceInfo()->setManufacturerData(key++, hex2bytes("02010639009F00000000000000000014008001"));
+            });
 
 ```
 
-The test framework populates the incoming QBluetoothDeviceInfo object with a name and a UUID. This is expected to have nothing else defined. 
-Another example is one of the test data classes for detecting a device that uses the statesbike class:
+The test framework populates the incoming QBluetoothDeviceInfo object with a UUID and the name (generated from the acceptDeviceName and rejectDeviceName calls) currently being tested.
+This is expected to have nothing else defined. 
+Another example is one of the test data definitions for detecting a device that uses the stagesbike class:
 
 Detection code from bluetooth.cpp:
 
@@ -289,37 +223,49 @@ Detection code from bluetooth.cpp:
 ((b.name().toUpper().startsWith("KICKR CORE")) && !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
 ```
 
-This condition is actually extracted from a more complicated example where the current test data classes can't cover all the detection criteria in one implementation. This is why this class inherits from StagesBikeTestData rather than BikeTestData directly.
+This condition is actually extracted from a more complicated example where the BluetoothDeviceTestData class can't cover all the detection criteria with one instance. 
 
 ```
-class StagesBike3TestData : public StagesBikeTestData {
-protected:
-    void configureBluetoothDeviceInfos(const QBluetoothDeviceInfo& info,  bool enable, std::vector<QBluetoothDeviceInfo>& bluetoothDeviceInfos) const override {
-        // The condition, if the name is acceptable, is:
-        // !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
+// Stages Bike General
+auto stagesBikeExclusions = { GetTypeId<ftmsbike>() };
 
-        if(enable) {
-            QBluetoothDeviceInfo result = info;
-            result.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818)}));
-            bluetoothDeviceInfos.push_back(result);
-        } else {
-            QBluetoothDeviceInfo hasInvalid = info;
-            hasInvalid.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1826)}));
-            QBluetoothDeviceInfo hasBoth = hasInvalid;
-            hasBoth.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818),QBluetoothUuid((quint16)0x1826)}));
+//
+// ... other stages bike variants
+//
 
-            bluetoothDeviceInfos.push_back(info); // has neither
-            bluetoothDeviceInfos.push_back(hasInvalid);
-            bluetoothDeviceInfos.push_back(hasBoth);
-        }
-    }
+// Stages Bike (KICKR CORE)
+RegisterNewDeviceTestData(DeviceIndex::StagesBike_KICKRCORE)
+	->expectDevice<stagesbike>()        
+	->acceptDeviceName("KICKR CORE", DeviceNameComparison::StartsWithIgnoreCase)
+	->excluding(stagesBikeExclusions)
+	->configureSettingsWith(
+		[](const DeviceDiscoveryInfo& info,  bool enable, std::vector<DeviceDiscoveryInfo>& configurations)->void
+		{
+			// The condition, if the name is acceptable, is:
+			// !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
 
-public:
-    StagesBike3TestData() : StagesBikeTestData("Stages Bike (KICKR CORE)") {
+			if(enable) {
+				DeviceDiscoveryInfo result = info;
+				result.addBluetoothService(QBluetoothUuid((quint16)0x1818));
+				result.removeBluetoothService(QBluetoothUuid((quint16)0x1826));
+				configurations.push_back(result);
+			} else {
+				DeviceDiscoveryInfo hasNeither = info;
+				hasNeither.removeBluetoothService(QBluetoothUuid((quint16)0x1818));
+				hasNeither.removeBluetoothService(QBluetoothUuid((quint16)0x1826));
+
+				DeviceDiscoveryInfo hasInvalid = info;
+				hasInvalid.addBluetoothService(QBluetoothUuid((quint16)0x1826));
+				DeviceDiscoveryInfo hasBoth = hasInvalid;
+				hasBoth.addBluetoothService(QBluetoothUuid((quint16)0x1818));
+				hasBoth.addBluetoothService(QBluetoothUuid((quint16)0x1826));
+
+				configurations.push_back(info); // has neither
+				configurations.push_back(hasInvalid);
+				configurations.push_back(hasBoth);
+			}
+		});
 
-        this->addDeviceName("KICKR CORE", comparison::StartsWithIgnoreCase);
-    }
-};
 ```
 
 In this case, it populates the vector with the single enabling configuration if that's what's been requested, otherwise 3 disabling ones.
@@ -328,7 +274,7 @@ In this case, it populates the vector with the single enabling configuration if
 
 Sometimes there might be ambiguity when multiple devices are available, and the detection code may specify that if the other conditions match, but certain specific kinds of devices (the exclusion devices) have already been detected, the newly matched device should be ignored.
 
-The TestData class can be made to cover this by overriding the configureExclusions() method to add instances of the TestData classes for the exclusion devices to the object's internal list of exclusions.
+The test data object can be made to cover this by calling the excluding(...) functions to add type identifiers for the bluetoothdevice classes for the exclusion devices to the object's internal list of exclusions.
 
 Detection code:
 
@@ -336,39 +282,19 @@ Detection code:
 } else if (b.name().startsWith(QStringLiteral("ECH")) && !echelonRower && !echelonStride &&
                        !echelonConnectSport && filter) {
 ```
-The configureExclusions code is overridden to specify the exclusion test data objects. Note that the test for a previously detected device of the same type is not included.
+The excluding<T>() template function is called to specify the exclusion device type. Note that the test for a previously detected device of the same type is not included.
 
 ```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "Devices/EchelonRower/echelonrowertestdata.h"
-#include "Devices/EchelonStrideTreadmill/echelonstridetreadmilltestdata.h"
-#include "devices/echelonconnectsport/echelonconnectsport.h"
-
-class EchelonConnectSportBikeTestData : public BikeTestData {
-
-public:
-    EchelonConnectSportBikeTestData() : BikeTestData("Echelon Connect Sport Bike") {
-        this->addDeviceName("ECH", comparison::StartsWith);
-    }
-
-    void configureExclusions() override {
-        this->exclude(new EchelonRowerTestData());
-        this->exclude(new EchelonStrideTreadmillTestData());
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::EchelonConnectSport; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<echelonconnectsport*>(detectedDevice)!=nullptr;
-    }
-};
-
+// Echelon Connect Sport Bike
+RegisterNewDeviceTestData(DeviceIndex::EchelonConnectSportBike)
+	->expectDevice<echelonconnectsport>()        
+	->acceptDeviceName("ECH", DeviceNameComparison::StartsWith)
+	->excluding<echelonrower>()
+	->excluding<echelonstride>();
 
 ```
 
-### When a single TestData Class Can't Cover all the Conditions
+### When a single test data object can't cover all the conditions
 
 Detection code:
 
@@ -390,116 +316,81 @@ This presents 3 scenarios for the current test framework.
 2. Match the name "KICKR CORE", presence and absence of specific service ids
 3. Match the name "ASSIOMA" and the power sensor name setting starts with "Disabled"
 					   
-The framework is not currently capable of specifying all these scenarios in a single class. 
-The generated test data is approximately the combinations of these lists: names * settings * bluetoothdeviceInfo * exclusions.
-If a combination should not exist, a separate class should be used.
+The framework is not currently capable of specifying all these scenarios in a single test data object, without checking the name of the supplied QBluetoothDeviceInfo object against name conditions specified and constructing extra configurations based on that.
+The generated test data is approximately the combinations of these lists: names * settings * exclusions.
+If a combination should not exist, separate test data objects should be used.
 
-In the example of the StagesBikeTestData classes, the exclusions, which apply to all situations, are implemented in the superclass StagesBikeTestData,
+In the example of the Stages Bike test data, the exclusions, which apply to all situations, are implemented in an array of type ids:
 
 
 ```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "devices/stagesbike/stagesbike.h"
-#include "Devices/FTMSBike/ftmsbiketestdata.h"
-
-class StagesBikeTestData : public BikeTestData {
-protected:
-    StagesBikeTestData(std::string testName): BikeTestData(testName) {
-    }
-   
-    void configureExclusions() override {
-        this->exclude(new FTMSBike1TestData());
-        this->exclude(new FTMSBike2TestData());
-    }
-    
-public:
-
-    deviceType get_expectedDeviceType() const override { return deviceType::StagesBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<stagesbike*>(detectedDevice)!=nullptr;
-    }
-};
+// Stages Bike General
+auto stagesBikeExclusions = { GetTypeId<ftmsbike>() };
 ```
 
-The name-match only in one subclass:
+The name-match only in one test data instance:
 
 ```
-class StagesBike1TestData : public StagesBikeTestData {
-
-public:
-    StagesBike1TestData() : StagesBikeTestData("Stages Bike") {
-        this->addDeviceName("STAGES ", comparison::StartsWithIgnoreCase);
-        this->addDeviceName("TACX SATORI", comparison::StartsWithIgnoreCase);
-    }
-
-};
-
+// Stages Bike
+RegisterNewDeviceTestData(DeviceIndex::StagesBike)
+	->expectDevice<stagesbike>()        
+	->acceptDeviceNames({"STAGES ", "TACX SATORI"}, DeviceNameComparison::StartsWithIgnoreCase)
+	->acceptDeviceName("QD", DeviceNameComparison::IgnoreCase)
+	->excluding(stagesBikeExclusions);
 ```
 
-The name and setting match in another subclass:
+The name and setting match in another instance:
 
 ```
-
-class StagesBike2TestData : public StagesBikeTestData {
-protected:
-    bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
-        info.powerSensorName = enable ? "Disabled":"Roberto";
-        return true;
-    }
-public:
-    StagesBike2TestData() : StagesBikeTestData("Stages Bike (Assioma / Power Sensor disabled") {
-
-        this->addDeviceName("ASSIOMA", comparison::StartsWithIgnoreCase);
-    }
-};
+// Stages Bike Stages Bike (Assioma / Power Sensor disabled
+RegisterNewDeviceTestData(DeviceIndex::StagesBike_Assioma_PowerSensorDisabled)
+	->expectDevice<stagesbike>()        
+	->acceptDeviceName("ASSIOMA", DeviceNameComparison::StartsWithIgnoreCase)
+	->configureSettingsWith(QZSettings::power_sensor_name, "DisabledX", "XDisabled")
+	->excluding( stagesBikeExclusions);
 
 ```
 The name and bluetooth device info configurations in another:
 
 ```
+// Stages Bike (KICKR CORE)
+RegisterNewDeviceTestData(DeviceIndex::StagesBike_KICKRCORE)
+	->expectDevice<stagesbike>()        
+	->acceptDeviceName("KICKR CORE", DeviceNameComparison::StartsWithIgnoreCase)
+	->excluding(stagesBikeExclusions)
+	->configureSettingsWith(
+		[](const DeviceDiscoveryInfo& info,  bool enable, std::vector<DeviceDiscoveryInfo>& configurations)->void
+		{
+			// The condition, if the name is acceptable, is:
+			// !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
 
-class StagesBike3TestData : public StagesBikeTestData {
-protected:
-    void configureBluetoothDeviceInfos(const QBluetoothDeviceInfo& info,  bool enable, std::vector<QBluetoothDeviceInfo>& bluetoothDeviceInfos) const override {
-        // The condition, if the name is acceptable, is:
-        // !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
+			if(enable) {
+				DeviceDiscoveryInfo result = info;
+				result.addBluetoothService(QBluetoothUuid((quint16)0x1818));
+				result.removeBluetoothService(QBluetoothUuid((quint16)0x1826));
+				configurations.push_back(result);
+			} else {
+				DeviceDiscoveryInfo hasNeither = info;
+				hasNeither.removeBluetoothService(QBluetoothUuid((quint16)0x1818));
+				hasNeither.removeBluetoothService(QBluetoothUuid((quint16)0x1826));
 
-        if(enable) {
-            QBluetoothDeviceInfo result = info;
-            result.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818)}));
-            bluetoothDeviceInfos.push_back(result);
-        } else {
-            QBluetoothDeviceInfo hasInvalid = info;
-            hasInvalid.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1826)}));
-            QBluetoothDeviceInfo hasBoth = hasInvalid;
-            hasBoth.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818),QBluetoothUuid((quint16)0x1826)}));
+				DeviceDiscoveryInfo hasInvalid = info;
+				hasInvalid.addBluetoothService(QBluetoothUuid((quint16)0x1826));
+				DeviceDiscoveryInfo hasBoth = hasInvalid;
+				hasBoth.addBluetoothService(QBluetoothUuid((quint16)0x1818));
+				hasBoth.addBluetoothService(QBluetoothUuid((quint16)0x1826));
 
-            bluetoothDeviceInfos.push_back(info); // has neither
-            bluetoothDeviceInfos.push_back(hasInvalid);
-            bluetoothDeviceInfos.push_back(hasBoth);
-        }
-    }
-
-public:
-    StagesBike3TestData() : StagesBikeTestData("Stages Bike (KICKR CORE)") {
-
-        this->addDeviceName("KICKR CORE", comparison::StartsWithIgnoreCase);
-    }
-};
+				configurations.push_back(info); // has neither
+				configurations.push_back(hasInvalid);
+				configurations.push_back(hasBoth);
+			}
+		});
 
 ```
 
 ## Telling Google Test Where to Look
 
-To register your test data class(es) with Google Test:
-
-- open tst/Devices/devices.h
-- add a #include for your new header file(s)
-- add your new classes to the BluetoothDeviceTestDataTypes list.
-
-This will add tests for your new device class to test runs of the tests in the BluetoothDeviceTestSuite class, which are about detecting, and not detecting devices in circumstances generated from the TestData classes.
+The BluetoothDeviceTestSuite configuration specifies that the test data will be obtained from the DeviceTestDataIndex class, so there's nothing more to do.
+
 
 

helpers/winbt.py

@@ -0,0 +1,143 @@
+import sys
+import logging
+import asyncio
+import threading
+import random
+import struct
+import binascii
+
+from typing import Any, Union
+
+from bless import (
+    BlessServer,
+    BlessGATTCharacteristic,
+    GATTCharacteristicProperties,
+    GATTAttributePermissions,
+)
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(name=__name__)
+
+trigger: Union[asyncio.Event, threading.Event]
+if sys.platform in ["darwin", "win32"]:
+    trigger = threading.Event()
+else:
+    trigger = asyncio.Event()
+
+def read_request(characteristic: BlessGATTCharacteristic, **kwargs) -> bytearray:
+    logger.debug(f"Reading {characteristic.value}")
+    return characteristic.value
+
+def write_request(characteristic: BlessGATTCharacteristic, value: Any, **kwargs):
+    characteristic.value = value
+    logger.debug(f"Char value set to {characteristic.value}")
+    if characteristic.value == b"\x0f":
+        logger.debug("NICE")
+        trigger.set()
+
+def generate_indoor_bike_data():
+    # Flags (16 bits)
+    flags = (1 << 2) | (1 << 6)  # Instantaneous Cadence and Instantaneous Power present
+
+    speed = random.randint(0, 20000)  # 0-20000
+
+    # Instantaneous Cadence (uint16, 0.5 rpm resolution)
+    cadence = random.randint(0, 400)  # 0-200 rpm
+
+    # Instantaneous Power (sint16, watts)
+    power = random.randint(10, 50)
+
+    # Pack data into bytes
+    data = struct.pack("<HHHh", flags, speed, cadence, power)
+    
+    return data
+
+def generate_zwift_ride_data():
+    data_str = "2308ffbfffff0f1a04080010001a04080110001a04080210001a0408031000"
+    data = binascii.unhexlify(data_str)
+    return data
+
+async def update_indoor_bike_data(server, service_uuid, char_uuid):
+    while True:
+        c = server.get_characteristic(char_uuid)
+        c.value = bytes(generate_indoor_bike_data())
+        server.update_value(service_uuid, char_uuid)
+        await asyncio.sleep(1)
+
+async def update_zwift_ride_data(server, service_uuid, char_uuid):
+    while True:
+        c = server.get_characteristic(char_uuid)
+        c.value = bytes(generate_zwift_ride_data())
+        server.update_value(service_uuid, char_uuid)    
+        await asyncio.sleep(1)
+
+
+async def run(loop):
+    trigger.clear()
+    
+    # Instantiate the server
+    server = BlessServer(name="FTMS Indoor Bike", loop=loop)
+    server.read_request_func = read_request
+    server.write_request_func = write_request
+
+    # Add Fitness Machine Service
+    ftms_uuid = "00001826-0000-1000-8000-00805f9b34fb"
+    await server.add_new_service(ftms_uuid)
+
+    # Add Indoor Bike Data Characteristic
+    indoor_bike_data_uuid = "00002ad2-0000-1000-8000-00805f9b34fb"
+    char_flags = (
+        GATTCharacteristicProperties.read
+        | GATTCharacteristicProperties.notify
+    )
+    permissions = GATTAttributePermissions.readable
+    await server.add_new_characteristic(
+        ftms_uuid, indoor_bike_data_uuid, char_flags, generate_indoor_bike_data(), permissions
+    )
+
+    zwift_ride_uuid = "00000001-19ca-4651-86e5-fa29dcdd09d1"
+    await server.add_new_service(zwift_ride_uuid)
+
+    syncRxChar = "00000003-19CA-4651-86E5-FA29DCDD09D1"
+    syncRx_flags = (
+        GATTCharacteristicProperties.write
+    )
+    syncRx_permissions = GATTAttributePermissions.writeable
+
+    syncTxChar = "00000004-19CA-4651-86E5-FA29DCDD09D1"
+    syncTx_flags = (
+        GATTCharacteristicProperties.read
+        | GATTCharacteristicProperties.indicate
+    )
+    syncTx_permissions = GATTAttributePermissions.readable
+
+    asyncChar = "00000002-19CA-4651-86E5-FA29DCDD09D1"
+    async_flags = (
+        GATTCharacteristicProperties.read
+        | GATTCharacteristicProperties.notify
+    )
+    async_permissions = GATTAttributePermissions.readable
+    await server.add_new_characteristic(
+        zwift_ride_uuid, syncRxChar, syncRx_flags, generate_indoor_bike_data(), syncRx_permissions
+    )
+    await server.add_new_characteristic(
+        zwift_ride_uuid, syncTxChar, syncTx_flags, generate_indoor_bike_data(), syncTx_permissions
+    )
+    await server.add_new_characteristic(
+        zwift_ride_uuid, asyncChar, async_flags, generate_zwift_ride_data(), async_permissions
+    )
+
+    logger.debug(server.get_characteristic(indoor_bike_data_uuid))
+    await server.start()
+    logger.debug("Advertising")
+    logger.info(f"FTMS Indoor Bike is now advertising")
+
+    # Start updating the indoor bike data
+    update_task = asyncio.create_task(update_indoor_bike_data(server, ftms_uuid, indoor_bike_data_uuid))
+    update_task_zwift_ride = asyncio.create_task(update_zwift_ride_data(server, zwift_ride_uuid, asyncChar))
+
+    await asyncio.sleep(99999999)
+    await server.stop()
+
+loop = asyncio.get_event_loop()
+loop.run_until_complete(run(loop))

helpers/wireshark-json-filter.py

@@ -1,13 +1,28 @@
 import json
 
+def generate_code(hex_string, start_index):
+    hex_pairs = [hex_string[i:i+2] for i in range(0, len(hex_string), 2)]
+    output = ""
+    array_name = f"initData{start_index}"
+    array_elements = ', '.join([f"0x{hex_pair}" for hex_pair in hex_pairs])
+    output += f"uint8_t {array_name}[] = {{{array_elements}}};\n"
+    output += f'writeCharacteristic({array_name}, sizeof({array_name}), QStringLiteral("init"), false, false);\n'
+    output += "QThread::msleep(sleepms);\n\n"
+    return output
+
 json_file_path = "C:\\Work\\qdomyos-zwift\\helpers\\tmp.json"
 
 with open(json_file_path, 'r') as file:
     # Carica i dati JSON
     json_data = json.load(file)
 
+
+line = 0
+
 for item in json_data:
-    try:
-        print(item['_source']['layers']['btatt']['btatt.value_raw'][0])
+    try:        
+        if(item['_source']['layers']['btatt']['btatt.value_raw'][0] != ''):
+            line = line + 1
+        print(generate_code(item['_source']['layers']['btatt']['btatt.value_raw'][0], line))
     except:
         pass

qdomyos-zwift.code-workspace

@@ -0,0 +1,37 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"files.associations": {
+			"list": "cpp",
+			"chrono": "cpp",
+			"complex": "cpp",
+			"functional": "cpp",
+			"optional": "cpp",
+			"system_error": "cpp",
+			"type_traits": "cpp",
+			"xlocnum": "cpp",
+			"xtr1common": "cpp",
+			"qhttpserver": "cpp",
+			"array": "cpp",
+			"deque": "cpp",
+			"map": "cpp",
+			"unordered_map": "cpp",
+			"vector": "cpp",
+			"xstring": "cpp",
+			"algorithm": "cpp",
+			"xutility": "cpp",
+			"xlocale": "cpp",
+			"filesystem": "cpp",
+			"bitset": "cpp",
+			"iterator": "cpp",
+			"xhash": "cpp",
+			"xtree": "cpp",
+			"ostream": "cpp",
+			"locale": "cpp"
+		}
+	}
+}

src/AccordionElement.qml

@@ -10,59 +10,87 @@ ColumnLayout {
     property alias textFont: accordionText.font.family
     property alias textFontSize: accordionText.font.pixelSize
     property alias indicatRectColor: indicatRect.color
-    default property alias accordionContent: contentPlaceholder.data
-    spacing: 0
+    default property alias accordionContent: contentLoader.sourceComponent
 
-    Layout.fillWidth: true;
+    // Signal emitted when content becomes visible
+    signal contentBecameVisible()
+
+    spacing: 0
+    Layout.fillWidth: true
 
     Rectangle {
         id: accordionHeader
         color: "red"
         Layout.alignment: Qt.AlignTop
-        Layout.fillWidth: true;
+        Layout.fillWidth: true
         height: 48
 
-        Rectangle{
-           id:indicatRect
-           x: 16; y: 20
-           width: 8; height: 8
-           radius: 8
-           color: "white"
+        Rectangle {
+            id: indicatRect
+            x: 16; y: 20
+            width: 8; height: 8
+            radius: 8
+            color: "white"
         }
 
         Text {
             id: accordionText
-            x:34;y:13
+            x: 34; y: 13
             color: "#FFFFFF"
             text: rootElement.title
         }
+
         Image {
-            y:13
-            anchors.right:  parent.right
+            y: 13
+            anchors.right: parent.right
             anchors.rightMargin: 20
             width: 30; height: 30
             id: indicatImg
             source: "qrc:/icons/arrow-collapse-vertical.png"
         }
+
         MouseArea {
             anchors.fill: parent
             cursorShape: Qt.PointingHandCursor
             onClicked: {
                 rootElement.isOpen = !rootElement.isOpen
-                if(rootElement.isOpen)
-                {
+                if(rootElement.isOpen) {
                     indicatImg.source = "qrc:/icons/arrow-expand-vertical.png"
-                }else{
+                } else {
                     indicatImg.source = "qrc:/icons/arrow-collapse-vertical.png"
                 }
             }
         }
     }
 
-    // This will get filled with the content
-    ColumnLayout {
-        id: contentPlaceholder
-        visible: rootElement.isOpen
-        Layout.fillWidth: true;
+    // Loader with enhanced visibility handling
+    Loader {
+        id: contentLoader
+        active: rootElement.isOpen
+        visible: false // Start invisible
+        Layout.fillWidth: true
+        asynchronous: false
+
+        onLoaded: {
+            if (item) {
+                item.Layout.fillWidth = true
+                visible = true
+                rootElement.contentBecameVisible()
+            }
+        }
+
+        // Handle visibility changes
+        onVisibleChanged: {
+            if (visible && status === Loader.Ready) {
+                rootElement.contentBecameVisible()
+            }
+        }
+    }
+
+    // Handle accordion closing
+    onIsOpenChanged: {
+        if (!isOpen) {
+            contentLoader.visible = false
+        }
     }
 }

src/ConnectIQ/iOS/ConnectIQ.xcframework/Info.plist

@@ -5,26 +5,29 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>ConnectIQ.framework/ConnectIQ</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-armv7_arm64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ConnectIQ.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>armv7</string>
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>ConnectIQ.framework/ConnectIQ</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ConnectIQ.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>i386</string>
+				<string>arm64</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Headers/ConnectIQ.h

@@ -6,9 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQConstants.h"
-#import "IQDevice.h"
-#import "IQApp.h"
+#import <ConnectIQ/IQConstants.h>
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQApp.h>
 
 // --------------------------------------------------------------------------------
 #pragma mark - PUBLIC TYPES

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Headers/IQApp.h

@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQDevice.h"
-#import "IQAppStatus.h"
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQAppStatus.h>
 
 /// @brief  Represents an instance of a ConnectIQ app that is installed on a
 ///         Garmin device.

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Headers/IQConstants.h

@@ -13,6 +13,9 @@ extern int const IQSDKVersion;
 /// @brief  The bundle identifier for the Garmin Connect Mobile app.
 extern NSString * const IQGCMBundle;
 
+/// @brief  The bundle identifier for the Garmin Connect Mobile Beta app.
+extern NSString * const IQGCMInternalBetaBundle;
+
 /// @brief  The result of a SendMessage operation
 typedef NS_ENUM(NSInteger, IQSendMessageResult){
     ///! @brief  The message was sent successfully.

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64/ConnectIQ.framework/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module ConnectIQ {
   umbrella header "ConnectIQ.h"
-
   export *
+
   module * { export * }
 }

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Headers/ConnectIQ.h

@@ -6,9 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQConstants.h"
-#import "IQDevice.h"
-#import "IQApp.h"
+#import <ConnectIQ/IQConstants.h>
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQApp.h>
 
 // --------------------------------------------------------------------------------
 #pragma mark - PUBLIC TYPES

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Headers/IQApp.h

@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "IQDevice.h"
-#import "IQAppStatus.h"
+#import <ConnectIQ/IQDevice.h>
+#import <ConnectIQ/IQAppStatus.h>
 
 /// @brief  Represents an instance of a ConnectIQ app that is installed on a
 ///         Garmin device.

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Headers/IQConstants.h

@@ -13,6 +13,9 @@ extern int const IQSDKVersion;
 /// @brief  The bundle identifier for the Garmin Connect Mobile app.
 extern NSString * const IQGCMBundle;
 
+/// @brief  The bundle identifier for the Garmin Connect Mobile Beta app.
+extern NSString * const IQGCMInternalBetaBundle;
+
 /// @brief  The result of a SendMessage operation
 typedef NS_ENUM(NSInteger, IQSendMessageResult){
     ///! @brief  The message was sent successfully.

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module ConnectIQ {
   umbrella header "ConnectIQ.h"
-
   export *
+
   module * { export * }
 }

src/ConnectIQ/iOS/ConnectIQ.xcframework/ios-arm64_x86_64-simulator/ConnectIQ.framework/_CodeSignature/CodeResources

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/ConnectIQ.h</key>
 		<data>
-		F1hICh90Ex4ADEjYLcSi0YPhrPA=
+		yih4e2KjbC/GqavxdCZ3xQ4mHmA=
 		</data>
 		<key>Headers/IQApp.h</key>
 		<data>
-		R7+SmeArgBACIBWHRnEAugyFHKE=
+		NDlj8k5C84UPFmD+qEMz2WcZloY=
 		</data>
 		<key>Headers/IQAppStatus.h</key>
 		<data>
@@ -18,7 +18,7 @@
 		</data>
 		<key>Headers/IQConstants.h</key>
 		<data>
-		eI7keKSkaajUZACnuMhgtV1RuBA=
+		z5FAXaGG7RDVUTai1Vvqs33zc98=
 		</data>
 		<key>Headers/IQDevice.h</key>
 		<data>
@@ -26,11 +26,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		sMY09qXRBL/m1OGNWejLjfNg04w=
+		YUOCJU/YBLc4CRWV1z8JHDjCx8M=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
-		SSRVAtIAdFmowQqE4HzOpWYLubg=
+		eEyhq/G44PBlD3KiydN8B1vbfCU=
 		</data>
 		<key>ar.lproj/IQLocalizable.strings</key>
 		<dict>
@@ -298,32 +298,20 @@
 	<dict>
 		<key>Headers/ConnectIQ.h</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			F1hICh90Ex4ADEjYLcSi0YPhrPA=
-			</data>
 			<key>hash2</key>
 			<data>
-			ABtgvHbvmly4QpZO/KmmrwYkL0N+AqV3gXdPVrseysY=
+			kAenemss8n98vVLi54JqBUtGwaL1/i+HSejFBZgawHA=
 			</data>
 		</dict>
 		<key>Headers/IQApp.h</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			R7+SmeArgBACIBWHRnEAugyFHKE=
-			</data>
 			<key>hash2</key>
 			<data>
-			X4vXt0sO9gxQNzQalIaLqMpSGNRC9ue2USDcfjBYkec=
+			bSRRooQ0FKFr3BgrFolAnkU402889YFHrH+6EEca3cg=
 			</data>
 		</dict>
 		<key>Headers/IQAppStatus.h</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			WnybOSMMVqCKGns0rEz9C3EfQOg=
-			</data>
 			<key>hash2</key>
 			<data>
 			tg9qNXtTmFUvNoJtq7O/aEXBNngcGENVRhvxLJ8C/xo=
@@ -331,21 +319,13 @@
 		</dict>
 		<key>Headers/IQConstants.h</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			eI7keKSkaajUZACnuMhgtV1RuBA=
-			</data>
 			<key>hash2</key>
 			<data>
-			bqDpm8yikc2FIqaSUHcLqPY6TPXLlXSUo+Dl9NUYwmA=
+			qVLQDlPhVsyAAQ/LCGOCdEOUaabcgwTHijMQiuWbAXM=
 			</data>
 		</dict>
 		<key>Headers/IQDevice.h</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			bl545C/cu0mw2KlRmzojKmHPom0=
-			</data>
 			<key>hash2</key>
 			<data>
 			4N4+64IHeb9iBwyziNxo0SMuCM75ez9Em4UfmtgtTHA=
@@ -353,21 +333,13 @@
 		</dict>
 		<key>Modules/module.modulemap</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			SSRVAtIAdFmowQqE4HzOpWYLubg=
-			</data>
 			<key>hash2</key>
 			<data>
-			lQGjVO5Q0wfztjETCwDkwAkQ7nZInCgWdStnHL3o6Co=
+			6a9Ehz1N4Sm/6qBlTfQpHUqRlpzQr2JMF26AfW4xUtY=
 			</data>
 		</dict>
 		<key>ar.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			1CDTE/Qaf1Z/HuhSt9CUnwitv4M=
-			</data>
 			<key>hash2</key>
 			<data>
 			CWyQue2TCS0heGoGbN4ffetM2QZSk7lqgc2Wer2fgTg=
@@ -377,10 +349,6 @@
 		</dict>
 		<key>cs.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			/jkyQ77G2Xd9wy6QptBphGNbtCY=
-			</data>
 			<key>hash2</key>
 			<data>
 			1mSn+EYeYcTV1dArgHz7PkmZrV6mHWfnuG5aDa6Y87E=
@@ -390,10 +358,6 @@
 		</dict>
 		<key>da.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			FYi0wjOu/Hw//Qe96yqxSb9yClc=
-			</data>
 			<key>hash2</key>
 			<data>
 			yLkvGzd+smkOjicvW/+Oe6wGGyirHS+/YfjuSzyVoMM=
@@ -403,10 +367,6 @@
 		</dict>
 		<key>de.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			MitzVbGhXhTLjPvw9vuWcQQa50Q=
-			</data>
 			<key>hash2</key>
 			<data>
 			DFHv7MWBJmyAkOj993NmSFKbS2t8/vtSev603sBUtjI=
@@ -416,10 +376,6 @@
 		</dict>
 		<key>el.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			n82gLcjjjHszaroTFeJUvSrrc0o=
-			</data>
 			<key>hash2</key>
 			<data>
 			i4FAK4mi+SgS6oZv8zM74kRZToakn49E8GD7FcJBLoQ=
@@ -429,10 +385,6 @@
 		</dict>
 		<key>en.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			hcxxLyrTI+aElXlPc5dwr7jdqwc=
-			</data>
 			<key>hash2</key>
 			<data>
 			vmBi9DFJzFcG0OwaWKSDjgklNi407U8u2pz3EnEENN4=
@@ -442,10 +394,6 @@
 		</dict>
 		<key>es.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			ff8DVQtNhO8pF7HFnXjh8foHXbo=
-			</data>
 			<key>hash2</key>
 			<data>
 			z6RjynaWjrRKHmv4sLirc4eXwKOtQdylzj5+TiHpaTc=
@@ -455,10 +403,6 @@
 		</dict>
 		<key>fi.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			R9cr8yqJmu91Xz31tGyprGR3t/s=
-			</data>
 			<key>hash2</key>
 			<data>
 			6BI0iPRVWaP63/XFdjLBz6z7DsvvuOoaEAS+mYzrx8E=
@@ -468,10 +412,6 @@
 		</dict>
 		<key>fr.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			PwFmqFeRTcjdHmkXYrPzNVYoe5o=
-			</data>
 			<key>hash2</key>
 			<data>
 			geXjZzXre2CRiALecPFBGz4JSJA7MbkDnB4qrEMKNwk=
@@ -481,10 +421,6 @@
 		</dict>
 		<key>he.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			/jPUgFtYbbyELG5DZ3Sjoi/If9w=
-			</data>
 			<key>hash2</key>
 			<data>
 			47mcrSx16SFjWPIiN7guCAG0va8NiJ6I5s45tSVEHlY=
@@ -494,10 +430,6 @@
 		</dict>
 		<key>hr.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			H2GtdTeORRPCnogvpWY69Dg9uME=
-			</data>
 			<key>hash2</key>
 			<data>
 			4bQvygPax6VBpoFlyS5by1N6otnDMliHu+bWsDaWSQc=
@@ -507,10 +439,6 @@
 		</dict>
 		<key>hu.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			QIimMhNyYmqp4ZW01hfj554WAMg=
-			</data>
 			<key>hash2</key>
 			<data>
 			0m2fIyz26vh3RlUqqSXvoNTLovxIixrUyJoL/IDSoVk=
@@ -520,10 +448,6 @@
 		</dict>
 		<key>id.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			2/54a0gkcVuk1I3m4ulDAXOLL5o=
-			</data>
 			<key>hash2</key>
 			<data>
 			hQf9SrG7d8aVWsXIbCIxkKEJjbnW1FLvS+MbOI1VtHQ=
@@ -533,10 +457,6 @@
 		</dict>
 		<key>it.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			hNIKYIcP/87e6g7AUP+zKRtJ52M=
-			</data>
 			<key>hash2</key>
 			<data>
 			XAbEWX6cicDxGzxGgSx3DhF4rjUHX4LV+dO0X3rUEqc=
@@ -546,10 +466,6 @@
 		</dict>
 		<key>ja.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			0iU2PbJ/3xgXMZ20ffsqaWpxKWc=
-			</data>
 			<key>hash2</key>
 			<data>
 			YOqOvZq0WEN4DCoSwc0lcTSRc4C812DqzjIsaid1SHg=
@@ -559,10 +475,6 @@
 		</dict>
 		<key>ko.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			ERH8oHR9H9jMHjP0EAgaTtVhnX4=
-			</data>
 			<key>hash2</key>
 			<data>
 			WJyaRCWn1KqmcDeajRnC41MdNrlpbI+1JbPkXhbKrKY=
@@ -572,10 +484,6 @@
 		</dict>
 		<key>ms.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			DkbQA2+v/qSgQWma/fg3647Bkqs=
-			</data>
 			<key>hash2</key>
 			<data>
 			gztYxa4Hn58HkKmcUIZI1jCz44IETZeMsqrpZSKxJvc=
@@ -585,10 +493,6 @@
 		</dict>
 		<key>nb.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			T3zFOvuvrJt5Vnmfqt2Mf/du8as=
-			</data>
 			<key>hash2</key>
 			<data>
 			Oy6UOwSN+/xPIrthAEvzV8PEn27kfsHpMMLU5w1rww0=
@@ -598,10 +502,6 @@
 		</dict>
 		<key>nl.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			t9PD5JEbfoSLaQ7f8M2cLghOReI=
-			</data>
 			<key>hash2</key>
 			<data>
 			XbijhSaZgmsW59Vo9ZEbhDuUQH18fHizWKzsLosiM0o=
@@ -611,10 +511,6 @@
 		</dict>
 		<key>pl.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			wfTnhBccAm6JfwH/JkZKNRKTUAU=
-			</data>
 			<key>hash2</key>
 			<data>
 			MQYgqA+Hl03JJ261Q19K5Lt64kSTBP+pfpD+jOVE3AU=
@@ -624,10 +520,6 @@
 		</dict>
 		<key>pt-PT.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			7yXkcZEpJ4UiRHAzhK+vw/Q857Y=
-			</data>
 			<key>hash2</key>
 			<data>
 			seINq3QazVameLGOW+pIAtGWLa6NDl5XWRtqnObxywo=
@@ -637,10 +529,6 @@
 		</dict>
 		<key>pt.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			tZPncsQs8weCDJa03AKLpijXSUw=
-			</data>
 			<key>hash2</key>
 			<data>
 			GnzdqEuQwORzVCih99bwr79UHIyzXm+zuN5b9m1NrKY=
@@ -650,10 +538,6 @@
 		</dict>
 		<key>ru.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			Ct+byJ3rWeigvg0q6rB/kQaR+yE=
-			</data>
 			<key>hash2</key>
 			<data>
 			yCN9s/JXYqsMNZ1icaH4hUwyMQ1NtxOmV6sIAtRd9pc=
@@ -663,10 +547,6 @@
 		</dict>
 		<key>sk.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			1yTM1nAsAYpSH7NrYU6/nFlqk5E=
-			</data>
 			<key>hash2</key>
 			<data>
 			OFHDtkGLLSfTuSx8GOTycKDCKOKmX0Wh2QG1CHhRz3I=
@@ -676,10 +556,6 @@
 		</dict>
 		<key>sv.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			i84z6vuHLrFpO0qZ2V0zYjixIws=
-			</data>
 			<key>hash2</key>
 			<data>
 			a3Gk+3USOT5uundOXrNCgnbcD0rDo2lkCO7b7+zg2Is=
@@ -689,10 +565,6 @@
 		</dict>
 		<key>th.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			oW5npy+pDJM1wUOgTkw9FY1Ave4=
-			</data>
 			<key>hash2</key>
 			<data>
 			qxGqAqRMwm0/dMd0W7DUsvbWb9x65GT+3d1zOQEql1w=
@@ -702,10 +574,6 @@
 		</dict>
 		<key>tr.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			76rD7PLrQMiT5YTlI8IjEFgsiU4=
-			</data>
 			<key>hash2</key>
 			<data>
 			Y6TnKQmqO/TAx+0KYqRRG6UOz7I/gM1YmbUwgSfZSQU=
@@ -715,10 +583,6 @@
 		</dict>
 		<key>zh-Hans.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			DNlMxUKypOvKArzi7ioJUiFfFXg=
-			</data>
 			<key>hash2</key>
 			<data>
 			BI3m4MTMHuPI4sQKPGeQnxIlBJJrXwgVuR7Ho1Q5o6Y=
@@ -728,10 +592,6 @@
 		</dict>
 		<key>zh-Hant.lproj/IQLocalizable.strings</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			U6I+uL07KIv2b77w0c0glaJlhMg=
-			</data>
 			<key>hash2</key>
 			<data>
 			14dQnjX3pEz2Um4J/fOdQDRe/LSuXxqkg1hEkO8E5ys=

src/EventHandler.h

@@ -0,0 +1,115 @@
+#ifndef EVENTHANDLER_H
+#define EVENTHANDLER_H
+
+#include <QDebug>
+#include <QSocketNotifier>
+#include <QFile>
+
+#ifdef Q_OS_LINUX
+#ifndef Q_OS_ANDROID
+#include <linux/input.h>
+#include "bluetooth.h"
+
+class EventHandler : public QObject
+{
+    Q_OBJECT
+
+  public:
+    EventHandler(const QString& devicePath, QObject* parent = nullptr)
+        : QObject(parent), m_devicePath(devicePath), m_notifier(nullptr), m_fd(-1) {}
+
+    ~EventHandler() {
+        if (m_fd != -1) {
+            ::close(m_fd);
+        }
+    }
+
+    bool initialize() {
+        m_fd = ::open(m_devicePath.toStdString().c_str(), O_RDONLY | O_NONBLOCK);
+        if (m_fd == -1) {
+            qDebug() << "Failed to open device:" << m_devicePath;
+            emit error(QString("Failed to open device: %1").arg(m_devicePath));
+            return false;
+        }
+        m_notifier = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
+        connect(m_notifier, &QSocketNotifier::activated, this, &EventHandler::handleEvent);
+        qDebug() << "Device opened successfully:" << m_devicePath;
+        return true;
+    }
+
+  signals:
+    void keyPressed(int keyCode);
+    void error(const QString& errorMessage);
+
+  private slots:
+    void handleEvent() {
+        input_event ev;
+        ssize_t bytesRead = ::read(m_fd, &ev, sizeof(ev));
+
+        if (bytesRead == sizeof(ev)) {
+            if (ev.type == EV_KEY && ev.value == 1) { // Key press event
+                emit keyPressed(ev.code);
+            }
+        } else if (bytesRead == 0) {
+            qDebug() << "End of file reached.";
+            m_notifier->setEnabled(false);
+        } else if (bytesRead == -1) {
+            qDebug() << "Read error:" << strerror(errno);
+            emit error(QString("Failed to read from device: %1").arg(strerror(errno)));
+        }
+    }
+
+  private:
+    QString m_devicePath;
+    int m_fd;
+    QSocketNotifier* m_notifier;
+};
+
+class BluetoothHandler : public QObject
+{
+    Q_OBJECT
+
+  public:
+    BluetoothHandler(bluetooth* bl, QString eventDevice, QObject* parent = nullptr)
+        : QObject(parent), m_bluetooth(bl)
+    {
+        m_handler = new EventHandler(eventDevice); // Adjust this path as needed
+
+        if (!m_handler->initialize()) {
+            qDebug() << "Failed to initialize EventHandler.";
+            return;
+        }
+
+        connect(m_handler, &EventHandler::keyPressed, this, &BluetoothHandler::onKeyPressed);
+        connect(m_handler, &EventHandler::error, this, &BluetoothHandler::onError);
+    }
+
+    ~BluetoothHandler() {
+        delete m_handler;
+    }
+
+  private slots:
+    void onKeyPressed(int keyCode)
+    {
+        qDebug() << "Key pressed:" << keyCode;
+        if (m_bluetooth && m_bluetooth->device() && m_bluetooth->device()->deviceType() == bluetoothdevice::BIKE) {
+            if (keyCode == 115) // up
+                ((bike*)m_bluetooth->device())->setGears(((bike*)m_bluetooth->device())->gears() + 1);
+            else if (keyCode == 114) // down
+                ((bike*)m_bluetooth->device())->setGears(((bike*)m_bluetooth->device())->gears() - 1);
+        }
+    }
+
+    void onError(const QString& errorMessage)
+    {
+        qDebug() << "Error:" << errorMessage;
+    }
+
+  private:
+    EventHandler* m_handler;
+    bluetooth* m_bluetooth;
+};
+
+#endif // EVENTHANDLER_H
+#endif // EVENTHANDLER_H
+#endif // EVENTHANDLER_H