fixing wrong descriptor

* trying on ios

* Update virtualbike_zwift.swift

* dynamic gears

* trying also on dircon but it doesn't work

* adding the android part

* gears works on android too!

* Update virtualbike.cpp

* adding zwift play service

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* fixing iOS UUID?

* porting to android too

* Update virtualbike.cpp

* Update virtualbike.cpp

* Update virtualbike.cpp

* Update virtualbike.cpp

* Update virtualbike.cpp

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* zwift play ask 1 passed!

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* seems to work apart the wattage to zwift

* Update virtualbike_zwift.swift

* accolumulated torque but it doesn't seem necessary

* the gearing is working!

* reverting torque not necessary

* increasing UI speed for the gear changing

* Update project.pbxproj

* handling slope

* fixing difficulty

* trying to use the wahoo service for gears also on dircon

* changing gears quickly

* merging modification on android/linux

* Update virtualbike.cpp

* fixing android

* fixing starting gears with the new zwift version

* adding setting for enabling it

* Update project.pbxproj

* Update virtualbike_zwift.swift

* Update virtualbike_zwift.swift

* fixing gears formatting

* Update project.pbxproj

.github/workflows/main.yml

@@ -1,3 +1,4 @@
+
 # This is a basic workflow to help you get started with Actions
 
 name: CI
@@ -195,14 +196,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
@@ -337,7 +338,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-latest
+    runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -433,7 +434,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 +443,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
@@ -507,7 +508,7 @@ jobs:
   # This workflow contains a single job called "build"
   android-build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -585,7 +586,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 +594,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
@@ -622,6 +615,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 +631,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 +652,7 @@ jobs:
 
   ios-build:
     # The type of runner that the job will run on
-    runs-on: macos-latest
+    runs-on: macos-12
     permissions:
       contents: write
 
@@ -824,8 +825,24 @@ jobs:
           echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
           cd ..        
 
+      - name: Clone vcpkg
+        run: git clone https://github.com/microsoft/vcpkg.git
+        working-directory: ${{ runner.workspace }}
+  
+      - name: Bootstrap vcpkg
+        run: .\vcpkg\bootstrap-vcpkg.bat
+        working-directory: ${{ runner.workspace }}
+        
+      - name: Install dependencies
+        run: |
+          .\vcpkg\vcpkg install protobuf protobuf-c abseil
+        working-directory: ${{ runner.workspace }}
+  
       - name: Build
         run: |
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose           
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
             qmake            
             nmake
             cd src/debug
@@ -839,6 +856,7 @@ jobs:
             cp ../../windows/*.py .
             cp ../../windows/*.bat .
             cp ../../../windows_openssl/*.* .
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\bin\*.* -Destination . -Verbose
             mkdir adb
             mkdir python
             Copy-Item -Path C:\hostedtoolcache\windows\Python\3.7.9\x64 -Destination python -Recurse
@@ -849,7 +867,10 @@ jobs:
         if: matrix.config.python
             
       - name: Build without python
-        run: |
+        run: |          
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose      
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
             qmake           
             nmake
             cd src/debug
@@ -860,10 +881,11 @@ jobs:
             windeployqt --qmldir ../../ qdomyos-zwift.exe
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
             cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
-            cp "C:/mingw64/bin/libstdc++-6.dll" .
+            cp "C:/mingw64/bin/libstdc++-6.dll" .              
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../../windows_openssl/*.* .
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\bin\*.* -Destination . -Verbose
             mkdir adb
             cp ../../adb/* adb/
             cd ..
@@ -883,14 +905,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 +952,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:
@@ -973,8 +998,24 @@ jobs:
           echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
           cd ..                    
 
+      - name: Clone vcpkg
+        run: git clone https://github.com/microsoft/vcpkg.git
+        working-directory: ${{ runner.workspace }}
+  
+      - name: Bootstrap vcpkg
+        run: .\vcpkg\bootstrap-vcpkg.bat
+        working-directory: ${{ runner.workspace }}
+        
+      - name: Install dependencies
+        run: |
+          .\vcpkg\vcpkg install protobuf protobuf-c abseil
+        working-directory: ${{ runner.workspace }}
+
       - name: Build
         run: |
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose           
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
             cd src
             echo "#define AISERVER" >> aiserver.h
             cd ..
@@ -993,6 +1034,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 +1048,187 @@ 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 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
+        with:
+          args: >
+            bash -c "
+            set -ex &&
+            apt-get update && 
+            apt-get install -y build-essential git cmake qtbase5-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: Archive Raspberry Pi binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: raspberry-pi-binary
+          path: src/qdomyos-zwift
+
+  raspberry-pi-build-and-image-64bit:
+    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 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
+        with:
+          args: >
+            bash -c "
+            set -ex &&
+            apt-get update && 
+            apt-get install -y build-essential git cmake qtbase5-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: Archive Raspberry Pi binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: raspberry-pi-64bit-binary
+          path: src/qdomyos-zwift
+
+      - name: Download and expand Raspberry Pi OS image
+        run: |
+          wget https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz
+          xz -d 2023-05-03-raspios-bullseye-arm64-lite.img.xz
+          ORIGINAL_SIZE=$(stat -c %s 2023-05-03-raspios-bullseye-arm64-lite.img)
+          NEW_SIZE=$((ORIGINAL_SIZE + 2*1024*1024*1024))  # Add 2GB
+          truncate -s $NEW_SIZE 2023-05-03-raspios-bullseye-arm64-lite.img
+          sudo apt-get update
+          sudo apt-get install -y parted
+          sudo parted 2023-05-03-raspios-bullseye-arm64-lite.img resizepart 2 100%
+
+      - name: Mount Raspberry Pi image
+        run: |
+          sudo apt-get install -y kpartx qemu-user-static
+          LOOP_DEVICE=$(sudo losetup -f --show 2023-05-03-raspios-bullseye-arm64-lite.img)
+          echo "Loop device is $LOOP_DEVICE"
+          sudo kpartx -av $LOOP_DEVICE
+          sudo mkdir -p /mnt/raspbian
+          sudo mount /dev/mapper/$(basename $LOOP_DEVICE)p2 /mnt/raspbian
+          sudo resize2fs /dev/mapper/$(basename $LOOP_DEVICE)p2
+          echo "LOOP_DEVICE=$LOOP_DEVICE" >> $GITHUB_ENV
+          sudo cp /usr/bin/qemu-aarch64-static /mnt/raspbian/usr/bin/
+
+      - name: Install Qt and dependencies on Raspberry Pi image
+        run: |
+          sudo chroot /mnt/raspbian qemu-aarch64-static /bin/bash << EOF
+          apt-get update
+          apt-get install -y qtbase5-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
+          EOF
+
+      - name: Copy binary to Raspberry Pi image
+        run: |
+          sudo cp src/qdomyos-zwift /mnt/raspbian/home/pi/
+          sudo chown 1000:1000 /mnt/raspbian/home/pi/qdomyos-zwift
+
+      - name: Setup auto-start for qdomyos-zwift
+        run: |
+          echo '[Unit]
+          Description=QDomyos-Zwift
+          After=multi-user.target
+
+          [Service]
+          ExecStart=/home/pi/qdomyos-zwift
+          User=pi
+          Environment=DISPLAY=:0
+
+          [Install]
+          WantedBy=multi-user.target' | sudo tee /mnt/raspbian/etc/systemd/system/qdomyos-zwift.service
+          sudo chroot /mnt/raspbian systemctl enable qdomyos-zwift.service
+
+      - name: Unmount Raspberry Pi image
+        run: |
+          sudo umount /mnt/raspbian
+          sudo kpartx -d ${{ env.LOOP_DEVICE }}
+          sudo losetup -d ${{ env.LOOP_DEVICE }}
+
+      - name: Compress modified Raspberry Pi image
+        run: |
+          xz -z 2023-05-03-raspios-bullseye-arm64-lite.img
+
+      - name: Upload Raspberry Pi image as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: raspberry-pi-64bit-image
+          path: 2023-05-03-raspios-bullseye-arm64-lite.img.xz
+  
   upload_to_release:
     permissions: write-all
-    runs-on: ubuntu-latest
+    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
     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 +1254,9 @@ jobs:
             windows-binary-no-python/*
             windows-binary/*
             fdroid-android-trial/*
+            raspberry-pi-binary/*
+            raspberry-pi-64bit-binary/*
+            2023-05-03-raspios-bullseye-arm64-lite.img.xz
+
+
+  

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
+}

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

@@ -152,6 +152,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 */; };
@@ -174,6 +176,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 +258,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 */; };
@@ -264,7 +270,6 @@
 		87440FBD2640291700E4DC0B /* fitplusbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87440FBC2640291700E4DC0B /* fitplusbike.cpp */; };
 		87440FBF2640292900E4DC0B /* moc_fitplusbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87440FBE2640292900E4DC0B /* moc_fitplusbike.cpp */; };
 		8745B2762AFCB4A300991A39 /* android in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 8745B2752AFCB4A300991A39 /* android */; };
-		8745B2782AFCB87B00991A39 /* libadb.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 8745B2742AFCB3B300991A39 /* libadb.a */; };
 		87473A9627ECA9EE00C203F5 /* proformrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87473A9527ECA9EE00C203F5 /* proformrower.cpp */; };
 		87473A9827ECAA0500C203F5 /* moc_proformrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87473A9727ECAA0500C203F5 /* moc_proformrower.cpp */; };
 		874823FE2B935ADA006F3CA1 /* moc_ergtable.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 874823FD2B935ADA006F3CA1 /* moc_ergtable.cpp */; };
@@ -286,6 +291,36 @@
 		87646C2027B5064600F82131 /* bhfitnesselliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87646C1E27B5064500F82131 /* bhfitnesselliptical.cpp */; };
 		87646C2227B5065100F82131 /* moc_bhfitnesselliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87646C2127B5065100F82131 /* moc_bhfitnesselliptical.cpp */; };
 		8767EF1E29448D6700810C0F /* characteristicwriteprocessor.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8767EF1D29448D6700810C0F /* characteristicwriteprocessor.cpp */; };
