Update PlayerStateWrapper.h

.github/workflows/main.yml

@@ -88,70 +88,10 @@ jobs:
 
       - uses: msys2/setup-msys2@v2
         with:
-          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-qt5-webview mingw-w64-x86_64-protobuf mingw-w64-x86_64-abseil-cpp mingw-w64-x86_64-zlib
+          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-qt5-webview
           msystem: mingw64
           release: false
 
-      - name: Print MSYS2 Installation Path
-        run: echo $MSYSTEM_PREFIX
-        shell: msys2 {0}         
-        
-      - name: List Protocol Buffers Lib Files
-        run: ls $MINGW_PREFIX/lib/
-        shell: msys2 {0}        
-
-      - name: List Protocol Buffers Lib Files
-        run: ls $MINGW_PREFIX/lib/libproto*.*
-        shell: msys2 {0}        
-
-      - name: List Protocol Buffers Bin Files
-        run: ls $MINGW_PREFIX/bin/
-        shell: msys2 {0}                      
-
-      - name: Copy Protobuf Headers to a Repo Subfolder
-        run: cp -rv "$MINGW_PREFIX/include/google" "${GITHUB_WORKSPACE}/src/google/"
-        shell: msys2 {0}          
-
-      - name: Copy Abseil Headers to a Repo Subfolder
-        run: cp -rv "$MINGW_PREFIX/include/absl" "${GITHUB_WORKSPACE}/src/absl/"
-        shell: msys2 {0}          
-
-      - name: Compile Zwift Protopuf
-        run: protoc  --proto_path="${GITHUB_WORKSPACE}/src/zwift-api/" --cpp_out="${GITHUB_WORKSPACE}/src/zwift-api/" zwift_messages.proto 
-        shell: msys2 {0}          
-
-      - name: Copy Protobuf Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libproto* "${GITHUB_WORKSPACE}/src/"
-        shell: msys2 {0}        
-
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libabsl_log_internal_message.dll.a "${GITHUB_WORKSPACE}/src/"
-        shell: msys2 {0}
-
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libabsl_log_internal_check_op.dll.a "${GITHUB_WORKSPACE}/src/"
-        shell: msys2 {0}
-
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libabsl_base.dll.a "${GITHUB_WORKSPACE}/src/"
-        shell: msys2 {0}        
-
-      - name: Copy Protobuf Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libproto* "${GITHUB_WORKSPACE}/"
-        shell: msys2 {0}        
-
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libabsl_base.dll.a "${GITHUB_WORKSPACE}/"
-        shell: msys2 {0}                        
-
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libabsl_log_internal_message.dll.a "${GITHUB_WORKSPACE}/"
-        shell: msys2 {0}
-
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/lib/libabsl_log_internal_check_op.dll.a "${GITHUB_WORKSPACE}/"
-        shell: msys2 {0}        
-
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v1.9
         with:
@@ -183,7 +123,7 @@ jobs:
             cd ../..
 
       - name: Secrets
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
@@ -194,7 +134,7 @@ jobs:
           cd ..  
 
       - name: Build
-        run: |            
+        run: |
             qmake
             make -j8
             cd src/debug
@@ -206,7 +146,6 @@ jobs:
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
             cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
             cp "C:/mingw64/bin/libstdc++-6.dll" .
