implemented protobuf

https://github.com/cagnulein/qdomyos-zwift/discussions/2671#discussioncomment-11190939

.github/workflows/main.yml

@@ -1,3 +1,4 @@
+
 # This is a basic workflow to help you get started with Actions
 
 name: CI
@@ -123,7 +124,7 @@ jobs:
             cd ../..
 
       - name: Secrets
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/master'
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
@@ -195,21 +196,21 @@ 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
         if:  ${{ ! matrix.config.python }}
 
       # - name: Exit if not on master branch
-      #   if: github.ref == 'refs/heads/main'
+      #   if: github.ref == 'refs/heads/master'
       #   run: exit 1
 
       # - uses: actions/checkout@v3
@@ -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,13 +631,13 @@ 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/
 
       # - name: Exit if not on master branch
-      #   if: github.ref == 'refs/heads/main'
+      #   if: github.ref == 'refs/heads/master'
       #   run: exit 1
 
       # - name: upload windows artifact
@@ -814,7 +815,7 @@ jobs:
             cd ../..          
 
       - name: Secrets
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/master'
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
@@ -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:
@@ -963,7 +988,7 @@ jobs:
             cd ../..          
 
       - name: Secrets
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/master'
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
@@ -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
+
+
+  

.gitmodules

@@ -16,3 +16,7 @@
 [submodule "src/qthttpserver"]
 	path = src/qthttpserver
 	url = https://github.com/qt-labs/qthttpserver
+[submodule "zwiftplay"]
+	path = zwiftplay
+	url = https://github.com/cagnulein/zwiftplay.git
+	branch = lib

QZ_ESP32/ftms_rower.ino/ftms_rower.ino.ino

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

README.md

@@ -69,6 +69,7 @@ Zwift bridge for Treadmills and Bike!
 |Echelon app Compatibility|X|||||
 |Wahoo Dircon Compatibility|X|X|X|X|in order to send data to Zwift or RGT with Wifi only!|
 |One device only support for Zwift and Wahoo RGT|X|X|X|X|using Wahoo Dircon https://www.youtube.com/watch?v=gYYUXNWFAok|
+|BitGym Compatibility|X|X|X|X||
 
 # Training Program
 |Feature|Bike|Treadmill|Elliptical|Rower|Notes|
@@ -99,30 +100,29 @@ Zwift bridge for Treadmills and Bike!
 
 ### Installation 
 
-You can install it on multiple platforms.
-Read the [installation procedure](docs/10_Installation.md)
+  You can install it on multiple platforms.
+  Read the [installation procedure](docs/10_Installation.md)
 
 
 ### Tested on
 
-You can run the app on [Macintosh or Linux devices](docs/10_Installation.md). IOS and Android are also supported.
-
-QDomyos-Zwift works on every [FTMS-compatible application](docs/20_supported_devices_and_applications.md), and virtually any [bluetooth enabled device](docs/20_supported_devices_and_applications.md).
+  The QDomyos-Zwift application can run on [Macintosh or Linux devices](docs/10_Installation.md) iOS, and Android. 
+  It supports any [FTMS-compatible application](docs/20_supported_devices_and_applications.md) software and most [bluetooth enabled device](docs/20_supported_devices_and_applications.md).
 
 ### No GUI version
 
 run as
 
-$ sudo ./qdomyos-zwift -no-gui
+  $ sudo ./qdomyos-zwift -no-gui
 
 ### Reference
 