+		8768C8BA2BBC11C80099DBE1 /* file_sync_client.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C89C2BBC11C70099DBE1 /* file_sync_client.c */; };
+		8768C8BB2BBC11C80099DBE1 /* protocol.txt in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 8768C89D2BBC11C70099DBE1 /* protocol.txt */; };
+		8768C8BC2BBC11C80099DBE1 /* adb.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C89E2BBC11C70099DBE1 /* adb.c */; };
+		8768C8BD2BBC11C80099DBE1 /* console.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8A02BBC11C70099DBE1 /* console.c */; };
+		8768C8BE2BBC11C80099DBE1 /* transport_local.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8A42BBC11C70099DBE1 /* transport_local.c */; };
+		8768C8BF2BBC11C80099DBE1 /* transport.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8A52BBC11C70099DBE1 /* transport.c */; };
+		8768C8C02BBC11C80099DBE1 /* file_sync_service.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8A72BBC11C70099DBE1 /* file_sync_service.c */; };
+		8768C8C12BBC11C80099DBE1 /* NOTICE in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 8768C8A82BBC11C70099DBE1 /* NOTICE */; };
+		8768C8C22BBC11C80099DBE1 /* SERVICES.TXT in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 8768C8A92BBC11C70099DBE1 /* SERVICES.TXT */; };
+		8768C8C32BBC11C80099DBE1 /* services.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8AA2BBC11C70099DBE1 /* services.c */; };
+		8768C8C42BBC11C80099DBE1 /* fdevent.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8AD2BBC11C70099DBE1 /* fdevent.c */; };
+		8768C8C52BBC11C80099DBE1 /* OVERVIEW.TXT in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 8768C8AE2BBC11C70099DBE1 /* OVERVIEW.TXT */; };
+		8768C8C62BBC11C80099DBE1 /* AdbClient.m in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8B12BBC11C70099DBE1 /* AdbClient.m */; };
+		8768C8C72BBC11C80099DBE1 /* adb_auth_host.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8B22BBC11C70099DBE1 /* adb_auth_host.c */; };
+		8768C8C82BBC11C80099DBE1 /* commandline.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8B32BBC11C70099DBE1 /* commandline.c */; };
+		8768C8C92BBC11C80099DBE1 /* adb_client.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8B42BBC11C70099DBE1 /* adb_client.c */; };
+		8768C8CA2BBC11C80099DBE1 /* sockets.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8B52BBC11C80099DBE1 /* sockets.c */; };
+		8768C8CB2BBC11C80099DBE1 /* MODULE_LICENSE_APACHE2 in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 8768C8B62BBC11C80099DBE1 /* MODULE_LICENSE_APACHE2 */; };
+		8768C8CC2BBC11C80099DBE1 /* SYNC.TXT in Copy Bundle Resources */ = {isa = PBXBuildFile; fileRef = 8768C8B72BBC11C80099DBE1 /* SYNC.TXT */; };
+		8768C8D62BBC12890099DBE1 /* zipfile.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8D22BBC12890099DBE1 /* zipfile.c */; };
+		8768C8D82BBC12890099DBE1 /* centraldir.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8D42BBC12890099DBE1 /* centraldir.c */; };
+		8768C9022BBC12B80099DBE1 /* socket_loopback_client.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8DB2BBC12B70099DBE1 /* socket_loopback_client.c */; };
+		8768C9062BBC12B80099DBE1 /* socket_local_client.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8DF2BBC12B70099DBE1 /* socket_local_client.c */; };
+		8768C9092BBC12B80099DBE1 /* socket_local_server.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8E22BBC12B70099DBE1 /* socket_local_server.c */; };
+		8768C90A2BBC12B80099DBE1 /* socket_network_client.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8E32BBC12B70099DBE1 /* socket_network_client.c */; };
+		8768C90F2BBC12B80099DBE1 /* socket_loopback_server.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8E82BBC12B70099DBE1 /* socket_loopback_server.c */; };
+		8768C9102BBC12B80099DBE1 /* load_file.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8E92BBC12B70099DBE1 /* load_file.c */; };
+		8768C9172BBC12B80099DBE1 /* socket_inaddr_any_server.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C8F02BBC12B80099DBE1 /* socket_inaddr_any_server.c */; };
+		8768C9282BBC13220099DBE1 /* libcrypto.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 8768C9262BBC12D10099DBE1 /* libcrypto.a */; };
+		8768C92B2BBC33150099DBE1 /* adb_auth.c in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768C92A2BBC33150099DBE1 /* adb_auth.c */; };
 		8768D1FB285081FE00F58E3A /* nordictrackifitadbtreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768D1F9285081FE00F58E3A /* nordictrackifitadbtreadmill.cpp */; };
 		8768D1FD2850820B00F58E3A /* moc_nordictrackifitadbtreadmill.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8768D1FC2850820B00F58E3A /* moc_nordictrackifitadbtreadmill.cpp */; };
 		876BFC9C27BE35C5001D7645 /* proformelliptical.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 876BFC9827BE35C4001D7645 /* proformelliptical.cpp */; };
@@ -321,8 +356,12 @@
 		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 */; };
 		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 */; };
@@ -412,8 +451,11 @@
 		87BE6FDE272D2A3E00C35795 /* moc_horizongr7bike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87BE6FDD272D2A3E00C35795 /* moc_horizongr7bike.cpp */; };
 		87BF116D298E28CA00B5B6E7 /* pelotonbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87BF116C298E28CA00B5B6E7 /* pelotonbike.cpp */; };
 		87BF116F298E28EC00B5B6E7 /* moc_pelotonbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87BF116E298E28EC00B5B6E7 /* moc_pelotonbike.cpp */; };
+		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 */; };
@@ -882,6 +924,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>"; };
@@ -917,6 +962,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>"; };
@@ -1030,6 +1078,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>"; };
@@ -1079,6 +1130,48 @@
 		87646C1F27B5064500F82131 /* bhfitnesselliptical.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bhfitnesselliptical.h; path = ../src/devices/bhfitnesselliptical/bhfitnesselliptical.h; sourceTree = "<group>"; };
 		87646C2127B5065100F82131 /* moc_bhfitnesselliptical.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_bhfitnesselliptical.cpp; sourceTree = "<group>"; };
 		8767EF1D29448D6700810C0F /* characteristicwriteprocessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = characteristicwriteprocessor.cpp; path = ../src/characteristics/characteristicwriteprocessor.cpp; sourceTree = "<group>"; };
+		8768C89C2BBC11C70099DBE1 /* file_sync_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = file_sync_client.c; path = ../src/ios/adb/adb/file_sync_client.c; sourceTree = "<group>"; };
+		8768C89D2BBC11C70099DBE1 /* protocol.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = protocol.txt; path = ../src/ios/adb/adb/protocol.txt; sourceTree = "<group>"; };
+		8768C89E2BBC11C70099DBE1 /* adb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = adb.c; path = ../src/ios/adb/adb/adb.c; sourceTree = "<group>"; };
+		8768C89F2BBC11C70099DBE1 /* AdbClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AdbClient.h; path = ../src/ios/adb/adb/AdbClient.h; sourceTree = "<group>"; };
+		8768C8A02BBC11C70099DBE1 /* console.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = console.c; path = ../src/ios/adb/adb/console.c; sourceTree = "<group>"; };
+		8768C8A12BBC11C70099DBE1 /* adb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adb.h; path = ../src/ios/adb/adb/adb.h; sourceTree = "<group>"; };
+		8768C8A32BBC11C70099DBE1 /* adb_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adb_client.h; path = ../src/ios/adb/adb/adb_client.h; sourceTree = "<group>"; };
+		8768C8A42BBC11C70099DBE1 /* transport_local.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = transport_local.c; path = ../src/ios/adb/adb/transport_local.c; sourceTree = "<group>"; };
+		8768C8A52BBC11C70099DBE1 /* transport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = transport.c; path = ../src/ios/adb/adb/transport.c; sourceTree = "<group>"; };
+		8768C8A62BBC11C70099DBE1 /* sysdeps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sysdeps.h; path = ../src/ios/adb/adb/sysdeps.h; sourceTree = "<group>"; };
+		8768C8A72BBC11C70099DBE1 /* file_sync_service.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = file_sync_service.c; path = ../src/ios/adb/adb/file_sync_service.c; sourceTree = "<group>"; };
+		8768C8A82BBC11C70099DBE1 /* NOTICE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NOTICE; path = ../src/ios/adb/adb/NOTICE; sourceTree = "<group>"; };
+		8768C8A92BBC11C70099DBE1 /* SERVICES.TXT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SERVICES.TXT; path = ../src/ios/adb/adb/SERVICES.TXT; sourceTree = "<group>"; };
+		8768C8AA2BBC11C70099DBE1 /* services.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = services.c; path = ../src/ios/adb/adb/services.c; sourceTree = "<group>"; };
+		8768C8AB2BBC11C70099DBE1 /* adb_trace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adb_trace.h; path = ../src/ios/adb/adb/adb_trace.h; sourceTree = "<group>"; };
+		8768C8AC2BBC11C70099DBE1 /* mutex_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mutex_list.h; path = ../src/ios/adb/adb/mutex_list.h; sourceTree = "<group>"; };
+		8768C8AD2BBC11C70099DBE1 /* fdevent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fdevent.c; path = ../src/ios/adb/adb/fdevent.c; sourceTree = "<group>"; };
+		8768C8AE2BBC11C70099DBE1 /* OVERVIEW.TXT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OVERVIEW.TXT; path = ../src/ios/adb/adb/OVERVIEW.TXT; sourceTree = "<group>"; };
+		8768C8AF2BBC11C70099DBE1 /* file_sync_service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_sync_service.h; path = ../src/ios/adb/adb/file_sync_service.h; sourceTree = "<group>"; };
+		8768C8B02BBC11C70099DBE1 /* fdevent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fdevent.h; path = ../src/ios/adb/adb/fdevent.h; sourceTree = "<group>"; };
+		8768C8B12BBC11C70099DBE1 /* AdbClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AdbClient.m; path = ../src/ios/adb/adb/AdbClient.m; sourceTree = "<group>"; };
+		8768C8B22BBC11C70099DBE1 /* adb_auth_host.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = adb_auth_host.c; path = ../src/ios/adb/adb/adb_auth_host.c; sourceTree = "<group>"; };
+		8768C8B32BBC11C70099DBE1 /* commandline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = commandline.c; path = ../src/ios/adb/adb/commandline.c; sourceTree = "<group>"; };
+		8768C8B42BBC11C70099DBE1 /* adb_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = adb_client.c; path = ../src/ios/adb/adb/adb_client.c; sourceTree = "<group>"; };
+		8768C8B52BBC11C80099DBE1 /* sockets.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sockets.c; path = ../src/ios/adb/adb/sockets.c; sourceTree = "<group>"; };
+		8768C8B62BBC11C80099DBE1 /* MODULE_LICENSE_APACHE2 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MODULE_LICENSE_APACHE2; path = ../src/ios/adb/adb/MODULE_LICENSE_APACHE2; sourceTree = "<group>"; };
+		8768C8B72BBC11C80099DBE1 /* SYNC.TXT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SYNC.TXT; path = ../src/ios/adb/adb/SYNC.TXT; sourceTree = "<group>"; };
+		8768C8B82BBC11C80099DBE1 /* transport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = transport.h; path = ../src/ios/adb/adb/transport.h; sourceTree = "<group>"; };
+		8768C8D22BBC12890099DBE1 /* zipfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zipfile.c; path = ../src/ios/adb/libzipfile/zipfile.c; sourceTree = "<group>"; };
+		8768C8D42BBC12890099DBE1 /* centraldir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = centraldir.c; path = ../src/ios/adb/libzipfile/centraldir.c; sourceTree = "<group>"; };
+		8768C8D52BBC12890099DBE1 /* private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = private.h; path = ../src/ios/adb/libzipfile/private.h; sourceTree = "<group>"; };
+		8768C8DB2BBC12B70099DBE1 /* socket_loopback_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket_loopback_client.c; path = ../src/ios/adb/libcutils/socket_loopback_client.c; sourceTree = "<group>"; };
+		8768C8DF2BBC12B70099DBE1 /* socket_local_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket_local_client.c; path = ../src/ios/adb/libcutils/socket_local_client.c; sourceTree = "<group>"; };
+		8768C8E22BBC12B70099DBE1 /* socket_local_server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket_local_server.c; path = ../src/ios/adb/libcutils/socket_local_server.c; sourceTree = "<group>"; };
+		8768C8E32BBC12B70099DBE1 /* socket_network_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket_network_client.c; path = ../src/ios/adb/libcutils/socket_network_client.c; sourceTree = "<group>"; };
+		8768C8E82BBC12B70099DBE1 /* socket_loopback_server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket_loopback_server.c; path = ../src/ios/adb/libcutils/socket_loopback_server.c; sourceTree = "<group>"; };
+		8768C8E92BBC12B70099DBE1 /* load_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_file.c; path = ../src/ios/adb/libcutils/load_file.c; sourceTree = "<group>"; };
+		8768C8F02BBC12B80099DBE1 /* socket_inaddr_any_server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket_inaddr_any_server.c; path = ../src/ios/adb/libcutils/socket_inaddr_any_server.c; sourceTree = "<group>"; };
+		8768C9002BBC12B80099DBE1 /* socket_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_local.h; path = ../src/ios/adb/libcutils/socket_local.h; sourceTree = "<group>"; };
+		8768C9262BBC12D10099DBE1 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = ../src/ios/adb/libcrypto.a; sourceTree = "<group>"; };
+		8768C9292BBC32AE0099DBE1 /* adb_auth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adb_auth.h; path = ../src/ios/adb/adb/adb_auth.h; sourceTree = "<group>"; };
+		8768C92A2BBC33150099DBE1 /* adb_auth.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adb_auth.c; path = ../src/ios/adb/adb/adb_auth.c; sourceTree = "<group>"; };
 		8768D1F9285081FE00F58E3A /* nordictrackifitadbtreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nordictrackifitadbtreadmill.cpp; path = ../src/devices/nordictrackifitadbtreadmill/nordictrackifitadbtreadmill.cpp; sourceTree = "<group>"; };
 		8768D1FA285081FE00F58E3A /* nordictrackifitadbtreadmill.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nordictrackifitadbtreadmill.h; path = ../src/devices/nordictrackifitadbtreadmill/nordictrackifitadbtreadmill.h; sourceTree = "<group>"; };
 		8768D1FC2850820B00F58E3A /* moc_nordictrackifitadbtreadmill.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_nordictrackifitadbtreadmill.cpp; sourceTree = "<group>"; };
@@ -1143,9 +1236,15 @@
 		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; };
 		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>"; };
@@ -1221,6 +1320,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>"; };
@@ -1278,9 +1378,13 @@
 		87BF116B298E28CA00B5B6E7 /* pelotonbike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pelotonbike.h; path = ../src/devices/pelotonbike/pelotonbike.h; sourceTree = "<group>"; };
 		87BF116C298E28CA00B5B6E7 /* pelotonbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pelotonbike.cpp; path = ../src/devices/pelotonbike/pelotonbike.cpp; sourceTree = "<group>"; };
 		87BF116E298E28EC00B5B6E7 /* moc_pelotonbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_pelotonbike.cpp; sourceTree = "<group>"; };
+		87C424252BC1294000503687 /* moc_treadmillErgTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_treadmillErgTable.cpp; sourceTree = "<group>"; };
 		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>"; };
@@ -1641,8 +1745,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8768C9282BBC13220099DBE1 /* libcrypto.a in Link Binary With Libraries */,
 				87FA94672B6B89FD00B6AB9A /* SwiftUI.framework in Link Binary With Libraries */,