-            cp "C:/mingw64/bin/zlib1.dll" .               
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../windows/*.py .
@@ -223,7 +162,6 @@ jobs:
             
       - name: Build without python
         run: |
-            ls src/google/
             qmake
             make -j8
             cd src/debug
@@ -235,7 +173,6 @@ jobs:
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
             cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
             cp "C:/mingw64/bin/libstdc++-6.dll" .
-            cp "C:/mingw64/bin/zlib1.dll" .            
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../../windows_openssl/*.* .
@@ -246,14 +183,6 @@ jobs:
             #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz          
         if: matrix.config.python == false
 
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/bin/libabsl_*.* "${GITHUB_WORKSPACE}/src/debug/output/"
-        shell: msys2 {0}
-
-      - name: Copy Abseil Binaries to a Repo Subfolder
-        run: cp -v $MINGW_PREFIX/bin/libproto*.* "${GITHUB_WORKSPACE}/src/debug/output/"
-        shell: msys2 {0}
-
       - name: patching qt for bluetooth
         run: cp qt-patches/windows/5.15.2/binary/mingw64/*.* ${{ github.workspace }}/src/debug/output/
 
@@ -280,7 +209,7 @@ jobs:
         if:  ${{ ! matrix.config.python }}
 
       # - name: Exit if not on master branch
-      #   if: github.ref == 'refs/heads/master'
+      #   if: github.ref == 'refs/heads/main'
       #   run: exit 1
 
       # - uses: actions/checkout@v3
@@ -408,7 +337,7 @@ jobs:
   # This workflow contains a single job called "build"
   linux-x86-build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -477,7 +406,7 @@ jobs:
           path: "src/qthttpserver"
 
       - name: Install packages required to run QZ inside workflow
-        run: sudo apt update -y && sudo apt-get install -y qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 libqt5networkauth5-dev libqt5websockets5* libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev cmake protobuf-compiler libprotobuf-dev libabsl-dev
+        run: sudo apt update -y && sudo apt-get install -y qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 libqt5networkauth5-dev libqt5websockets5* libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
@@ -492,10 +421,6 @@ jobs:
         run: |
             cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
 
-      - name: compile zwift protobuf
-        run: |
-            protoc --proto_path=src/zwift-api/ --cpp_out=src/zwift-api/ zwift_messages.proto
-
       - name: Build qthttpserver
         run: |
             cd src/qthttpserver 
@@ -582,7 +507,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-20.04
+    runs-on: ubuntu-latest
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -711,7 +636,7 @@ jobs:
           path: ${{ github.workspace }}/output/android/build/outputs/apk/debug/
 
       # - name: Exit if not on master branch
-      #   if: github.ref == 'refs/heads/master'
+      #   if: github.ref == 'refs/heads/main'
       #   run: exit 1
 
       # - name: upload windows artifact
@@ -726,7 +651,7 @@ jobs:
 
   ios-build:
     # The type of runner that the job will run on
-    runs-on: macos-12
+    runs-on: macos-latest
     permissions:
       contents: write
 
@@ -889,7 +814,7 @@ jobs:
             cd ../..          
 
       - name: Secrets
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
@@ -899,24 +824,8 @@ 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
@@ -930,7 +839,6 @@ 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
@@ -941,10 +849,7 @@ jobs:
         if: matrix.config.python
             
       - name: Build without python
-        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
+        run: |
             qmake           
             nmake
             cd src/debug
@@ -955,11 +860,10 @@ 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 ..
@@ -1026,9 +930,6 @@ 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:
@@ -1062,7 +963,7 @@ jobs:
             cd ../..          
 
       - name: Secrets
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
@@ -1072,24 +973,8 @@ 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 ..
@@ -1108,7 +993,6 @@ 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 ..
@@ -1129,7 +1013,7 @@ jobs:
 
   upload_to_release:
     permissions: write-all
-    runs-on: ubuntu-20.04 
+    runs-on: ubuntu-latest
     if: github.event_name == 'schedule'
     needs: [linux-x86-build, window-msvc2019-build, ios-build, window-build, android-build]  # Specify the job dependencies
     steps:

.gitmodules

@@ -16,7 +16,3 @@
 [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

@@ -1,53 +0,0 @@
-#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,7 +69,6 @@ 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|

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

@@ -53,17 +53,12 @@ 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 \
@@ -76,9 +71,6 @@ 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 \
@@ -103,8 +95,6 @@ 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 \
@@ -117,16 +107,6 @@ 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 \
@@ -140,21 +120,12 @@ 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 \
@@ -165,8 +136,6 @@ 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 \
@@ -225,26 +194,15 @@ 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 \
@@ -261,9 +219,6 @@ 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 \
@@ -271,9 +226,6 @@ 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 \
@@ -312,18 +264,6 @@ 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 \
@@ -348,51 +288,32 @@ 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/Qt/labs/settings/libqmlsettingsplugin_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/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/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/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/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/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/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/Layouts/libqquicklayoutsplugin_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
@@ -440,17 +361,12 @@ 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:
@@ -463,9 +379,6 @@ 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:
@@ -490,8 +403,6 @@ 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:
@@ -504,16 +415,6 @@ 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:
@@ -527,21 +428,12 @@ 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:
@@ -552,8 +444,6 @@ 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:
@@ -612,26 +502,15 @@ 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:
@@ -648,9 +527,6 @@ 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:
@@ -658,9 +534,6 @@ 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:
@@ -699,18 +572,6 @@ 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:
@@ -735,51 +596,32 @@ 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/Qt/labs/settings/libqmlsettingsplugin_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/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/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/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/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/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/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/Layouts/libqquicklayoutsplugin_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

@@ -1,17 +0,0 @@
-<?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

@@ -1,505 +0,0 @@
-# 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 subclass in the test project, which is coded to provide information to the test framework to generate tests for device detection and potentially other things.
-
-In the test project
-* create a new folder for the device under tst/Devices. This is for anything you define for testing this device.
-* add a new class with header file and optionally .cpp file to the project in that folder. Name the class DeviceNameTestData, substituting an appropriate name in place of "DeviceName".
-* edit the header file to inherit the class from the BluetoothDeviceTestData abstract subclass appropriate to the device type, i.e. BikeTestData, RowerTestData, EllipticalTestData, TreadmillTestData.
-* have this new subclass' constructor pass a unique test name to its superclass.
-
-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
-- invalid configurations to test that the device is not detected, e.g. when it's disabled in the settings, but the name is correct
-- exclusion devices: if a device with the same name but of a higher priority type is detected, this device should not be detected
-- valid and invalid QBluetoothDeviceInfo configurations, e.g. to check the device is only detected when the manufacturer data is set correctly, or certain services are available or not.
-
-## 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 contains a set of fields that store strongly typed QSettings values. 
-It also provides methods to read and write the values it knows about from and to a QSettings object.
-
-It is used in conjunction with a TestSettings object to write a configuration during a test.
-
-
-## Writing a device detection test
-
-Because of the way the TestData classes currently work, it may be necessary to define multiple test data classes to cover the various cases.
-For example, if any of a list of names is enough to identify a device, or another group of names but with a certain service in the bluetooth device info, that will require multiple classes.
-
-### 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.
-
-
-```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "devices/domyosbike/domyosbike.h"
-
-class DomyosBikeTestData : public BikeTestData {
-
-public:
-    DomyosBikeTestData() : BikeTestData("Domyos Bike") {
-
-        this->addDeviceName("Domyos-Bike", comparison::StartsWith);
-        this->addInvalidDeviceName("DomyosBridge", comparison::StartsWith);
-    }
-
-	// not used yet
-    deviceType get_expectedDeviceType() const override { return deviceType::DomyosBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<domyosbike*>(detectedDevice)!=nullptr;
-    }
-};
-```
-
-The constructor adds a valid device name, and an invalid one. Various overloads of these methods and other members of the comparison enumeration provide other capabilities for specifying test data. If you add a valid device name that says the name should start with a value, additional names will be added automatically to the valid list with additional characters to test that it is in fact a "starts with" relationship. Also, valid and invalid names will be generated base on whether the comparison is case sensitive or not.
-
-The get_expectedDeviceType() function is not actually used and is part of an unfinished refactoring of the device detection code, whereby the bluetoothdevice object doesn't actually get created intially. You could add a new value to the deviceType enum and return that, but it's not used yet. There's always deviceType::None.
-
-The get_isExpectedDevice(bluetoothdevice *) function must be overridden to indicate if the specified object is of the type expected for this test data.
-
-### Configuration Settings
-
-Consider the CompuTrainerTestData. This device is not detected by name, but only by whether or not it is enabled in the settings.
-To specify this in the test data, we override one of the configureSettings methods, the one for the simple case where there is a single valid and a single invalid configuration. 
-
-Settings from QSettings that contribute to tests should be put into the DeviceDiscoveryInfo class.
-
-For example, for the Computrainer Bike, the "computrainer_serial_port" value from the QSettings determines if the bike should be detected or not.
-
-```
-class DeviceDiscoveryInfo {
-public :
-	...
-	QString computrainer_serial_port = nullptr;	
-	...
-}
-```
-
-The getValues and setValues methods should be updated to include the addition(s):
-
-```
-
-void DeviceDiscoveryInfo::setValues(QSettings &settings, bool clear) const {
-	if(clear) settings.clear();	
-	...
-	settings.setValue(QZSettings::computrainer_serialport, this->computrainer_serial_port);
-	...
-}
-
-void DeviceDiscoveryInfo::getValues(QSettings &settings){
-	...
-	this->computrainer_serial_port = settings.value(QZSettings::computrainer_serialport, QZSettings::default_computrainer_serialport).toString();
-	...
-}
-
-```
-
-In the following example, the DeviceDiscoveryInfo class has been updated to contain the device's configuration setting (computrainer_serial_port). 
-- if an enabling configuration is requested (enable==true) a string that is known to be accepted is supplied
-- if a disabling configuration is requested (enable==false) an empty string is supplied.
-
-This example uses the simpler of 2 configureSettings methods returns true/false to indicate if the configuration should be used for the test.
-
-```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "devices/computrainerbike/computrainerbike.h"
-
-class CompuTrainerTestData : public BikeTestData {
-protected:
-    bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
-        info.computrainer_serial_port = enable ? "X":QString();
-        return true;
-    }
-public:
-    CompuTrainerTestData() : BikeTestData("CompuTrainer Bike") {
-        // any name
-        this->addDeviceName("", comparison::StartsWithIgnoreCase);
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::CompuTrainerBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<computrainerbike*>(detectedDevice)!=nullptr;
-    }
-};
-```
-
-Similarly, the Pafers Bike has a simple configuration setting:
-
-```
-#include "Devices/Bike/biketestdata.h"
-#include "devices/pafersbike/pafersbike.h"
-
-
-class PafersBikeTestData : public BikeTestData {
-protected:
-    bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
-        // the treadmill is given priority
-        info.pafers_treadmill = !enable;
-        return true;
-    }
-public:
-    PafersBikeTestData() : BikeTestData("Pafers Bike") {
-        this->addDeviceName("PAFERS_", comparison::StartsWithIgnoreCase);
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::PafersBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<pafersbike*>(detectedDevice)!=nullptr;
-    }
-};
-```
-
-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 configureSettings function that takes a vector of DeviceDiscoveryInfo objects which is populated with configurations that lead to the specified result (enable = detected, !enable=not detected). Instead of returning a boolean to indicate if a configuration has been supplied, it populates a vector of DeviceDiscoveryInfo objects.
-
-```
-#pragma once
-
-#include "Devices/Treadmill/treadmilltestdata.h"
-#include "devices/paferstreadmill/paferstreadmill.h"
-
-class PafersTreadmillTestData : public TreadmillTestData {
-protected:
-    void configureSettings(const DeviceDiscoveryInfo& info, bool enable, std::vector<DeviceDiscoveryInfo>& configurations) const override {
-        DeviceDiscoveryInfo config(info);
-
-        if (enable) {
-            for(int x = 1; x<=3; x++) {
-                config.pafers_treadmill = x & 1;
-                config.pafers_treadmill_bh_iboxster_plus = x & 2;
-                configurations.push_back(config);
-            }
-        } else {
-            config.pafers_treadmill = false;
-            config.pafers_treadmill_bh_iboxster_plus = false;
-            configurations.push_back(config);
-        }
-    }
-
-public:
-    PafersTreadmillTestData() : TreadmillTestData("Pafers Treadmill") {
-        this->addDeviceName("PAFERS_", comparison::StartsWithIgnoreCase);
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::PafersTreadmill; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<paferstreadmill*>(detectedDevice)!=nullptr;
-    }
-};
-```
-
-### Considering Extra QBluetoothDeviceInfo Content
-
-Detection of some devices requires some specific bluetooth device information. 
-
-Supplying enabling and disabling QBluetoothDeviceInfo objects is done using a similar pattern to the multiple configurations scenario.
-For example, the M3iBike requires specific manufacturer information.
-
-
-```
-void M3IBikeTestData::configureBluetoothDeviceInfos(const QBluetoothDeviceInfo& info,  bool enable, std::vector<QBluetoothDeviceInfo>& bluetoothDeviceInfos) const {
-    // The M3I bike detector looks into the manufacturer data.
-
-    QBluetoothDeviceInfo result = info;
-
-    if(!enable) {
-        result.setManufacturerData(1, QByteArray("Invalid manufacturer data."));
-        bluetoothDeviceInfos.push_back(result);
-
-        return;
-    }
-
-    int key=0;
-    result.setManufacturerData(key++, hex2bytes("02010639009F00000000000000000014008001"));
-
-    bluetoothDeviceInfos.push_back(result);
-}
-
-```
-
-The test framework populates the incoming QBluetoothDeviceInfo object with a name and a UUID. This is expected to have nothing else defined. 
-Another example is one of the test data classes for detecting a device that uses the statesbike class:
-
-Detection code from bluetooth.cpp:
-
-```
-((b.name().toUpper().startsWith("KICKR CORE")) && !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
-```
-
-This condition is actually extracted from a more complicated example where the current test data classes can't cover all the detection criteria in one implementation. This is why this class inherits from StagesBikeTestData rather than BikeTestData directly.
-
-```
-class StagesBike3TestData : public StagesBikeTestData {
-protected:
-    void configureBluetoothDeviceInfos(const QBluetoothDeviceInfo& info,  bool enable, std::vector<QBluetoothDeviceInfo>& bluetoothDeviceInfos) const override {
-        // The condition, if the name is acceptable, is:
-        // !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
-
-        if(enable) {
-            QBluetoothDeviceInfo result = info;
-            result.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818)}));
-            bluetoothDeviceInfos.push_back(result);
-        } else {
-            QBluetoothDeviceInfo hasInvalid = info;
-            hasInvalid.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1826)}));
-            QBluetoothDeviceInfo hasBoth = hasInvalid;
-            hasBoth.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818),QBluetoothUuid((quint16)0x1826)}));
-
-            bluetoothDeviceInfos.push_back(info); // has neither
-            bluetoothDeviceInfos.push_back(hasInvalid);
-            bluetoothDeviceInfos.push_back(hasBoth);
-        }
-    }
-
-public:
-    StagesBike3TestData() : StagesBikeTestData("Stages Bike (KICKR CORE)") {
-
-        this->addDeviceName("KICKR CORE", comparison::StartsWithIgnoreCase);
-    }
-};
-```
-
-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 TestData class can be made to cover this by overriding the configureExclusions() method to add instances of the TestData classes for the exclusion devices to the object's internal list of exclusions.
-
-Detection code:
-
-```
-} else if (b.name().startsWith(QStringLiteral("ECH")) && !echelonRower && !echelonStride &&
-                       !echelonConnectSport && filter) {
-```
-The configureExclusions code is overridden to specify the exclusion test data objects. Note that the test for a previously detected device of the same type is not included.
-
-```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "Devices/EchelonRower/echelonrowertestdata.h"
-#include "Devices/EchelonStrideTreadmill/echelonstridetreadmilltestdata.h"
-#include "devices/echelonconnectsport/echelonconnectsport.h"
-
-class EchelonConnectSportBikeTestData : public BikeTestData {
-
-public:
-    EchelonConnectSportBikeTestData() : BikeTestData("Echelon Connect Sport Bike") {
-        this->addDeviceName("ECH", comparison::StartsWith);
-    }
-
-    void configureExclusions() override {
-        this->exclude(new EchelonRowerTestData());
-        this->exclude(new EchelonStrideTreadmillTestData());
-    }
-
-    deviceType get_expectedDeviceType() const override { return deviceType::EchelonConnectSport; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<echelonconnectsport*>(detectedDevice)!=nullptr;
-    }
-};
-
-
-```
-
-### When a single TestData Class 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 class. 
-The generated test data is approximately the combinations of these lists: names * settings * bluetoothdeviceInfo * exclusions.
-If a combination should not exist, a separate class should be used.
-
-In the example of the StagesBikeTestData classes, the exclusions, which apply to all situations, are implemented in the superclass StagesBikeTestData,
-
-
-```
-#pragma once
-
-#include "Devices/Bike/biketestdata.h"
-#include "devices/stagesbike/stagesbike.h"
-#include "Devices/FTMSBike/ftmsbiketestdata.h"
-
-class StagesBikeTestData : public BikeTestData {
-protected:
-    StagesBikeTestData(std::string testName): BikeTestData(testName) {
-    }
-   
-    void configureExclusions() override {
-        this->exclude(new FTMSBike1TestData());
-        this->exclude(new FTMSBike2TestData());
-    }
-    
-public:
-
-    deviceType get_expectedDeviceType() const override { return deviceType::StagesBike; }
-
-    bool get_isExpectedDevice(bluetoothdevice * detectedDevice) const override {
-        return dynamic_cast<stagesbike*>(detectedDevice)!=nullptr;
-    }
-};
-```
-
-The name-match only in one subclass:
-
-```
-class StagesBike1TestData : public StagesBikeTestData {
-
-public:
-    StagesBike1TestData() : StagesBikeTestData("Stages Bike") {
-        this->addDeviceName("STAGES ", comparison::StartsWithIgnoreCase);
-        this->addDeviceName("TACX SATORI", comparison::StartsWithIgnoreCase);
-    }
-
-};
-
-```
-
-The name and setting match in another subclass:
-
-```
-
-class StagesBike2TestData : public StagesBikeTestData {
-protected:
-    bool configureSettings(DeviceDiscoveryInfo& info, bool enable) const override {
-        info.powerSensorName = enable ? "Disabled":"Roberto";
-        return true;
-    }
-public:
-    StagesBike2TestData() : StagesBikeTestData("Stages Bike (Assioma / Power Sensor disabled") {
-
-        this->addDeviceName("ASSIOMA", comparison::StartsWithIgnoreCase);
-    }
-};
-
-```
-The name and bluetooth device info configurations in another:
-
-```
-
-class StagesBike3TestData : public StagesBikeTestData {
-protected:
-    void configureBluetoothDeviceInfos(const QBluetoothDeviceInfo& info,  bool enable, std::vector<QBluetoothDeviceInfo>& bluetoothDeviceInfos) const override {
-        // The condition, if the name is acceptable, is:
-        // !deviceHasService(b, QBluetoothUuid((quint16)0x1826)) && deviceHasService(b, QBluetoothUuid((quint16)0x1818)))
-
-        if(enable) {
-            QBluetoothDeviceInfo result = info;
-            result.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818)}));
-            bluetoothDeviceInfos.push_back(result);
-        } else {
-            QBluetoothDeviceInfo hasInvalid = info;
-            hasInvalid.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1826)}));
-            QBluetoothDeviceInfo hasBoth = hasInvalid;
-            hasBoth.setServiceUuids(QVector<QBluetoothUuid>({QBluetoothUuid((quint16)0x1818),QBluetoothUuid((quint16)0x1826)}));
-
-            bluetoothDeviceInfos.push_back(info); // has neither
-            bluetoothDeviceInfos.push_back(hasInvalid);
-            bluetoothDeviceInfos.push_back(hasBoth);
-        }
-    }
-
-public:
-    StagesBike3TestData() : StagesBikeTestData("Stages Bike (KICKR CORE)") {
-
-        this->addDeviceName("KICKR CORE", comparison::StartsWithIgnoreCase);
-    }
-};
-
-```
-
-## Telling Google Test Where to Look
-
-To register your test data class(es) with Google Test:
-
-- open tst/Devices/devices.h
-- add a #include for your new header file(s)
-- add your new classes to the BluetoothDeviceTestDataTypes list.
-
-This will add tests for your new device class to test runs of the tests in the BluetoothDeviceTestSuite class, which are about detecting, and not detecting devices in circumstances generated from the TestData classes.
-
-

helpers/wireshark-json-filter.py

@@ -1,28 +0,0 @@
-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,7 +329,6 @@ 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")
@@ -357,7 +356,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,
@@ -613,7 +612,6 @@ 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,29 +5,26 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
-			<key>BinaryPath</key>
-			<string>ConnectIQ.framework/ConnectIQ</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-armv7_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-arm64_x86_64-simulator</string>
+			<string>ios-i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ConnectIQ.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
+				<string>i386</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>

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

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

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

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

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

@@ -13,9 +13,6 @@ 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-armv7_arm64/ConnectIQ.framework/Modules/module.modulemap

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

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

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

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

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

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

@@ -13,9 +13,6 @@ 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-i386_x86_64-simulator/ConnectIQ.framework/Modules/module.modulemap

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

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

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

src/activiotreadmill.cpp

@@ -1,10 +1,10 @@
 #include "activiotreadmill.h"
-#include "virtualdevices/virtualbike.h"
+#include "virtualbike.h"
 
 #ifdef Q_OS_ANDROID
 #include "keepawakehelper.h"
 #endif
-#include "virtualdevices/virtualtreadmill.h"
+#include "virtualtreadmill.h"
 #include <QBluetoothLocalDevice>
 #include <QDateTime>
 #include <QFile>

src/activiotreadmill.h

@@ -27,7 +27,7 @@
 #include <QDateTime>
 #include <QObject>
 
-#include "devices/treadmill.h"
+#include "treadmill.h"
 
 #ifdef Q_OS_IOS
 #include "ios/lockscreen.h"

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.64" android:versionCode="817" 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.16.29" android:versionCode="693" 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,8 +78,7 @@
 				<service
 				    android:name=".ForegroundService"
 					 android:enabled="true"
-                                         android:foregroundServiceType="connectedDevice"
-                                         android:exported="false"></service>
+					 android:exported="true"></service>
                 <service
                     android:name=".WearableMessageListenerService"
                     android:enabled="true"
@@ -98,7 +97,6 @@
 
             <service android:name="com.cgutman.androidremotedebugger.service.ShellService"
 				    android:enabled="true"
-                                    android:foregroundServiceType="connectedDevice"
 					 android:exported="false" >
 					</service>
 
@@ -117,7 +115,6 @@
 <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.ACCESS_CHECKIN_PROPERTIES"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

src/android/build.gradle

@@ -6,14 +6,9 @@ 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()
@@ -22,17 +17,14 @@ repositories {
 }
 
 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
@@ -46,8 +38,8 @@ dependencies {
 
     def appcompat_version = "1.3.1"
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-         implementation "com.android.billingclient:billing:6.0.1"
-         implementation 'com.android.support:appcompat-v7:28.0.0'
+	 implementation "com.android.billingclient:billing:5.0.0"
+	 implementation 'com.android.support:appcompat-v7:28.0.0'
 
          implementation "androidx.appcompat:appcompat:$appcompat_version"
          implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
@@ -55,30 +47,6 @@ 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 {
@@ -131,7 +99,7 @@ android {
         resConfig "en"
                   compileSdkVersion 33
 		  minSdkVersion = 21
-                  targetSdkVersion = 34
+                  targetSdkVersion = 33
     }
 
 tasks.all { task ->