-https://github.com/ProH4Ck/treadmill-bridge
+  => GitHub Repository: [QDomyos-Zwift on GitHub](https://github.com/ProH4Ck/treadmill-bridge)
 
-https://www.livestrong.com/article/422012-what-is-10-degrees-in-incline-on-a-treadmill/
+  => Treadmill Incline Reference: [What Is 10 Degrees in Incline on a Treadmill?](https://www.livestrong.com/article/422012-what-is-10-degrees-in-incline-on-a-treadmill/)
 
-Icons used in this documentation come from [flaticon.com](https://www.flaticon.com)
+  => Icon Attribution: Icons used in this documentation are from [Flaticon.com](https://www.flaticon.com)
 
 ### Blog
 
-https://robertoviola.cloud
+  => Related Blog: [Roberto Viola's Blog](https://robertoviola.cloud)

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift.xcodeproj/qt_makeqmake.mak

@@ -53,12 +53,17 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_accessibility_support_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bluetooth.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bluetooth_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bodymovin_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_charts.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_charts_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_clipboard_support_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_concurrent.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_concurrent_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_core.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_core_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_datavisualization.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_datavisualization_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_edid_support_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \
@@ -71,6 +76,9 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_gui_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_help.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_help_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_httpserver.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_httpserver_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_httpserver.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_location.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_location_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_macextras.pri \
@@ -95,6 +103,8 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_positioning_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_positioningquick.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_positioningquick_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_purchasing.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_purchasing_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qml.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qml_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qmldebug_private.pri \
@@ -107,6 +117,16 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qmlworkerscript_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3d.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3d_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dassetimport.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dassetimport_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3drender.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3drender_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3druntimerender.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3druntimerender_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dutils.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dutils_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quickcontrols2.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quickcontrols2_private.pri \
@@ -120,12 +140,21 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_remoteobjects_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_repparser.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_repparser_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_script.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_script_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scripttools.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scripttools_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scxml.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scxml_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sensors.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sensors_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_serialbus.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_serialbus_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sql.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sql_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_sslserver.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_sslserver_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sslserver.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_svg.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_svg_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_testlib.pri \
@@ -136,6 +165,8 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_uiplugin.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_uitools.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_uitools_private.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_virtualkeyboard.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_virtualkeyboard_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_webchannel.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_webchannel_private.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_websockets.pri \
@@ -194,15 +225,26 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtiff.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtpassthrucanbus.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtpeakcanbus.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtposition_cl.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensors_generic.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensors_ios.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qttinycanbus.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtuiotouchplugin.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualcanbus.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_hangul.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_openwnn.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_pinyin.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_tcime.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_thai.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboardplugin.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtwebview_darwin.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qwbmp.pri \
+		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qwebgl.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qwebp.pri \
 		../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_scene2d.pri \
 		../../Qt/5.15.2/ios/mkspecs/features/qt_functions.prf \
@@ -219,6 +261,9 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/features/default_pre.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/mac/default_pre.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/uikit/default_pre.prf \
+		../defaults.pri \
+		../src/purchasing/purchasing.pri \
+		../src/qdomyos-zwift.pri \
 		../../Qt/5.15.2/ios/mkspecs/features/resolve_config.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/uikit/resolve_config.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/default_post.prf \
@@ -226,6 +271,9 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/mkspecs/features/uikit/default_post.prf \
 		../../Qt/5.15.2/ios/mkspecs/macx-ios-clang/features/default_post.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/mac/objective_c.prf \
+		../../Qt/5.15.2/ios/mkspecs/features/qmltypes.prf \
+		../../Qt/5.15.2/ios/mkspecs/features/metatypes.prf \
+		../../Qt/5.15.2/ios/mkspecs/features/ltcg.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/qml_debug.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/mac/mac.prf \
 		../../Qt/5.15.2/ios/mkspecs/features/uikit/bitcode.prf \
@@ -264,6 +312,18 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/lib/libqtharfbuzz_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Core_debug.prl \
 		../../Qt/5.15.2/ios/lib/libqtpcre2_debug.prl \
+		../../Qt/5.15.2/ios/plugins/mediaservice/libqavfmediaplayer_debug.prl \
+		../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_esri_debug.prl \
+		../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_itemsoverlay_debug.prl \
+		../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_mapbox_debug.prl \
+		../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_mapboxgl_debug.prl \
+		../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_nokia_debug.prl \
+		../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_osm_debug.prl \
+		../../Qt/5.15.2/ios/plugins/webview/libqtwebview_darwin_debug.prl \
+		../../Qt/5.15.2/ios/plugins/mediaservice/libqavfcamera_debug.prl \
+		../../Qt/5.15.2/ios/plugins/mediaservice/libqtmedia_audioengine_debug.prl \
+		../../Qt/5.15.2/ios/plugins/audio/libqtaudio_coreaudio_debug.prl \
+		../../Qt/5.15.2/ios/plugins/playlistformats/libqtmultimedia_m3u_debug.prl \
 		../../Qt/5.15.2/ios/plugins/imageformats/libqgif_debug.prl \
 		../../Qt/5.15.2/ios/plugins/imageformats/libqicns_debug.prl \
 		../../Qt/5.15.2/ios/plugins/imageformats/libqico_debug.prl \
@@ -288,32 +348,51 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 		../../Qt/5.15.2/ios/plugins/qmltooling/libqmldbg_server_debug.prl \
 		../../Qt/5.15.2/ios/plugins/qmltooling/libqmldbg_tcp_debug.prl \
 		../../Qt/5.15.2/ios/plugins/bearer/libqgenericbearer_debug.prl \
+		../../Qt/5.15.2/ios/plugins/texttospeech/libqtexttospeech_speechios_debug.prl \
+		../../Qt/5.15.2/ios/plugins/sqldrivers/libqsqlite_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5HttpServer_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5SslServer_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5Charts_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Widgets_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5Location_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5PositioningQuick_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5QuickControls2_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Quick_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5Multimedia_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5WebView_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Bluetooth_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Xml_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Positioning_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5QmlModels_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Qml_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5NetworkAuth_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5WebSockets_debug.prl \
 		../../Qt/5.15.2/ios/lib/libQt5Network_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5TextToSpeech_debug.prl \
+		../../Qt/5.15.2/ios/lib/libQt5Concurrent_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick.2/libqtquick2plugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtQuick/Layouts/libqquicklayoutsplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/libqtquickcontrols2plugin_debug.prl \
-		../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin_debug.prl \
-		../../Qt/5.15.2/ios/qml/QtGraphicalEffects/libqtgraphicaleffectsplugin_debug.prl \
-		../../Qt/5.15.2/ios/qml/QtQuick/Window.2/libwindowplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/Qt/labs/settings/libqmlsettingsplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQml/libqmlplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/Templates.2/libqtquicktemplates2plugin_debug.prl \
-		../../Qt/5.15.2/ios/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQml/Models.2/libmodelsplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQml/WorkerScript.2/libworkerscriptplugin_debug.prl \
-		../../Qt/5.15.2/ios/qml/QtQuick/Dialogs/libdialogplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtQuick/Window.2/libwindowplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtWebView/libdeclarative_webview_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtCharts/libqtchartsqml2_debug.prl \
 		../../Qt/5.15.2/ios/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin_debug.prl \
-		../../Qt/5.15.2/ios/qml/Qt/labs/settings/libqmlsettingsplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtQuick/Dialogs/libdialogplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtPositioning/libdeclarative_positioning_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtLocation/libdeclarative_location_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/Controls/libqtquickcontrolsplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/PrivateWidgets/libwidgetsplugin_debug.prl \
-		../../Qt/5.15.2/ios/qml/QtQuick/Layouts/libqquicklayoutsplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtGraphicalEffects/libqtgraphicaleffectsplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/Qt/labs/platform/libqtlabsplatformplugin_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtMultimedia/libdeclarative_multimedia_debug.prl \
+		../../Qt/5.15.2/ios/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin_debug.prl \
 		../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin_debug.prl
@@ -361,12 +440,17 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_accessibility_support_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bluetooth.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bluetooth_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bodymovin_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_bootstrap_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_charts.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_charts_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_clipboard_support_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_concurrent.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_concurrent_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_core.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_core_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_datavisualization.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_datavisualization_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_devicediscovery_support_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_edid_support_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri:
@@ -379,6 +463,9 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_gui_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_help.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_help_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_httpserver.pri:
+../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_httpserver_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_httpserver.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_location.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_location_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_macextras.pri:
@@ -403,6 +490,8 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_positioning_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_positioningquick.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_positioningquick_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_purchasing.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_purchasing_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qml.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qml_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qmldebug_private.pri:
@@ -415,6 +504,16 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qmlworkerscript_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3d.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3d_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dassetimport.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dassetimport_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3drender.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3drender_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3druntimerender.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3druntimerender_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dutils.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick3dutils_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quick_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quickcontrols2.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_quickcontrols2_private.pri:
@@ -428,12 +527,21 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_remoteobjects_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_repparser.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_repparser_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_script.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_script_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scripttools.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scripttools_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scxml.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_scxml_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sensors.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sensors_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_serialbus.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_serialbus_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sql.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sql_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_sslserver.pri:
+../../Qt/5.15.2/ios/mkspecs/modules-inst/qt_lib_sslserver_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_sslserver.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_svg.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_svg_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_testlib.pri:
@@ -444,6 +552,8 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_uiplugin.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_uitools.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_uitools_private.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_virtualkeyboard.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_virtualkeyboard_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_webchannel.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_webchannel_private.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_lib_websockets.pri:
@@ -502,15 +612,26 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtiff.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtpassthrucanbus.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtpeakcanbus.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtposition_cl.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensors_generic.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtsensors_ios.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qttinycanbus.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtuiotouchplugin.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualcanbus.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_hangul.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_openwnn.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_pinyin.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_tcime.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboard_thai.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtvirtualkeyboardplugin.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qtwebview_darwin.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qwbmp.pri:
+../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qwebgl.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_qwebp.pri:
 ../../Qt/5.15.2/ios/mkspecs/modules/qt_plugin_scene2d.pri:
 ../../Qt/5.15.2/ios/mkspecs/features/qt_functions.prf:
@@ -527,6 +648,9 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/features/default_pre.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/mac/default_pre.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/uikit/default_pre.prf:
+../defaults.pri:
+../src/purchasing/purchasing.pri:
+../src/qdomyos-zwift.pri:
 ../../Qt/5.15.2/ios/mkspecs/features/resolve_config.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/uikit/resolve_config.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/default_post.prf:
@@ -534,6 +658,9 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/mkspecs/features/uikit/default_post.prf:
 ../../Qt/5.15.2/ios/mkspecs/macx-ios-clang/features/default_post.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/mac/objective_c.prf:
+../../Qt/5.15.2/ios/mkspecs/features/qmltypes.prf:
+../../Qt/5.15.2/ios/mkspecs/features/metatypes.prf:
+../../Qt/5.15.2/ios/mkspecs/features/ltcg.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/qml_debug.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/mac/mac.prf:
 ../../Qt/5.15.2/ios/mkspecs/features/uikit/bitcode.prf:
@@ -572,6 +699,18 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/lib/libqtharfbuzz_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Core_debug.prl:
 ../../Qt/5.15.2/ios/lib/libqtpcre2_debug.prl:
+../../Qt/5.15.2/ios/plugins/mediaservice/libqavfmediaplayer_debug.prl:
+../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_esri_debug.prl:
+../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_itemsoverlay_debug.prl:
+../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_mapbox_debug.prl:
+../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_mapboxgl_debug.prl:
+../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_nokia_debug.prl:
+../../Qt/5.15.2/ios/plugins/geoservices/libqtgeoservices_osm_debug.prl:
+../../Qt/5.15.2/ios/plugins/webview/libqtwebview_darwin_debug.prl:
+../../Qt/5.15.2/ios/plugins/mediaservice/libqavfcamera_debug.prl:
+../../Qt/5.15.2/ios/plugins/mediaservice/libqtmedia_audioengine_debug.prl:
+../../Qt/5.15.2/ios/plugins/audio/libqtaudio_coreaudio_debug.prl:
+../../Qt/5.15.2/ios/plugins/playlistformats/libqtmultimedia_m3u_debug.prl:
 ../../Qt/5.15.2/ios/plugins/imageformats/libqgif_debug.prl:
 ../../Qt/5.15.2/ios/plugins/imageformats/libqicns_debug.prl:
 ../../Qt/5.15.2/ios/plugins/imageformats/libqico_debug.prl:
@@ -596,32 +735,51 @@ qdomyoszwift.xcodeproj/project.pbxproj: ../src/qdomyos-zwift.pro ../../Qt/5.15.2
 ../../Qt/5.15.2/ios/plugins/qmltooling/libqmldbg_server_debug.prl:
 ../../Qt/5.15.2/ios/plugins/qmltooling/libqmldbg_tcp_debug.prl:
 ../../Qt/5.15.2/ios/plugins/bearer/libqgenericbearer_debug.prl:
+../../Qt/5.15.2/ios/plugins/texttospeech/libqtexttospeech_speechios_debug.prl:
+../../Qt/5.15.2/ios/plugins/sqldrivers/libqsqlite_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5HttpServer_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5SslServer_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5Charts_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Widgets_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5Location_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5PositioningQuick_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5QuickControls2_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Quick_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5Multimedia_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5WebView_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Bluetooth_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Xml_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Positioning_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5QmlModels_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Qml_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5NetworkAuth_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5WebSockets_debug.prl:
 ../../Qt/5.15.2/ios/lib/libQt5Network_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5TextToSpeech_debug.prl:
+../../Qt/5.15.2/ios/lib/libQt5Concurrent_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick.2/libqtquick2plugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtQuick/Layouts/libqquicklayoutsplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/libqtquickcontrols2plugin_debug.prl:
-../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin_debug.prl:
-../../Qt/5.15.2/ios/qml/QtGraphicalEffects/libqtgraphicaleffectsplugin_debug.prl:
-../../Qt/5.15.2/ios/qml/QtQuick/Window.2/libwindowplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/Qt/labs/settings/libqmlsettingsplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQml/libqmlplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/Templates.2/libqtquicktemplates2plugin_debug.prl:
-../../Qt/5.15.2/ios/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQml/Models.2/libmodelsplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQml/WorkerScript.2/libworkerscriptplugin_debug.prl:
-../../Qt/5.15.2/ios/qml/QtQuick/Dialogs/libdialogplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtQuick/Window.2/libwindowplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtWebView/libdeclarative_webview_debug.prl:
+../../Qt/5.15.2/ios/qml/QtCharts/libqtchartsqml2_debug.prl:
 ../../Qt/5.15.2/ios/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin_debug.prl:
-../../Qt/5.15.2/ios/qml/Qt/labs/settings/libqmlsettingsplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtQuick/Dialogs/libdialogplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtPositioning/libdeclarative_positioning_debug.prl:
+../../Qt/5.15.2/ios/qml/QtLocation/libdeclarative_location_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/Controls/libqtquickcontrolsplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/PrivateWidgets/libwidgetsplugin_debug.prl:
-../../Qt/5.15.2/ios/qml/QtQuick/Layouts/libqquicklayoutsplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtGraphicalEffects/libqtgraphicaleffectsplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/Qt/labs/platform/libqtlabsplatformplugin_debug.prl:
+../../Qt/5.15.2/ios/qml/QtMultimedia/libdeclarative_multimedia_debug.prl:
+../../Qt/5.15.2/ios/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin_debug.prl:
 ../../Qt/5.15.2/ios/qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin_debug.prl:

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/PrivacyInfo.xcprivacy

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>NSPrivacyAccessedAPITypes</key>
+ <array>
+  <dict>
+   <key>NSPrivacyAccessedAPIType</key>
+   <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+   <key>NSPrivacyAccessedAPITypeReasons</key>
+   <array>
+    <string>CA92.1</string>
+   </array>
+  </dict>
+ </array>
+</dict>
+</plist>

docs/50_writing_tests.md

@@ -0,0 +1,396 @@
+# QDomyos-Zwift Guide to Writing Unit Tests
+
+## About
+
+The testing project tst/qdomyos-zwift-tests.pro contains test code that uses the Google Test library.
+
+## Adding a new device
+
+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 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
+* 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, 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: 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
+
+### TestSettings
+
+The detection of many devices depends on settings that are accessed programmatically using the QSettings class and the constants in the QZSettings namespace. The TestSettings class stores a QSettings object with what is intended to be a unique application and organisation name, to keep the configuration it represents seperate from others in the system. It also makes the stored QSettings object the default by setting the QCoreApplication's organisation and application names to those of the QSettings object. The original values are restored by calling the deactivate() function or on object destruction.
+
+i.e. a test will 
+* apply a configuration from a TestSettings object
+* perform device detection
+* use the TestSettings object to restore the previous settings either directly or by letting its destructor be called.
+
+### DeviceDiscoveryInfo
+
+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 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
+
+Consider the detection code for the Domyos Bike:
+
+```
+ } else if (b.name().startsWith(QStringLiteral("Domyos-Bike")) &&
+                       !b.name().startsWith(QStringLiteral("DomyosBridge")) && !domyosBike && filter) {
+
+```
+
+Reading this, to identify this device:
+- bluetooth name should start with "Domyos-Bike" using a case sensitive comparison
+- bluetooth name should NOT start with "DomyosBridge", also using a case sensitive comparison
+- there should not have been a device using the corresponding device class detected already (i.e. domyos)
+- filter has not been activated (this isn't tested)
+
+In this case, we are not testing the last two, but can test the first two.
+
+In deviceindex.h:
+
+```
+static const QString DomyosBike;
+```
+
+In deviceindex.cpp:
+
+```
+DEFINE_DEVICE(DomyosBike, "Domyos Bike");
+```
+
+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 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_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:
+```
+void InitializeTrackedSettings() {
+
+	...
+
+	trackedSettings.insert(QZSettings::computrainer_serialport, QZSettings::default_computrainer_serialport);
+
+	...
+}
+
+```
+
+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 ""
+
+DeviceTestDataIndex::Initialize():
+
+```
+// Computrainer Bike
+RegisterNewDeviceTestData(DeviceIndex::ComputrainerBike)
+	->expectDevice<computrainerbike>()
+	->acceptDeviceName("", DeviceNameComparison::StartsWithIgnoreCase)
+	->configureSettingsWith(QZSettings::computrainer_serialport, "COMX", "");
+```
+
+
+Similarly, the Pafers Bike has a simple configuration setting:
+
+```
+    // 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...
+
+```
+bool pafers_treadmill = settings.value(QZSettings::pafers_treadmill, QZSettings::default_pafers_treadmill).toBool();
+...
+
+bool pafers_treadmill_bh_iboxster_plus =
+        settings
+            .value(QZSettings::pafers_treadmill_bh_iboxster_plus, QZSettings::default_pafers_treadmill_bh_iboxster_plus)
+            .toBool();
+...
+
+} else if (b.name().toUpper().startsWith(QStringLiteral("PAFERS_")) && !pafersTreadmill &&
+                       (pafers_treadmill || pafers_treadmill_bh_iboxster_plus) && filter) {
+```
+
+Here the device could be activated due to a name match and various combinations of settings.
+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).
+
+```
+// 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);
+
+		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 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.
+
+```
+	// 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;
+                }
+
+                int key=0;
+                info.DeviceInfo()->setManufacturerData(key++, hex2bytes("02010639009F00000000000000000014008001"));
+            });
+
+```
+
+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:
+
+```
+((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 BluetoothDeviceTestData class can't cover all the detection criteria with one instance. 
+
+```
+// Stages Bike General
+auto stagesBikeExclusions = { GetTypeId<ftmsbike>() };
+
+//
+// ... other stages bike variants
+//
+
+// 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)))
+
+			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);
+			}
+		});
+
+```
+
+In this case, it populates the vector with the single enabling configuration if that's what's been requested, otherwise 3 disabling ones.
+
+### Exclusions
+
+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 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:
+
+```
+} else if (b.name().startsWith(QStringLiteral("ECH")) && !echelonRower && !echelonStride &&
+                       !echelonConnectSport && filter) {
+```
+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.
+
+```
+// Echelon Connect Sport Bike
+RegisterNewDeviceTestData(DeviceIndex::EchelonConnectSportBike)
+	->expectDevice<echelonconnectsport>()        
+	->acceptDeviceName("ECH", DeviceNameComparison::StartsWith)
+	->excluding<echelonrower>()
+	->excluding<echelonstride>();
+
+```
+
+### When a single test data object can't cover all the conditions
+
+Detection code:
+
+```
+QString powerSensorName =
+        settings.value(QZSettings::power_sensor_name, QZSettings::default_power_sensor_name).toString();
+...
+} else if ((b.name().toUpper().startsWith(QStringLiteral("STAGES ")) ||
+                        (b.name().toUpper().startsWith("TACX SATORI")) ||
+                        ((b.name().toUpper().startsWith("KICKR CORE")) && !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818))) ||
+                        (b.name().toUpper()==QStringLiteral("QD")) ||
+                        (b.name().toUpper().startsWith(QStringLiteral("ASSIOMA")) &&
+                         powerSensorName.startsWith(QStringLiteral("Disabled")))) &&
+                       !stagesBike && !ftmsBike && filter) {
+```
+
+This presents 3 scenarios for the current test framework. 
+1. Match names only (starts with:"STAGES ", starts with: "TACX SATORI", equals: "QD")
+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 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 Stages Bike test data, the exclusions, which apply to all situations, are implemented in an array of type ids:
+
+
+```
+// Stages Bike General
+auto stagesBikeExclusions = { GetTypeId<ftmsbike>() };
+```
+
+The name-match only in one test data instance:
+
+```
+// 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 instance:
+
+```
+// 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)))
+
+			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);
+			}
+		});
+
+```
+
+## Telling Google Test Where to Look
+
+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

qt-patches/windows/5.15.2/qlowenergycontroller_winrt_new.cpp

@@ -329,6 +329,7 @@ public slots:
                     descData.uuid = QBluetoothUuid(descriptorUuid);
                     charData.descriptorList.insert(descHandle, descData);
                     if (descData.uuid == QBluetoothUuid(QBluetoothUuid::ClientCharacteristicConfiguration)) {
+			mIndicateChars << charData.uuid;
                         ComPtr<IAsyncOperation<ClientCharConfigDescriptorResult *>> readOp;
                         hr = characteristic->ReadClientCharacteristicConfigurationDescriptorAsync(&readOp);
                         WARN_AND_CONTINUE_IF_FAILED(hr, "Could not read descriptor value")
@@ -356,7 +357,7 @@ public slots:
 
                         descData.value = QByteArray(2, Qt::Uninitialized);
                         qToLittleEndian(result, descData.value.data());
-                        mIndicateChars << charData.uuid;
+                        
                     } else {
                         ComPtr<IAsyncOperation<GattReadResult *>> readOp;
                         hr = descriptor->ReadValueWithCacheModeAsync(BluetoothCacheMode_Uncached,
@@ -612,6 +613,7 @@ HRESULT QLowEnergyControllerPrivateWinRTNew::onValueChange(IGattCharacteristic *
 {
     HRESULT hr;
     quint16 handle;
+    qCDebug(QT_BT_WINRT) << __FUNCTION__ << characteristic;
     hr = characteristic->get_AttributeHandle(&handle);
     RETURN_IF_FAILED("Could not obtain characteristic's handle", return S_OK)
     ComPtr<IBuffer> buffer;

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
@@ -33,6 +33,7 @@ HomeForm{
         property bool theme_tile_shadow_enabled: true
         property string theme_tile_shadow_color: "#9C27B0"
         property int theme_tile_secondline_textsize: 12
+        property bool skipLocationServicesDialog: false
     }
 
     MessageDialog {
@@ -86,6 +87,49 @@ HomeForm{
         onTriggered: {if(rootItem.stopRequested) {rootItem.stopRequested = false; inner_stop(); }}
     }
 
+    property bool locationServiceRequsted: false
+
+    MessageDialog {
+        id: locationServicesDialog
+        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()
+        }
+        onNoClicked: remindLocationServicesDialog.visible = true
+        visible: !rootItem.locationServices() && !locationServiceRequsted && !settings.skipLocationServicesDialog
+    }
+
+    MessageDialog {
+        id: remindLocationServicesDialog
+        text: "Reminder Preference"
+        informativeText: "Would you like to be reminded about enabling Location Services next time?"
+        buttons: (MessageDialog.Yes | MessageDialog.No)
+        onYesClicked: settings.skipLocationServicesDialog = false
+        onNoClicked: settings.skipLocationServicesDialog = true
+        visible: false
+    }
+
+    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 +145,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.29" android:versionCode="693" 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.4" android:versionCode="934" 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

@@ -6,26 +6,32 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
     }
 }
 
+plugins {
+  id "com.google.protobuf" version "0.9.4"
+}
+
 repositories {
     google()
     jcenter()
     maven { url 'https://jitpack.io' }
-	 maven { url 'https://dl.bintray.com/rvalerio/maven' }
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.protobuf'
 
 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'
+		
     if(amazon == "1") {
         // amazon app store
         implementation 'com.google.mlkit:text-recognition:16.0.0-beta6'
@@ -38,8 +44,8 @@ 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.support:appcompat-v7:28.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"
          implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
@@ -47,6 +53,30 @@ dependencies {
          implementation 'com.github.mik3y:usb-serial-for-android:v3.4.6'
 	 androidTestImplementation "com.android.support:support-annotations:28.0.0"
 	      implementation 'com.google.android.gms:play-services-wearable:+'
+
+    implementation 'com.jakewharton.timber:timber:5.0.1'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.60'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
+}
+
+import org.apache.tools.ant.taskdefs.condition.Os
+
+// Compatible with macOS on Apple Silicon
+def archSuffix = Os.isFamily(Os.FAMILY_MAC) ? ':osx-x86_64' : ''
+
+protobuf {
+    protoc {
+      artifact = "com.google.protobuf:protoc:3.25.1$archSuffix"
+    }
+    generateProtoTasks {
+      all().configureEach { task ->
+        task.builtins {
+          java {
+            option "lite"
+          }
+        }
+      }
+    }
 }
 
 android {
@@ -99,7 +129,7 @@ android {
         resConfig "en"
                   compileSdkVersion 33
 		  minSdkVersion = 21
-                  targetSdkVersion = 33
+                  targetSdkVersion = 34
     }
 
 tasks.all { task ->