-				8745B2782AFCB87B00991A39 /* libadb.a in Link Binary With Libraries */,
 				879F74112893D5B8009A64C8 /* libqavfcamera.a in Link Binary With Libraries */,
 				879F740F2893D592009A64C8 /* libqtmedia_audioengine.a in Link Binary With Libraries */,
 				879F740C2893D4FA009A64C8 /* libqtaudio_coreaudio.a in Link Binary With Libraries */,
@@ -1803,6 +1907,8 @@
 		25B08E2869634E9BCBA333A2 /* Generated Sources */ = {
 			isa = PBXGroup;
 			children = (
+				87C4E5BC2C1C1D2600D0750E /* moc_crossrope.cpp */,
+				87C424252BC1294000503687 /* moc_treadmillErgTable.cpp */,
 				874823FD2B935ADA006F3CA1 /* moc_ergtable.cpp */,
 				87E1CA7C2B8DF04900E3C414 /* moc_trxappgateusbelliptical.cpp */,
 				87A0D7532A3A4547005147F2 /* moc_fakerower.cpp */,
@@ -1973,6 +2079,24 @@
 		2EB56BE3C2D93CDAB0C52E67 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				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 */,
@@ -2401,6 +2525,78 @@
 			name = "Bundle Data";
 			sourceTree = "<group>";
 		};
+		8768C89B2BBC11B10099DBE1 /* adb */ = {
+			isa = PBXGroup;
+			children = (
+				8768C9292BBC32AE0099DBE1 /* adb_auth.h */,
+				8768C8B22BBC11C70099DBE1 /* adb_auth_host.c */,
+				8768C8B42BBC11C70099DBE1 /* adb_client.c */,
+				8768C8A32BBC11C70099DBE1 /* adb_client.h */,
+				8768C8AB2BBC11C70099DBE1 /* adb_trace.h */,
+				8768C89E2BBC11C70099DBE1 /* adb.c */,
+				8768C8A12BBC11C70099DBE1 /* adb.h */,
+				8768C89F2BBC11C70099DBE1 /* AdbClient.h */,
+				8768C8B12BBC11C70099DBE1 /* AdbClient.m */,
+				8768C8B32BBC11C70099DBE1 /* commandline.c */,
+				8768C8A02BBC11C70099DBE1 /* console.c */,
+				8768C8AD2BBC11C70099DBE1 /* fdevent.c */,
+				8768C8B02BBC11C70099DBE1 /* fdevent.h */,
+				8768C89C2BBC11C70099DBE1 /* file_sync_client.c */,
+				8768C8A72BBC11C70099DBE1 /* file_sync_service.c */,
+				8768C8AF2BBC11C70099DBE1 /* file_sync_service.h */,
+				8768C8B62BBC11C80099DBE1 /* MODULE_LICENSE_APACHE2 */,
+				8768C8AC2BBC11C70099DBE1 /* mutex_list.h */,
+				8768C8A82BBC11C70099DBE1 /* NOTICE */,
+				8768C8AE2BBC11C70099DBE1 /* OVERVIEW.TXT */,
+				8768C89D2BBC11C70099DBE1 /* protocol.txt */,
+				8768C8AA2BBC11C70099DBE1 /* services.c */,
+				8768C8A92BBC11C70099DBE1 /* SERVICES.TXT */,
+				8768C8B52BBC11C80099DBE1 /* sockets.c */,
+				8768C8B72BBC11C80099DBE1 /* SYNC.TXT */,
+				8768C8A62BBC11C70099DBE1 /* sysdeps.h */,
+				8768C8A42BBC11C70099DBE1 /* transport_local.c */,
+				8768C8A52BBC11C70099DBE1 /* transport.c */,
+				8768C8B82BBC11C80099DBE1 /* transport.h */,
+				8768C92A2BBC33150099DBE1 /* adb_auth.c */,
+			);
+			name = adb;
+			sourceTree = "<group>";
+		};
+		8768C8CE2BBC12170099DBE1 /* adb */ = {
+			isa = PBXGroup;
+			children = (
+				8768C8D92BBC128F0099DBE1 /* libcutils */,
+				8768C8D12BBC12670099DBE1 /* libzipfile */,
+				8768C89B2BBC11B10099DBE1 /* adb */,
+			);
+			name = adb;
+			sourceTree = "<group>";
+		};
+		8768C8D12BBC12670099DBE1 /* libzipfile */ = {
+			isa = PBXGroup;
+			children = (
+				8768C8D42BBC12890099DBE1 /* centraldir.c */,
+				8768C8D52BBC12890099DBE1 /* private.h */,
+				8768C8D22BBC12890099DBE1 /* zipfile.c */,
+			);
+			name = libzipfile;
+			sourceTree = "<group>";
+		};
+		8768C8D92BBC128F0099DBE1 /* libcutils */ = {
+			isa = PBXGroup;
+			children = (
+				8768C8E92BBC12B70099DBE1 /* load_file.c */,
+				8768C8F02BBC12B80099DBE1 /* socket_inaddr_any_server.c */,
+				8768C8DF2BBC12B70099DBE1 /* socket_local_client.c */,
+				8768C8E22BBC12B70099DBE1 /* socket_local_server.c */,
+				8768C9002BBC12B80099DBE1 /* socket_local.h */,
+				8768C8DB2BBC12B70099DBE1 /* socket_loopback_client.c */,
+				8768C8E82BBC12B70099DBE1 /* socket_loopback_server.c */,
+				8768C8E32BBC12B70099DBE1 /* socket_network_client.c */,
+			);
+			name = libcutils;
+			sourceTree = "<group>";
+		};
 		876E4E122594747F00BD5714 /* watchkit */ = {
 			isa = PBXGroup;
 			children = (
@@ -2463,6 +2659,7 @@
 		AF39DD055C3EF8226FBE929D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				8768C9262BBC12D10099DBE1 /* libcrypto.a */,
 				87FA94682B6B8A5A00B6AB9A /* libSystem.B.tbd */,
 				87FA94662B6B89FD00B6AB9A /* SwiftUI.framework */,
 				8745B2742AFCB3B300991A39 /* libadb.a */,
@@ -2855,6 +3052,7 @@
 		E8C543AB96796ECAA2E65C57 /* qdomyoszwift */ = {
 			isa = PBXGroup;
 			children = (
+				8768C8CE2BBC12170099DBE1 /* adb */,
 				87BAC3BE2BA497160003E925 /* PrivacyInfo.xcprivacy */,
 				8745B2752AFCB4A300991A39 /* android */,
 				8752B4CC27F43D9200E2EC6C /* qz.storekit */,
@@ -3002,12 +3200,18 @@
 			buildActionMask = 2147483647;
 			files = (
 				8745B2762AFCB4A300991A39 /* android in Copy Bundle Resources */,
+				8768C8CB2BBC11C80099DBE1 /* MODULE_LICENSE_APACHE2 in Copy Bundle Resources */,
 				87BAC3BF2BA497160003E925 /* PrivacyInfo.xcprivacy in Copy Bundle Resources */,
+				8768C8C52BBC11C80099DBE1 /* OVERVIEW.TXT in Copy Bundle Resources */,
 				87C5F0BC26285E5F0067A1B5 /* SmtpMime in Copy Bundle Resources */,
 				2188AA0A52E9CD610922F82E /* Default-568h@2x.png in Copy Bundle Resources */,
+				8768C8BB2BBC11C80099DBE1 /* protocol.txt in Copy Bundle Resources */,
+				8768C8C12BBC11C80099DBE1 /* NOTICE in Copy Bundle Resources */,
 				8752B4CD27F43D9200E2EC6C /* qz.storekit in Copy Bundle Resources */,
 				23FA86F306CFF9E704521C39 /* LaunchScreen.storyboard in Copy Bundle Resources */,
+				8768C8C22BBC11C80099DBE1 /* SERVICES.TXT in Copy Bundle Resources */,
 				AE8CD574A5B60EF037ACA8F8 /* Images.xcassets in Copy Bundle Resources */,
+				8768C8CC2BBC11C80099DBE1 /* SYNC.TXT in Copy Bundle Resources */,
 			);
 			name = "Copy Bundle Resources";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3089,6 +3293,7 @@
 				87062646259480B200D06586 /* ViewController.swift in Compile Sources */,
 				87D269A425F535340076AA48 /* moc_m3ibike.cpp in Compile Sources */,
 				87BAFE482B8CA7AA00065FCD /* moc_focustreadmill.cpp in Compile Sources */,
+				8768C8BC2BBC11C80099DBE1 /* adb.c in Compile Sources */,
 				EA780CE97E201242E33E6EEE /* bike.cpp in Compile Sources */,
 				8738249827E646E3004F1B46 /* dirconmanager.cpp in Compile Sources */,
 				87D4693629B64D8100C9A382 /* ios_app_delegate.mm in Compile Sources */,
@@ -3105,6 +3310,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 */,
@@ -3134,6 +3340,7 @@
 				8718CBAB263063CE004BF4EE /* moc_templateinfosenderbuilder.cpp in Compile Sources */,
 				C6B3CD471768392E18F85819 /* fit_accumulated_field.cpp in Compile Sources */,
 				8730A3932B4078E6007E336D /* zwift_messages.pb.swift in Compile Sources */,
+				8768C8BE2BBC11C80099DBE1 /* transport_local.c in Compile Sources */,
 				3D7395B0A17915A06361C7F3 /* fit_accumulator.cpp in Compile Sources */,
 				2A61806454201575EDB3F94F /* fit_buffer_encode.cpp in Compile Sources */,
 				87F02E4229178545000DB52C /* moc_octaneelliptical.cpp in Compile Sources */,
@@ -3150,8 +3357,10 @@
 				87F93427278E0EC00088B596 /* domyosrower.cpp in Compile Sources */,
 				87B617EE25F25FED0094A1CB /* snodebike.cpp in Compile Sources */,
 				87C5F0B526285E5F0067A1B5 /* mimemessage.cpp in Compile Sources */,
+				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 */,
@@ -3164,6 +3373,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 */,
@@ -3173,10 +3383,12 @@
 				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 */,
 				878C9E6B28B77E9800669129 /* moc_nordictrackifitadbbike.cpp in Compile Sources */,
+				8768C8C82BBC11C80099DBE1 /* commandline.c in Compile Sources */,
 				878A331D25AB50C300BD13E1 /* moc_yesoulbike.cpp in Compile Sources */,
 				952DBD14DF6369E885020EF4 /* fit_developer_field.cpp in Compile Sources */,
 				879F16482847E57400CE4945 /* moc_proformellipticaltrainer.cpp in Compile Sources */,
@@ -3193,6 +3405,7 @@
 				873824B627E64707004F1B46 /* moc_hostname_p.cpp in Compile Sources */,
 				87A0D7542A3A4547005147F2 /* moc_fakerower.cpp in Compile Sources */,
 				873824EA27E647A8004F1B46 /* browser.cpp in Compile Sources */,
+				8768C8C42BBC11C80099DBE1 /* fdevent.c in Compile Sources */,
 				87E34C2B2886F95400CEDE4B /* octanetreadmill.cpp in Compile Sources */,
 				87A0D7522A3A4518005147F2 /* fakerower.cpp in Compile Sources */,
 				87B187BB29B8C552007EEF9D /* ziprotreadmill.cpp in Compile Sources */,
@@ -3207,6 +3420,8 @@
 				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 */,
@@ -3216,6 +3431,7 @@
 				87C481FA26DFA7C3006211AD /* eliterizer.cpp in Compile Sources */,
 				873824EE27E647A9004F1B46 /* service.cpp in Compile Sources */,
 				8772A0E625E43ADB0080718C /* trxappgateusbbike.cpp in Compile Sources */,
+				8768C8C02BBC11C80099DBE1 /* file_sync_service.c in Compile Sources */,
 				87C5F0BE26285E5F0067A1B5 /* mimemultipart.cpp in Compile Sources */,
 				87C5F0D426285E7E0067A1B5 /* moc_chronobike.cpp in Compile Sources */,
 				87BE6FDC272D2A3100C35795 /* horizongr7bike.cpp in Compile Sources */,
@@ -3229,7 +3445,9 @@
 				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 */,
 				87DA8465284933D200B550E9 /* fakeelliptical.cpp in Compile Sources */,
 				876E50F52B701C050080FAAF /* moc_zwiftclickremote.cpp in Compile Sources */,
@@ -3245,6 +3463,7 @@
 				8718CBA4263063BD004BF4EE /* templateinfosenderbuilder.cpp in Compile Sources */,
 				87E6A85B25B5C8B900371D28 /* flywheelbike.cpp in Compile Sources */,
 				87182A09276BBAF600141463 /* virtualrower.cpp in Compile Sources */,
+				87C424262BC1294000503687 /* moc_treadmillErgTable.cpp in Compile Sources */,
 				873824ED27E647A9004F1B46 /* resolver.cpp in Compile Sources */,
 				878531652711A3E1004B153D /* activiotreadmill.cpp in Compile Sources */,
 				87DAE16926E9FF5000B0527E /* moc_shuaa5treadmill.cpp in Compile Sources */,
@@ -3262,6 +3481,7 @@
 				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 */,
@@ -3286,13 +3506,16 @@
 				87A3BC222656429600D302E3 /* rower.cpp in Compile Sources */,
 				C719682D8D421AF6B2DAAEA9 /* main.cpp in Compile Sources */,
 				87BB1774269E983200F46A1C /* moc_webserverinfosender.cpp in Compile Sources */,
+				8768C8C32BBC11C80099DBE1 /* services.c in Compile Sources */,
 				87E2F85F291ED315002BDC65 /* moc_lifefitnesstreadmill.cpp in Compile Sources */,
 				876BFCA127BE35D8001D7645 /* moc_bowflext216treadmill.cpp in Compile Sources */,
 				25FCD41CCCAF49293B9369E8 /* qfit.cpp in Compile Sources */,
 				87ADD2BD27634C2100B7A0AB /* moc_technogymmyruntreadmill.cpp in Compile Sources */,
+				8768C8BD2BBC11C80099DBE1 /* console.c in Compile Sources */,
 				8738249227E646E3004F1B46 /* characteristicnotifier2a63.cpp in Compile Sources */,
 				8738249327E646E3004F1B46 /* characteristicwriteprocessor2ad9.cpp in Compile Sources */,
 				873824AD27E64706004F1B46 /* moc_characteristicnotifier.cpp in Compile Sources */,
+				8768C9022BBC12B80099DBE1 /* socket_loopback_client.c in Compile Sources */,
 				87C5F0B926285E5F0067A1B5 /* mimehtml.cpp in Compile Sources */,
 				27E452D452B62D0948DF0755 /* sessionline.cpp in Compile Sources */,
 				E40895A73216AC52D35083D9 /* signalhandler.cpp in Compile Sources */,
@@ -3306,9 +3529,11 @@
 				20AA270C9F447F42F5DC2FF2 /* trainprogram.cpp in Compile Sources */,
 				8710706E29C48AF30094D0F3 /* moc_handleurl.cpp in Compile Sources */,
 				87F93429278E0ECF0088B596 /* moc_domyosrower.cpp in Compile Sources */,
+				8768C8C62BBC11C80099DBE1 /* AdbClient.m in Compile Sources */,
 				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 */,
@@ -3323,6 +3548,7 @@
 				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 */,
@@ -3341,6 +3567,7 @@
 				872DCC392A18D4A800EC9F68 /* virtualdevice.cpp in Compile Sources */,
 				0F974CB18B3E792B42270F19 /* FitDecode.mm in Compile Sources */,
 				87440FBF2640292900E4DC0B /* moc_fitplusbike.cpp in Compile Sources */,
+				8768C8CA2BBC11C80099DBE1 /* sockets.c in Compile Sources */,
 				87B617EC25F25FED0094A1CB /* screencapture.cpp in Compile Sources */,
 				876F9B5F275385C9006AE6FA /* fitmetria_fanfit.cpp in Compile Sources */,
 				FB2566376FE0FB17ED3DE94D /* FitDeveloperField.mm in Compile Sources */,
@@ -3371,7 +3598,9 @@
 				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 */,
 				878531682711A3EC004B153D /* moc_activiotreadmill.cpp in Compile Sources */,
 				87C5F0D626285E7E0067A1B5 /* moc_emailaddress.cpp in Compile Sources */,
@@ -3384,6 +3613,7 @@
 				873824E727E647A8004F1B46 /* record.cpp in Compile Sources */,
 				B38F3288D4AE4025465C1953 /* moc_bike.cpp in Compile Sources */,
 				87EFB57025BD704A0039DD5A /* moc_proformtreadmill.cpp in Compile Sources */,
+				8768C9062BBC12B80099DBE1 /* socket_local_client.c in Compile Sources */,
 				8727C7D42B3BF1E4005429EB /* moc_QTelnet.cpp in Compile Sources */,
 				C3D1FD2587BF6F15B58BA675 /* moc_bluetooth.cpp in Compile Sources */,
 				87062648259480B700D06586 /* WorkoutTracking.swift in Compile Sources */,
@@ -3398,11 +3628,14 @@
 				9D9484EED654597C394345DE /* moc_echelonconnectsport.cpp in Compile Sources */,
 				87DED80627D1273900BE4FBB /* filedownloader.cpp in Compile Sources */,
 				7DEEAF0C3D671FBFD84ACFCE /* moc_homeform.cpp in Compile Sources */,
+				8768C92B2BBC33150099DBE1 /* adb_auth.c in Compile Sources */,
 				934A3E33459C9220F257B271 /* moc_qfit.cpp in Compile Sources */,
 				873F0231274BE47D002D0349 /* moc_mcfbike.cpp in Compile Sources */,
 				8718CBAE263063CE004BF4EE /* moc_soleelliptical.cpp in Compile Sources */,
+				8768C90A2BBC12B80099DBE1 /* socket_network_client.c in Compile Sources */,
 				8738248227E646C4004F1B46 /* dirconprocessor.cpp in Compile Sources */,
 				87EFE45927A518F5006EA1C3 /* nautiluselliptical.cpp in Compile Sources */,
+				8768C8D62BBC12890099DBE1 /* zipfile.c in Compile Sources */,
 				E62DA5FF2436135448C94671 /* moc_toorxtreadmill.cpp in Compile Sources */,
 				87586A4325B8341B00A243C4 /* moc_proformbike.cpp in Compile Sources */,
 				87CC3BA325A0885F001EC5A8 /* domyoselliptical.cpp in Compile Sources */,
@@ -3411,6 +3644,7 @@
 				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 */,
@@ -3431,6 +3665,7 @@
 				87B617ED25F25FED0094A1CB /* fitshowtreadmill.cpp in Compile Sources */,
 				87A0C4BC262329A600121A76 /* cscbike.cpp in Compile Sources */,
 				692540CF811B06A8710A0A52 /* moc_mainwindow.cpp in Compile Sources */,
+				8768C8BA2BBC11C80099DBE1 /* file_sync_client.c in Compile Sources */,
 				87D269A025F535200076AA48 /* skandikawiribike.cpp in Compile Sources */,
 				8738249427E646E3004F1B46 /* characteristicnotifier2a5b.cpp in Compile Sources */,
 				8768D1FB285081FE00F58E3A /* nordictrackifitadbtreadmill.cpp in Compile Sources */,
@@ -3447,10 +3682,12 @@
 				87061397286D8CFE00D2446E /* PathController.cpp in Compile Sources */,
 				87D44181269DE979003263D5 /* webserverinfosender.cpp in Compile Sources */,
 				87062647259480B400D06586 /* WatchKitConnection.swift in Compile Sources */,
+				8768C9172BBC12B80099DBE1 /* socket_inaddr_any_server.c in Compile Sources */,
 				876F45FD279350CC003CDA5A /* concept2skierg.cpp in Compile Sources */,
 				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 */,
@@ -3471,6 +3708,8 @@
 				8727C7D02B3BF1B8005429EB /* proformtelnetbike.cpp in Compile Sources */,
 				87E0761D277A081A00FDA0F9 /* technogymmyruntreadmillrfcomm.cpp in Compile Sources */,
 				873824B327E64707004F1B46 /* moc_dirconprocessor.cpp in Compile Sources */,
+				8768C9102BBC12B80099DBE1 /* load_file.c in Compile Sources */,
+				8768C90F2BBC12B80099DBE1 /* socket_loopback_server.c in Compile Sources */,
 				87A0771229B6420200A368BF /* moc_wahookickrheadwind.cpp in Compile Sources */,
 				87EB918827EE5FE7002535E1 /* moc_inappstoreqmltype.cpp in Compile Sources */,
 				87083D9626678EFA0072410D /* zwiftworkout.cpp in Compile Sources */,
@@ -3483,6 +3722,7 @@
 				8727A47927849EB200019B5D /* moc_paferstreadmill.cpp in Compile Sources */,
 				8783153B25E8D81E0007817C /* moc_sportstechbike.cpp in Compile Sources */,
 				875F69BB26342E9A0009FD78 /* moc_spirittreadmill.cpp in Compile Sources */,
+				8768C8BF2BBC11C80099DBE1 /* transport.c in Compile Sources */,
 			);
 			name = "Compile Sources";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3828,9 +4068,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 777;
+				CURRENT_PROJECT_VERSION = 909;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = "ADB_HOST=1";
 				HEADER_SEARCH_PATHS = (
 					../src,
 					.,
@@ -3859,6 +4100,7 @@
 					../../Qt/5.15.2/ios/include/QtTextToSpeech,
 					../../Qt/5.15.2/ios/include/QtMultimedia,
 					../src/devices,
+					../src/ios/adb/include,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/platforms,
@@ -3903,9 +4145,9 @@
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/mediaservice,
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/playlistformats,
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/audio,
-					"/Users/cagnulein/qdomyos-zwift/src/ios",
+					"/Users/cagnulein/qdomyos-zwift/src/ios/adb",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				OTHER_CFLAGS = (
 					"-pipe",
 					"-g",
@@ -4017,11 +4259,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 777;
+				CURRENT_PROJECT_VERSION = 909;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "ADB_HOST=1";
 				HEADER_SEARCH_PATHS = (
 					../src,
 					.,
@@ -4050,6 +4293,7 @@
 					../../Qt/5.15.2/ios/include/QtTextToSpeech,
 					../../Qt/5.15.2/ios/include/QtMultimedia,
 					../src/devices,
+					../src/ios/adb/include,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/platforms,
@@ -4094,9 +4338,9 @@
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/mediaservice,
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/playlistformats,
 					/Users/cagnulein/Qt/5.15.2/ios/plugins/audio,
-					"/Users/cagnulein/qdomyos-zwift/src/ios",
+					"/Users/cagnulein/qdomyos-zwift/src/ios/adb",
 				);
-				MARKETING_VERSION = 2.16;
+				MARKETING_VERSION = 2.18;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-pipe",
@@ -4242,7 +4486,7 @@
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 777;
+				CURRENT_PROJECT_VERSION = 909;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4267,7 +4511,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";
@@ -4338,7 +4582,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 777;
+				CURRENT_PROJECT_VERSION = 909;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = YES;
@@ -4359,7 +4603,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";
@@ -4430,7 +4674,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 777;
+				CURRENT_PROJECT_VERSION = 909;
 				DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
 				ENABLE_BITCODE = YES;
 				ENABLE_PREVIEWS = YES;
@@ -4475,7 +4719,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";
@@ -4544,7 +4788,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 777;
+				CURRENT_PROJECT_VERSION = 909;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
 				ENABLE_BITCODE = YES;
@@ -4585,7 +4829,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";

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

@@ -0,0 +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:        
+        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

src/CRC16IBM.h

@@ -0,0 +1,61 @@
+#ifndef CRC16IBM_H
+#define CRC16IBM_H
+
+#include <QByteArray>
+#include <QDebug>
+
+class CRC16IBM {
+  public:
+
+    // Function to calculate CRC-16 (XMODEM) checksum
+    static quint16 calculateCRC(const QByteArray &data) {
+        quint16 crc = 0xFFFF;  // Initial value
+
+        for (char byte : data) {
+            quint8 index = (crc >> 8) ^ static_cast<quint8>(byte);
+            crc = (crc << 8) ^ crc16Table[index];
+        }
+
+        return crc;
+    }
+
+  private:
+    // Precomputed CRC-16-IBM table
+    static constexpr quint16 crc16Table[256] = {
+        0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
+        0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
+        0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
+        0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
+        0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
+        0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
+        0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
+        0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
+        0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
+        0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
+        0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
+        0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
+        0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
+        0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
+        0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
+        0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
+        0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
+        0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
+        0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
+        0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
+        0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
+        0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+        0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
+        0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
+        0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
+        0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
+        0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
+        0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
+        0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
+        0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
+        0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
+        0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
+    };
+};
+
+
+#endif // CRC16IBM_H

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

src/Home.qml

@@ -7,7 +7,7 @@ import Qt.labs.settings 1.0
 import Qt.labs.platform 1.1
 import QtMultimedia 5.15
 
-HomeForm{
+HomeForm {
     objectName: "home"
     background: Rectangle {
         anchors.fill: parent
@@ -86,6 +86,32 @@ HomeForm{
         onTriggered: {if(rootItem.stopRequested) {rootItem.stopRequested = false; inner_stop(); }}
     }
 
+    property var locationServiceRequsted: false
+    MessageDialog {
+        text: "Permissions Required"
+        informativeText: "QZ requires both Bluetooth and Location Services to be enabled.\nLocation Services are necessary on Android to allow the app to find Bluetooth devices.\nThe GPS will not be used.\n\nWould you like to enable them?"
+        buttons: (MessageDialog.Yes | MessageDialog.No)
+        onYesClicked: {locationServiceRequsted = true; rootItem.enableLocationServices()}
+        visible: !rootItem.locationServices() && !locationServiceRequsted
+    }
+    MessageDialog {
+        text: "Restart the app"
+        informativeText: "To apply the changes, you need to restart the app.\nWould you like to do that now?"
+        buttons: (MessageDialog.Yes | MessageDialog.No)
+        onYesClicked: Qt.callLater(Qt.quit)
+        onNoClicked: this.visible = false;
+        visible: locationServiceRequsted
+    }
+
+    Timer {
+        interval: 200; running: true; repeat: false
+        onTriggered: {
+            if(rootItem.firstRun()) {
+                stackView.push("Wizard.qml")
+            }
+        }
+    }
+
     function inner_stop() {
         stop_clicked();
         rootItem.save_screenshot();
@@ -101,266 +127,298 @@ HomeForm{
     }
     lap.onClicked: { lap_clicked(); popupLap.open(); popupLapAutoClose.running = true; }
 
-    Component.onCompleted: { console.log("completed"); }
+    Component.onCompleted: {
+        console.log("home.qml completed");
+    }
 
-        GridView {
+    GridView {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.fill: parent
+        cellWidth: 175 * settings.ui_zoom / 100
+        cellHeight: 130 * settings.ui_zoom / 100
+        focus: true
+        model: appModel
+        leftMargin: { if(OS_VERSION === "Android") (Screen.width % cellWidth) / 2; else (parent.width % cellWidth) / 2; }
+        anchors.topMargin: (!window.lockTiles ? rootItem.topBarHeight + 30 : 0)
+        id: gridView
+        objectName: "gridview"
+        onMovementEnded: { headerToolbar.visible = (contentY == 0) || window.lockTiles; }
+        Screen.orientationUpdateMask:  Qt.LandscapeOrientation | Qt.PortraitOrientation
+        Screen.onPrimaryOrientationChanged:{
+            if(OS_VERSION === "Android")
+                gridView.leftMargin = (Screen.width % cellWidth) / 2;
+            else
+                gridView.leftMargin = (parent.width % cellWidth) / 2;
+        }
+
+        delegate: Item {
+            id: id1
+            width: 170 * settings.ui_zoom / 100
+            height: 125 * settings.ui_zoom / 100
+
+            visible: visibleItem
+            Component.onCompleted: console.log("completed " + objectName)
+
+            Behavior on x {
+                enabled: id1.state != "active"
+                NumberAnimation { duration: 400; easing.type: Easing.OutBack }
+            }
+
+            Behavior on y {
+                enabled: id1.state != "active"
+                NumberAnimation { duration: 400; easing.type: Easing.OutBack }
+            }
+
+            SequentialAnimation on rotation {
+                NumberAnimation { to:  2; duration: 60 }
+                NumberAnimation { to: -2; duration: 120 }
+                NumberAnimation { to:  0; duration: 60 }
+                running: loc.currentId !== -1 && id1.state !== "active" && window.lockTiles
+                loops: Animation.Infinite; alwaysRunToEnd: true
+            }
+
+            states: State {
+                name: "active"; when: loc.currentId === gridId && window.lockTiles
+                PropertyChanges { target: id1; x: loc.mouseX - gridView.x - width/2; y: loc.mouseY - gridView.y - height/2; scale: 0.5; z: 10 }
+            }
+
+            transitions: Transition { NumberAnimation { property: "scale"; duration: 200} }
+
+            Rectangle {
+                width: 168 * settings.ui_zoom / 100
+                height: 123 * settings.ui_zoom / 100
+                radius: 3
+                border.width: 1
+                border.color: (settings.theme_tile_shadow_enabled ? settings.theme_tile_shadow_color : settings.theme_tile_background_color)
+                color: settings.theme_tile_background_color
+                id: rect
+            }
+
+            DropShadow {
+                visible: settings.theme_tile_shadow_enabled
+                anchors.fill: rect
+                cached: true
+                horizontalOffset: 3
+                verticalOffset: 3
+                radius: 8.0
+                samples: 16
+                color: settings.theme_tile_shadow_color
+                source: rect
+            }
+
+            Timer {
+                id: toggleIconTimer
+                interval: 500; running: true; repeat: true
+                onTriggered: { if(identificator === "inclination" && rootItem.autoInclinationEnabled()) myIcon.visible = !myIcon.visible; else myIcon.visible = settings.theme_tile_icon_enabled && !largeButton; }
+            }
+
+            Image {
+                id: myIcon
+                x: 5
+                anchors {
+                         bottom: id1.bottom
+                }
+                width: 48 * settings.ui_zoom / 100
+                height: 48 * settings.ui_zoom / 100
+                source: icon
+                visible: settings.theme_tile_icon_enabled && !largeButton
+            }
+            Text {
+                objectName: "value"
+                id: myValue
+                color: valueFontColor
+                y: 0
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: value
+                horizontalAlignment: Text.AlignHCenter
+                font.pointSize: valueFontSize * settings.ui_zoom / 100
+                font.bold: true
+                visible: !largeButton
+            }
+            Text {
+                objectName: "secondLine"
+                id: secondLineText
+                color: "white"
+                y: myValue.bottom
+                anchors {
+                    top: myValue.bottom
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: secondLine
+                horizontalAlignment: Text.AlignHCenter
+                font.pointSize: settings.theme_tile_secondline_textsize * settings.ui_zoom / 100
+                font.bold: false
+                visible: !largeButton
+            }
+            Text {
+                id: myText
+                anchors {
+                    top: myIcon.top
+                }
+                font.bold: true
+                     font.pointSize: labelFontSize
+                color: "white"
+                text: name
+                anchors.left: parent.left
+                anchors.leftMargin: 55 * settings.ui_zoom / 100
+                anchors.topMargin: 20 * settings.ui_zoom / 100
+                visible: !largeButton
+            }
+            RoundButton {
+                objectName: minusName
+                autoRepeat: true
+                text: "-"
+                onClicked: minus_clicked(objectName)
+                visible: writable && !largeButton
+                anchors.top: myValue.top
+                anchors.left: parent.left
+                anchors.leftMargin: 2
+                width: 48 * settings.ui_zoom / 100
+                height: 48 * settings.ui_zoom / 100
+            }
+            RoundButton {
+                autoRepeat: true
+                objectName: plusName
+                text: "+"
+                onClicked: plus_clicked(objectName)
+                visible: writable && !largeButton
+                anchors.top: myValue.top
+                anchors.right: parent.right
+                anchors.rightMargin: 2
+                width: 48 * settings.ui_zoom / 100
+                height: 48 * settings.ui_zoom / 100
+            }
+            RoundButton {
+                autoRepeat: true
+                objectName: identificator
+                text: largeButtonLabel
+                onClicked: largeButton_clicked(objectName)
+                visible: largeButton
+                anchors.fill: rect
+                      background: Rectangle {
+                          color: largeButtonColor
+                            radius: 20
+                            }
+                font.pointSize: 20 * settings.ui_zoom / 100
+            }
+        }
+    }
+
+    footer: Item {
+        id: footerItem
+        width: parent.width
+        height: footerHeight
+        property real footerHeight: (rootItem.chartFooterVisible ? parent.height / 4 : parent.height / 2)
+        property real minHeight: parent.height / 4
+        property real maxHeight: parent.height * 3 / 4
+        anchors.bottom: parent.bottom
+        clip: true
+        visible: rootItem.chartFooterVisible || rootItem.videoVisible
+
+        Rectangle {
+            id: dragHandle
+            width: parent.width / 5
+            height: 10
+            color: "#9C27B0"
+            anchors.top: parent.top
             anchors.horizontalCenter: parent.horizontalCenter
-            anchors.fill: parent
-            cellWidth: 175 * settings.ui_zoom / 100
-            cellHeight: 130 * settings.ui_zoom / 100
-            focus: true
-            model: appModel
-            leftMargin: { if(OS_VERSION === "Android") (Screen.width % cellWidth) / 2; else (parent.width % cellWidth) / 2; }
-            anchors.topMargin: (!window.lockTiles ? rootItem.topBarHeight + 30 : 0)
-            id: gridView
-            objectName: "gridview"
-            onMovementEnded: { headerToolbar.visible = (contentY == 0) || window.lockTiles; }
-            Screen.orientationUpdateMask:  Qt.LandscapeOrientation | Qt.PortraitOrientation
-            Screen.onPrimaryOrientationChanged:{
-                if(OS_VERSION === "Android")
-                    gridView.leftMargin = (Screen.width % cellWidth) / 2;
-                else
-                    gridView.leftMargin = (parent.width % cellWidth) / 2;
+            visible: rootItem.chartFooterVisible || rootItem.videoVisible
+
+            Canvas {
+                anchors.fill: parent
+                onPaint: {
+                    var ctx = getContext("2d");
+                    ctx.strokeStyle = "#FFFFFF";
+                    ctx.lineWidth = 2;
+
+                    for (var i = 0; i < 3; i++) {
+                        ctx.beginPath();
+                        ctx.moveTo(0, (i + 1) * parent.height / 4);
+                        ctx.lineTo(parent.width, (i + 1) * parent.height / 4);
+                        ctx.stroke();
+                    }
+                }
             }
 
-            //        highlight: Rectangle {
-            //            width: 150
-            //           height: 150
-            //            color: "lightsteelblue"
-            //        }
-            delegate: Item {
-                id: id1
-                width: 170 * settings.ui_zoom / 100
-                height: 125 * settings.ui_zoom / 100
+            MouseArea {
+                id: dragArea
+                anchors.fill: parent
+                cursorShape: Qt.SizeVerCursor
 
-                visible: visibleItem
-                Component.onCompleted: console.log("completed " + objectName)
+                property real startY: 0
+                property real startHeight: 0
 
-                Behavior on x {
-                    enabled: id1.state != "active"
-                    NumberAnimation { duration: 400; easing.type: Easing.OutBack }
+                onPressed: {
+                    startY = mouseY
+                    startHeight = footerItem.height
                 }
 
-                Behavior on y {
-                    enabled: id1.state != "active"
-                    NumberAnimation { duration: 400; easing.type: Easing.OutBack }
-                }
-
-                SequentialAnimation on rotation {
-                    NumberAnimation { to:  2; duration: 60 }
-                    NumberAnimation { to: -2; duration: 120 }
-                    NumberAnimation { to:  0; duration: 60 }
-                    running: loc.currentId !== -1 && id1.state !== "active" && window.lockTiles
-                    loops: Animation.Infinite; alwaysRunToEnd: true
-                }
-
-                states: State {
-                    name: "active"; when: loc.currentId === gridId && window.lockTiles
-                    PropertyChanges { target: id1; x: loc.mouseX - gridView.x - width/2; y: loc.mouseY - gridView.y - height/2; scale: 0.5; z: 10 }
-                }
-
-                transitions: Transition { NumberAnimation { property: "scale"; duration: 200} }
-
-                Rectangle {
-                    width: 168 * settings.ui_zoom / 100
-                    height: 123 * settings.ui_zoom / 100
-                    radius: 3
-                    border.width: 1
-                    border.color: (settings.theme_tile_shadow_enabled ? settings.theme_tile_shadow_color : settings.theme_tile_background_color)
-                    color: settings.theme_tile_background_color
-                    id: rect
-                }
-
-                DropShadow {
-                    visible: settings.theme_tile_shadow_enabled
-                    anchors.fill: rect
-                    cached: true
-                    horizontalOffset: 3
-                    verticalOffset: 3
-                    radius: 8.0
-                    samples: 16
-                    color: settings.theme_tile_shadow_color
-                    source: rect
-                }
-
-                Timer {
-                    id: toggleIconTimer
-                    interval: 500; running: true; repeat: true
-                    onTriggered: { if(identificator === "inclination" && rootItem.autoInclinationEnabled()) myIcon.visible = !myIcon.visible; else myIcon.visible = settings.theme_tile_icon_enabled && !largeButton; }
-                }
-
-                Image {
-                    id: myIcon
-                    x: 5
-                    anchors {
-                             bottom: id1.bottom
+                onMouseYChanged: {
+                    if (pressed) {
+                        var newHeight = Math.max(footerItem.minHeight, Math.min(footerItem.maxHeight, startHeight + startY - mouseY))
+                        footerItem.footerHeight = newHeight
                     }
-                    width: 48 * settings.ui_zoom / 100
-                    height: 48 * settings.ui_zoom / 100
-                    source: icon
-                    visible: settings.theme_tile_icon_enabled && !largeButton
                 }
-                Text {
-                    objectName: "value"
-                    id: myValue
-                    color: valueFontColor
-                    y: 0
-                    anchors {
-                        horizontalCenter: parent.horizontalCenter
-                    }
-                    text: value
-                    horizontalAlignment: Text.AlignHCenter
-                    font.pointSize: valueFontSize * settings.ui_zoom / 100
-                    font.bold: true
-                    visible: !largeButton
-                }
-                Text {
-                    objectName: "secondLine"
-                    id: secondLineText
-                    color: "white"
-                    y: myValue.bottom
-                    anchors {
-                        top: myValue.bottom
-                        horizontalCenter: parent.horizontalCenter
-                    }
-                    text: secondLine
-                    horizontalAlignment: Text.AlignHCenter
-                    font.pointSize: settings.theme_tile_secondline_textsize * settings.ui_zoom / 100
-                    font.bold: false
-                    visible: !largeButton
-                }
-                Text {
-                    id: myText
-                    anchors {
-                        top: myIcon.top
-                    }
-                    font.bold: true
-                         font.pointSize: labelFontSize
-                    color: "white"
-                    text: name
-                    anchors.left: parent.left
-                    anchors.leftMargin: 55 * settings.ui_zoom / 100
-                    anchors.topMargin: 20 * settings.ui_zoom / 100
-                    visible: !largeButton
-                }
-                RoundButton {
-                    objectName: minusName
-                    autoRepeat: true
-                    text: "-"
-                    onClicked: minus_clicked(objectName)
-                    visible: writable && !largeButton
-                    anchors.top: myValue.top
-                    anchors.left: parent.left
-                    anchors.leftMargin: 2
-                    width: 48 * settings.ui_zoom / 100
-                    height: 48 * settings.ui_zoom / 100
-                }
-                RoundButton {
-                    autoRepeat: true
-                    objectName: plusName
-                    text: "+"
-                    onClicked: plus_clicked(objectName)
-                    visible: writable && !largeButton
-                    anchors.top: myValue.top
-                    anchors.right: parent.right
-                    anchors.rightMargin: 2
-                    width: 48 * settings.ui_zoom / 100
-                    height: 48 * settings.ui_zoom / 100
-                }
-                RoundButton {
-                    autoRepeat: true
-                    objectName: identificator
-                    text: largeButtonLabel
-                    onClicked: largeButton_clicked(objectName)
-                    visible: largeButton
-                    anchors.fill: rect
-						  background: Rectangle {
-						      color: largeButtonColor
-								radius: 20
-								}
-                    font.pointSize: 20 * settings.ui_zoom / 100
-                    //width: 48 * settings.ui_zoom / 100
-                    //height: 48 * settings.ui_zoom / 100
-                }
-
-                /*MouseArea {
-                    anchors.fill: parent
-                    onClicked: parent.GridView.view.currentIndex = index
-                }*/
             }
         }
 
-        footer:
-            Item {
-                width: parent.width
-                height: (rootItem.chartFooterVisible ? parent.height / 4 : parent.height / 2)
-                anchors.top: gridView.bottom
-                visible: rootItem.chartFooterVisible || rootItem.videoVisible
-
-                Rectangle {
-                    id: chartFooterRectangle
-                    visible: rootItem.chartFooterVisible
-                    anchors.fill: parent
-                    ChartFooter {
-                        anchors.fill: parent
-                        visible: rootItem.chartFooterVisible
-                    }
-                }
-
-                Rectangle {
-                    objectName: "footerrectangle"
-                    visible: rootItem.videoVisible
-                    anchors.fill: parent
-                    // Removed Timer, Play/Pause/Resume is now done via Homeform.cpp
-                    /*
-                    Timer {
-                        id: pauseTimer
-                        interval: 1000; running: true; repeat: true
-                        onTriggered: { if(visible == true) { (rootItem.currentSpeed > 0  ?
-                                            videoPlaybackHalf.play() :
-                                            videoPlaybackHalf.pause()) } }
-                    }
-                    */
-
-                    onVisibleChanged: {
-                        if(visible === true) {
-                            console.log("mediaPlayer onCompleted: " + rootItem.videoPath)
-                            console.log("videoRate: " + rootItem.videoRate)
-                            videoPlaybackHalf.source = rootItem.videoPath
-                            //videoPlaybackHalf.playbackRate = rootItem.videoRate
-
-                            videoPlaybackHalf.seek(rootItem.videoPosition)
-                            videoPlaybackHalf.play()
-                            videoPlaybackHalf.muted = rootItem.currentCoordinateValid
-                        } else {
-                            videoPlaybackHalf.stop()
-                        }
-
-                    }
-
-                    MediaPlayer {
-                           id: videoPlaybackHalf
-                           objectName: "videoplaybackhalf"
-                           autoPlay: false
-                           playbackRate: rootItem.videoRate
-
-                           onError: {
-                               if (videoPlaybackHalf.NoError !== error) {
-                                   console.log("[qmlvideo] VideoItem.onError error " + error + " errorString " + errorString)
-                               }
-                           }
-
-                       }
-
-                    VideoOutput {
-                             id:videoPlayer
-                             anchors.fill: parent
-                             source: videoPlaybackHalf
-                         }
-                }
-
+        Rectangle {
+            id: chartFooterRectangle
+            visible: rootItem.chartFooterVisible
+            anchors.top: dragHandle.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
+            ChartFooter {
+                anchors.fill: parent
+                visible: rootItem.chartFooterVisible
+            }
         }
 
+        Rectangle {
+            objectName: "footerrectangle"
+            visible: rootItem.videoVisible
+            anchors.top: dragHandle.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
+
+            onVisibleChanged: {
+                if(visible === true) {
+                    console.log("mediaPlayer onCompleted: " + rootItem.videoPath)
+                    console.log("videoRate: " + rootItem.videoRate)
+                    videoPlaybackHalf.source = rootItem.videoPath
+                    videoPlaybackHalf.seek(rootItem.videoPosition)
+                    videoPlaybackHalf.play()
+                    videoPlaybackHalf.muted = rootItem.currentCoordinateValid
+                } else {
+                    videoPlaybackHalf.stop()
+                }
+            }
+
+            MediaPlayer {
+                id: videoPlaybackHalf
+                objectName: "videoplaybackhalf"
+                autoPlay: false
+                playbackRate: rootItem.videoRate
+
+                onError: {
+                    if (videoPlaybackHalf.NoError !== error) {
+                        console.log("[qmlvideo] VideoItem.onError error " + error + " errorString " + errorString)
+                    }
+                }
+            }
+
+            VideoOutput {
+                id: videoPlayer
+                anchors.fill: parent
+                source: videoPlaybackHalf
+            }
+        }
+    }
+
     MouseArea {
         property int currentId: -1 // Original position in model
         property int newIndex // Current Position in model

src/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.cagnulen.qdomyoszwift" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionName="2.16.50" android:versionCode="778" android:installLocation="auto">
+<manifest package="org.cagnulen.qdomyoszwift" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionName="2.18.1" android:versionCode="908" android:installLocation="auto">
 <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
           Remove the comment if you do not require these default permissions. -->
 			<!-- %%INSERT_PERMISSIONS -->
@@ -78,7 +78,8 @@
 				<service
 				    android:name=".ForegroundService"
 					 android:enabled="true"
-					 android:exported="true"></service>
+                                         android:foregroundServiceType="connectedDevice"
+                                         android:exported="false"></service>
                 <service
                     android:name=".WearableMessageListenerService"
                     android:enabled="true"
@@ -97,6 +98,7 @@
 
             <service android:name="com.cgutman.androidremotedebugger.service.ShellService"
 				    android:enabled="true"
+                                    android:foregroundServiceType="connectedDevice"
 					 android:exported="false" >
 					</service>
 
@@ -109,13 +111,21 @@
                                     android:value="ocr" />
 
 				<activity android:name="org.cagnulen.qdomyoszwift.MyActivity" />
+
+                                <receiver android:name=".MediaButtonReceiver" android:exported="true" android:permission="android.permission.MODIFY_AUDIO_SETTINGS">
+                                    <intent-filter>
+                                        <action android:name="android.media.VOLUME_CHANGED_ACTION" />
+                                    </intent-filter>
+                                </receiver>
 		  <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
 		</application>
 
 <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 <uses-permission android:name="android.permission.WAKE_LOCK"/>
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
 <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+<uses-permission android:name="android.permission.RECEIVE_MEDIA_BUTTON" />
     <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
@@ -126,6 +136,7 @@
 	 <uses-permission android:name="com.android.vending.BILLING"/>
 	 <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 	 <uses-permission android:name="com.google.android.things.permission.USE_PERIPHERAL_IO" />
+         <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 	 <uses-permission android:name="android.permission.GET_TASKS" />
 	 <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"
 	     tools:ignore="ProtectedPermissions" />

src/android/build.gradle

@@ -18,7 +18,6 @@ repositories {
     google()
     jcenter()
     maven { url 'https://jitpack.io' }
-	 maven { url 'https://dl.bintray.com/rvalerio/maven' }
 }
 
 apply plugin: 'com.android.application'
@@ -28,7 +27,7 @@ def amazon = System.getenv('AMAZON')
 println(amazon)
 
 dependencies {
-    compile 'com.rvalerio:fgchecker:1.1.0'
+    implementation "androidx.core:core:1.12.0"
     implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0"
     implementation 'com.google.protobuf:protobuf-javalite:3.25.1'
@@ -45,7 +44,7 @@ dependencies {
 
     def appcompat_version = "1.3.1"
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	 implementation "com.android.billingclient:billing:5.0.0"
+         implementation "com.android.billingclient:billing:6.0.1"
          implementation 'com.android.support:appcompat-v7:28.0.0'
 
          implementation "androidx.appcompat:appcompat:$appcompat_version"
@@ -130,7 +129,7 @@ android {
         resConfig "en"
                   compileSdkVersion 33
 		  minSdkVersion = 21
-                  targetSdkVersion = 33
+                  targetSdkVersion = 34
     }
 
 tasks.all { task ->

src/android/src/BleAdvertiser.java

@@ -0,0 +1,100 @@
+package org.cagnulen.qdomyoszwift;
+
+import android.app.ActivityManager;
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+import android.os.Looper;
+import android.os.Handler;
+import android.util.Log;
+import android.content.BroadcastReceiver;
+import android.content.ContextWrapper;
+import android.content.IntentFilter;
+import android.widget.Toast;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.List;
+
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.le.AdvertiseData;
+import android.bluetooth.le.AdvertiseCallback;
+import android.bluetooth.le.AdvertiseSettings;
+import android.os.ParcelUuid;
+import java.util.UUID;
+
+public class BleAdvertiser {
+    private static final UUID SERVICE_UUID = UUID.fromString("00001826-0000-1000-8000-00805f9b34fb");
+    private static final byte[] SERVICE_DATA_ROWER = {0x01, 0x10, 0x00};
+    private static final byte[] SERVICE_DATA_TREADMILL = {0x01, 0x01, 0x00};
+
+    public static void startAdvertisingRower(Context context) {
+        BluetoothManager bluetoothManager = (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (bluetoothManager != null) {
+            android.bluetooth.le.BluetoothLeAdvertiser advertiser = bluetoothManager.getAdapter().getBluetoothLeAdvertiser();
+
+            AdvertiseSettings settings = new AdvertiseSettings.Builder()
+                    .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY)
+                    .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_HIGH)
+                    .setConnectable(true)
+                    .build();
+
+            AdvertiseData advertiseData = new AdvertiseData.Builder()
+                    .setIncludeDeviceName(true)
+                    .addServiceUuid(new ParcelUuid(SERVICE_UUID))
+                    .addServiceData(new ParcelUuid(SERVICE_UUID), SERVICE_DATA_ROWER)
+                    .build();
+
+            if (advertiser != null) {
+                advertiser.startAdvertising(settings, advertiseData, advertiseCallback);
+            }
+        }
+    }
+
+    public static void startAdvertisingTreadmill(Context context) {
+        BluetoothManager bluetoothManager = (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (bluetoothManager != null) {
+            android.bluetooth.le.BluetoothLeAdvertiser advertiser = bluetoothManager.getAdapter().getBluetoothLeAdvertiser();
+
+            AdvertiseSettings settings = new AdvertiseSettings.Builder()
+                    .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY)
+                    .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_HIGH)
+                    .setConnectable(true)
+                    .build();
+
+            AdvertiseData advertiseData = new AdvertiseData.Builder()
+                    .setIncludeDeviceName(true)
+                    .addServiceUuid(new ParcelUuid(SERVICE_UUID))
+                    .addServiceData(new ParcelUuid(SERVICE_UUID), SERVICE_DATA_TREADMILL)
+                    .build();
+
+            if (advertiser != null) {
+                advertiser.startAdvertising(settings, advertiseData, advertiseCallback);
+            }
+        }
+    }
+
+    private static AdvertiseCallback advertiseCallback = new AdvertiseCallback() {
+        @Override
+        public void onStartSuccess(AdvertiseSettings settingsInEffect) {
+          Log.d("BleAdvertiser", "Advertising started successfully");
+        }
+
+        @Override
+        public void onStartFailure(int errorCode) {
+          Log.e("BleAdvertiser", "Advertising failed with error code: " + errorCode);
+        }
+    };
+}

src/android/src/ChannelService.java

@@ -36,6 +36,8 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 import android.util.SparseArray;
+import android.os.Build;
+import androidx.core.content.ContextCompat;
 
 import java.util.ArrayList;
 
@@ -55,6 +57,7 @@ public class ChannelService extends Service {
     private ServiceConnection mAntRadioServiceConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
+            Log.v(TAG, "onServiceConnected");
             // Must pass in the received IBinder object to correctly construct an AntService object
             mAntRadioService = new AntService(service);
 
@@ -69,6 +72,8 @@ public class ChannelService extends Service {
                 // radio by attempting to acquire a channel.
                 boolean legacyInterfaceInUse = mAntChannelProvider.isLegacyInterfaceInUse();
 
+                Log.v(TAG, "onServiceConnected mChannelAvailable=" + mChannelAvailable + " legacyInterfaceInUse=" + legacyInterfaceInUse);
+
                 // If there are channels OR legacy interface in use, allow adding channels
                 if (mChannelAvailable || legacyInterfaceInUse) {
                     mAllowAddChannel = true;
@@ -77,7 +82,11 @@ public class ChannelService extends Service {
                     mAllowAddChannel = false;
                 }
 
-
+                try {
+                    openAllChannels();
+                } catch (ChannelNotAvailableException exception) {
+                    Log.e(TAG, "Channel not available!!");
+                }
             } catch (RemoteException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
@@ -130,6 +139,7 @@ public class ChannelService extends Service {
 
         int getHeart() {
             if (null != heartChannelController) {
+                Log.v(TAG, "getHeart");
                 return heartChannelController.heart;
             }
             return 0;
@@ -144,13 +154,13 @@ public class ChannelService extends Service {
     }
 
     public void openAllChannels() throws ChannelNotAvailableException {
-        if (Ant.heartRequest)
+        if (Ant.heartRequest && heartChannelController == null)
             heartChannelController = new HeartChannelController(acquireChannel());
 
         if (Ant.speedRequest) {
-            if(Ant.treadmill) {
+            if(Ant.treadmill && sdmChannelController == null) {
                 sdmChannelController = new SDMChannelController(acquireChannel());
-            } else {
+            } else if(powerChannelController == null) {
                 powerChannelController = new PowerChannelController(acquireChannel());
                 speedChannelController = new SpeedChannelController(acquireChannel());
             }
@@ -250,8 +260,12 @@ public class ChannelService extends Service {
     private void doBindAntRadioService() {
         if (BuildConfig.DEBUG) Log.v(TAG, "doBindAntRadioService");
 
-        // Start listing for channel available intents
-        registerReceiver(mChannelProviderStateChangedReceiver, new IntentFilter(AntChannelProvider.ACTION_CHANNEL_PROVIDER_STATE_CHANGED));
+        ContextCompat.registerReceiver(
+            this,
+            mChannelProviderStateChangedReceiver,
+            new IntentFilter(AntChannelProvider.ACTION_CHANNEL_PROVIDER_STATE_CHANGED),
+            ContextCompat.RECEIVER_EXPORTED
+        );
 
         // Creating the intent and calling context.bindService() is handled by
         // the static bindService() method in AntService

src/android/src/ForegroundService.java

@@ -9,9 +9,14 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
 import androidx.core.app.NotificationCompat;
+import android.content.pm.ServiceInfo;
+import android.util.Log;
 
 public class ForegroundService extends Service {
 	 public static final String CHANNEL_ID = "ForegroundServiceChannel";
+         private static final String EXTRA_FOREGROUND_SERVICE_TYPE = "FOREGROUND_SERVICE_TYPE";
+         private static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 0x10;
+
 	 @Override
 	 public void onCreate() {
 		  super.onCreate();
@@ -29,7 +34,18 @@ public class ForegroundService extends Service {
 					 .setSmallIcon(R.drawable.icon)
 					 .setContentIntent(pendingIntent)
 					 .build();
-					startForeground(1, notification);
+
+                                        try {
+                                             int serviceType = intent.getIntExtra(EXTRA_FOREGROUND_SERVICE_TYPE, FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE);
+                                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                                                startForeground(1, notification, serviceType);
+                                             } else {
+                                                startForeground(1, notification);
+                                             }
+                                         } catch (Exception e) {
+                                             Log.e("ForegroundService", "Failed to start foreground service", e);
+                                             return START_NOT_STICKY;
+                                         }
 		  //do heavy work on a background thread
 		  //stopSelf();
 		  return START_NOT_STICKY;

src/android/src/Garmin.java

@@ -28,6 +28,7 @@ import android.content.BroadcastReceiver;
 import android.content.ContextWrapper;
 import android.content.IntentFilter;
 import android.widget.Toast;
+import androidx.core.content.ContextCompat;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -48,12 +49,24 @@ public class Garmin {
 
     private static Integer HR = 0;
     private static Integer FootCad = 0;
+    private static Double Speed = 0.0;
+    private static Integer Power = 0;
 
     public static int getHR() {
         Log.d(TAG, "getHR " + HR);
         return HR;
     }
 
+    public static int getPower() {
+        Log.d(TAG, "getPower " + Power);
+        return Power;
+    }
+
+    public static double getSpeed() {
+        Log.d(TAG, "getSpeed " + Speed);
+        return Speed;
+    }
+
     public static int getFootCad() {
         Log.d(TAG, "getFootCad " + FootCad);
         return FootCad;
@@ -152,7 +165,12 @@ public class Garmin {
                 synchronized (receiverToWrapper) {
                     receiverToWrapper.put(receiver, wrappedRecv);
                 }
-                return super.registerReceiver(wrappedRecv, filter);
+                return ContextCompat.registerReceiver(
+                    super.getBaseContext(),
+                    wrappedRecv,
+                    filter,
+                    ContextCompat.RECEIVER_EXPORTED
+                );
             }
 
             @Override
@@ -221,13 +239,21 @@ public class Garmin {
                         if (status == ConnectIQ.IQMessageStatus.SUCCESS) {
                             //MessageHandler.getInstance().handleMessageFromWatchUsingCIQ(message, status, context);
                             Log.d(TAG, "onMessageReceived, status: " + status.toString() + message.get(0));
-                            String var[] = message.toArray()[0].toString().split(",");
-                            HR = Integer.parseInt(var[0].replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\{", "").replaceAll("\\}", "").replaceAll(" ", "").split("=")[1]);
-                            if(var.length > 1) {
-                                FootCad = Integer.parseInt(var[1].replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\{", "").replaceAll("\\}", "").replaceAll(" ", "").split("=")[1]);
+                            try {
+                                String var[] = message.toArray()[0].toString().split(",");
+                                HR = Integer.parseInt(var[0].replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\{", "").replaceAll("\\}", "").replaceAll(" ", "").split("=")[1]);
+                                if(var.length > 1) {
+                                    FootCad = Integer.parseInt(var[1].replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\{", "").replaceAll("\\}", "").replaceAll(" ", "").split("=")[1]);
+                                    if(var.length > 2) {
+                                        Power = Integer.parseInt(var[1].replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\{", "").replaceAll("\\}", "").replaceAll(" ", "").split("=")[1]);
+                                        Speed = Double.parseDouble(var[1].replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\{", "").replaceAll("\\}", "").replaceAll(" ", "").split("=")[1]);
+                                    }
+                                }
+                                Log.d(TAG, "HR " + HR);
+                                Log.d(TAG, "FootCad " + FootCad);
+                            } catch (Exception e) {
+                                Log.e(TAG, "Processing error", e);
                             }
-                            Log.d(TAG, "HR " + HR);
-                            Log.d(TAG, "FootCad " + FootCad);
                         } else {
                             Log.d(TAG, "onMessageReceived error, status: " + status.toString());
                         }

src/android/src/HidBridge.java

@@ -18,6 +18,7 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.util.Log;
 import android.os.Build;
+import androidx.core.content.ContextCompat;
  
 /**
  * This class is used for talking to hid of the dongle, connecting, disconnencting and enumerating the devices.
@@ -88,7 +89,12 @@ public class HidBridge {
                 int flags = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0;
                 PendingIntent mPermissionIntent = PendingIntent.getBroadcast(_context, 0, new Intent(ACTION_USB_PERMISSION), flags);
 		IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
-		_context.registerReceiver(mUsbReceiver, filter);
+				ContextCompat.registerReceiver(
+                    _context,
+                    mUsbReceiver,
+                    filter,
+                    ContextCompat.RECEIVER_EXPORTED
+                );
  
 		_usbManager.requestPermission(_usbDevice, mPermissionIntent);
 		Log("Found the device");

src/android/src/LocationHelper.java

@@ -0,0 +1,65 @@
+package org.cagnulen.qdomyoszwift;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.content.Intent;
+import android.location.LocationManager;
+import android.provider.Settings;
+import android.util.Log;
+
+public class LocationHelper {
+    private static final String TAG = "LocationHelper";
+    private static boolean isLocationEnabled = false;
+    private static boolean isBluetoothEnabled = false;
+
+    public static boolean start(Context context) {
+        Log.d(TAG, "Starting LocationHelper check...");
+
+        isLocationEnabled = isLocationEnabled(context);
+        isBluetoothEnabled = isBluetoothEnabled();
+
+        return isLocationEnabled && isBluetoothEnabled;
+    }
+
+    public static void requestPermissions(Context context) {
+        if (!isLocationEnabled || !isBluetoothEnabled) {
+            Log.d(TAG, "Some services are disabled. Prompting user...");
+            if (!isLocationEnabled) {
+                promptEnableLocation(context);
+            }
+            if (!isBluetoothEnabled) {
+                promptEnableBluetooth(context);
+            }
+        } else {
+            Log.d(TAG, "All services are already enabled.");
+        }
+    }
+
+    public static boolean check(Context context) {
+        return isLocationEnabled(context) && isBluetoothEnabled();
+    }
+
+    private static boolean isLocationEnabled(Context context) {
+        LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        return locationManager != null && locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+    }
+
+    private static boolean isBluetoothEnabled() {
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        return bluetoothAdapter != null && bluetoothAdapter.isEnabled();
+    }
+
+    private static void promptEnableLocation(Context context) {
+        Log.d(TAG, "Prompting to enable Location...");
+        Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    private static void promptEnableBluetooth(Context context) {
+        Log.d(TAG, "Prompting to enable Bluetooth...");
+        Intent intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+}

src/android/src/MediaButtonReceiver.java

@@ -0,0 +1,45 @@
+package org.cagnulen.qdomyoszwift;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioManager;
+import android.util.Log;
+
+public class MediaButtonReceiver extends BroadcastReceiver {
+    private static MediaButtonReceiver instance;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.d("MediaButtonReceiver", "Received intent: " + intent.toString());
+        String intentAction = intent.getAction();
+        if ("android.media.VOLUME_CHANGED_ACTION".equals(intentAction)) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+            int currentVolume = intent.getIntExtra("android.media.EXTRA_VOLUME_STREAM_VALUE", -1);
+            int previousVolume = intent.getIntExtra("android.media.EXTRA_PREV_VOLUME_STREAM_VALUE", -1);
+
+            Log.d("MediaButtonReceiver", "Volume changed. Current: " + currentVolume + ", Max: " + maxVolume);
+            nativeOnMediaButtonEvent(previousVolume, currentVolume, maxVolume);
+        }
+    }
+
+    private native void nativeOnMediaButtonEvent(int prev, int current, int max);
+
+    public static void registerReceiver(Context context) {
+        if (instance == null) {
+            instance = new MediaButtonReceiver();
+        }
+        IntentFilter filter = new IntentFilter("android.media.VOLUME_CHANGED_ACTION");
+        context.registerReceiver(instance, filter, Context.RECEIVER_EXPORTED);
+        Log.d("MediaButtonReceiver", "registerReceiver");
+    }
+
+    public static void unregisterReceiver(Context context) {
+        if (instance != null) {
+            context.unregisterReceiver(instance);
+            instance = null;
+        }
+    }
+}