fixing linker error

This reverts commit 944d6d5ef2.

.github/workflows/main.yml

@@ -1,4 +1,3 @@
-
 # This is a basic workflow to help you get started with Actions
 
 name: CI
@@ -15,8 +14,8 @@ on:
     branches: [ master,  github-workflow-playground ]
   pull_request:
     branches: [ master ]
-  schedule:
-    - cron: "0 0 * * *"
+#  schedule:
+#    - cron: "0 */12 * * *"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -71,20 +70,15 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.10.11
       - name: download python and paddleocr
         run: |
           python -VV
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade setuptools
-          python -m pip install "protobuf<=3.20.2,>=3.1.0"
-          python -m pip install paddlepaddle==2.5.1
-          python -m pip install paddleocr
-          python -m pip install imutils
-          python -m pip install "Pillow<10.0.0"
           python -m pip install opencv-python
-          python -m pip install numpy
           python -m pip install pywin32
+          python -m pip install paddlepaddle-gpu==2.4.2.post117 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html
+          python -m pip install https://files.pythonhosted.org/packages/03/ac/13fbe0ebf110d57a89f055a292d4fe430fee3fb22c56f8c077e63e0c5a4e/paddlepaddle-2.4.2-cp310-cp310-win_amd64.whl
+          python -m pip install paddleocr>=2.0.1
         if: matrix.config.python
 
       - uses: msys2/setup-msys2@v2
@@ -123,20 +117,15 @@ jobs:
             make install
             cd ../..
 
-      - name: Secrets
-        if: github.ref == 'refs/heads/master'
-        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
-          cd ..  
-
       - name: Build
         run: |
             qmake
+            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
+            cd ..
             make -j8
             cd src/debug
             mkdir output
@@ -144,17 +133,15 @@ jobs:
             cp qdomyos-zwift.exe output/
             cd output
             windeployqt --qmldir ../../ qdomyos-zwift.exe
-            cp "C:/mingw64/bin/libwinpthread-1.dll" .
-            cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
-            cp "C:/mingw64/bin/libstdc++-6.dll" .
+            cp "C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/libwinpthread-1.dll" .
+            cp "C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/libgcc_s_seh-1.dll" .
+            cp "C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/libstdc++-6.dll" .
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../windows/*.py .
-            cp ../../windows/*.bat .
-            cp ../../../windows_openssl/*.* .
             mkdir adb
             mkdir python
-            Copy-Item -Path C:\hostedtoolcache\windows\Python\3.7.9\x64 -Destination python -Recurse
+            Copy-Item -Path C:\hostedtoolcache\windows\Python\3.10.11\x64 -Destination python -Recurse
             cp ../../adb/* adb/
             cd ..
             cd appx
@@ -164,6 +151,12 @@ jobs:
       - name: Build without python
         run: |
             qmake
+            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
+            cd ..
             make -j8
             cd src/debug
             mkdir output
@@ -171,12 +164,11 @@ jobs:
             cp qdomyos-zwift.exe output/
             cd output
             windeployqt --qmldir ../../ qdomyos-zwift.exe
-            cp "C:/mingw64/bin/libwinpthread-1.dll" .
-            cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
-            cp "C:/mingw64/bin/libstdc++-6.dll" .
+            cp "C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/libwinpthread-1.dll" .
+            cp "C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/libgcc_s_seh-1.dll" .
+            cp "C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/libstdc++-6.dll" .
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
-            cp ../../../windows_openssl/*.* .
             mkdir adb
             cp ../../adb/* adb/
             cd ..
@@ -184,79 +176,23 @@ jobs:
             #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz          
         if: matrix.config.python == false
 
-      - name: patching qt for bluetooth
-        run: cp qt-patches/windows/5.15.2/binary/mingw64/*.* ${{ github.workspace }}/src/debug/output/
-
       - name: Zip artifact for deployment
-        run: Compress-Archive src/debug/output windows-binary.zip
-        if: matrix.config.python
-
-      - name: Zip artifact for deployment
-        run: Compress-Archive src/debug/output windows-binary-no-python.zip
-        if:  ${{ ! matrix.config.python }}
+        run: Compress-Archive src/debug/output release.zip
 
       - name: Archive windows binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: windows-binary
-          path: windows-binary.zip
+          path: release.zip
         if: matrix.config.python
 
       - name: Archive windows binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: windows-binary-no-python
-          path: windows-binary-no-python.zip
+          path: release.zip
         if:  ${{ ! matrix.config.python }}
 
-      # - name: Exit if not on master branch
-      #   if: github.ref == 'refs/heads/master'
-      #   run: exit 1
-
-      # - uses: actions/checkout@v3
-      #   with:
-      #     fetch-depth: 0 # Required due to the way Git works, without it this action won't be able to find any or the correct tags
-
-      # - name: Get previous tag
-      #   id: previoustag
-      #   uses: 'WyriHaximus/github-action-get-previous-tag@v1'
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}          
-
-      # - name: Create Release
-      #   if:  ${{ ! matrix.config.python }}
-      #   id: create_release
-      #   uses: actions/create-release@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     tag_name: ${{ steps.previoustag.outputs.tag }}
-      #     release_name: Release ${{ steps.previoustag.outputs.tag }}
-      #     draft: false
-      #     prerelease: false
-
-      # - name: upload windows artifact
-      #   uses: actions/upload-release-asset@v1
-      #   if:  ${{ ! matrix.config.python }}
-      #   env:
-      #     GITHUB_TOKEN: ${{ github.token }}
-      #   with:
-      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: release.zip
-      #     asset_name: windows-binary-no-python.zip
-      #     asset_content_type: application/zip        
-
-      # - name: upload windows artifact
-      #   uses: actions/upload-release-asset@v1
-      #   if:  ${{ matrix.config.python }}
-      #   env:
-      #     GITHUB_TOKEN: ${{ github.token }}
-      #   with:
-      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: release.zip
-      #     asset_name: windows-binary.zip
-      #     asset_content_type: application/zip        
-
 #  window-steam-build:
 #    runs-on: windows-latest
 #
@@ -307,7 +243,6 @@ jobs:
 #            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 STEAM_STORE" >> secret.h
 #            cd ..
 #            make -j8
@@ -338,23 +273,10 @@ 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:
-      - name: release
-        uses: actions/create-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        id: create_release
-        with:
-          draft: false
-          prerelease: false
-          release_name: ${{ steps.version.outputs.version }}
-          tag_name: ${{ github.ref }}
-          body_path: CHANGELOG.md
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
 #      - name: Cache Qt Linux Desktop
 #        id: cache-qt-linux-desktop
 #        uses: actions/cache@v1
@@ -434,7 +356,7 @@ jobs:
         run: qmake; make -j8
 
       - name: Archive linux-desktop binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: linux-desktop-binary
           path: src/qdomyos-zwift         
@@ -443,7 +365,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@v4
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: test_results_xml
@@ -508,7 +430,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:
@@ -531,12 +453,30 @@ jobs:
           sudo apt-get install -y xvfb
           Xvfb -ac ${{ env.DISPLAY }} -screen 0 1280x780x24 &
 
-      - name: Checkout repository
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
         uses: actions/checkout@v2
         with:
-          # This token is provided by Actions, you do not need to create your own token
-          token: ${{ secrets.GITHUB_TOKEN }}
-          submodules: recursive # or 'true' if you want to check out only immediate submodules
+          repository: bluetiger9/SmtpClient-for-Qt
+          path: "src/smtpclient/"
+          ref: 3fa4a0fe5797070339422cf18b5e9ed8dcb91f9c
+
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: cagnulein/qmdnsengine
+          path: "src/qmdnsengine/"
+          ref: "zwift"
+
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: google/googletest
+          path: "tst/googletest/"
+          ref: "release-1.12.1"
 
       - 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
@@ -573,7 +513,7 @@ jobs:
       - name: Install Qt Android
         uses: jurplel/install-qt-action@v3
         with:
-          version: '5.15.0'
+          version: '5.15.2'
           host: 'linux'
           target: 'android'
           arch: 'android'
@@ -586,13 +526,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          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/
-
-      - name: download 3rd party files for qthttpserver
-        run: cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
+          java-version: '11'
 
       - name: Set Android NDK 21 && build
         run: |
@@ -604,57 +538,17 @@ jobs:
           echo "y" | $SDKMANAGER "ndk;21.4.7075529"
           export ANDROID_NDK="${ANDROID_SDK_ROOT}/ndk-bundle"
           export ANDROID_NDK_ROOT="${ANDROID_NDK}"
-          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 ..          
 
           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
 
       - name: Build APK (not usable for production due to unpatched QT library)
         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@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/master'
-      #   run: exit 1
-
-      # - name: upload windows artifact
-      #   uses: actions/upload-release-asset@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ github.token }}
-      #   with:
-      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: ${{ github.workspace }}/output/android/build/outputs/apk/debug/android-debug.apk
-      #     asset_name: fdroid-android-trial.zip
-      #     asset_content_type: application/zip                  
-
   ios-build:
     # The type of runner that the job will run on
     runs-on: macos-latest
-    permissions:
-      contents: write
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -706,592 +600,5 @@ jobs:
         run: cp qt-patches/ios/5.15.2/binary/*.* ${{ github.workspace }}/output/ios/Qt/5.15.2/ios/lib/
 
       - name: Build
-        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
-          cd ..
-          qmake CONFIG+=debug && make -j4
+        run: qmake CONFIG+=debug && make -j4
 
-      # causes iOS build on Mac to fail
-      # - name: Commit moc files
-      #   uses: EndBug/add-and-commit@v9
-      #   with:
-      #     message: 'moc files added'
-      #     add: 'src/moc_*.cpp --force'
-      #   if: github.ref == 'refs/heads/master'
-
-  window-msvc2019-build:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        config:
-          - {python: true}
-          - {python: false}    
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: bluetiger9/SmtpClient-for-Qt
-          path: "src/smtpclient/"
-          ref: 3fa4a0fe5797070339422cf18b5e9ed8dcb91f9c
-
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: cagnulein/qmdnsengine
-          path: "src/qmdnsengine/"
-          ref: "zwift"   
-
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: google/googletest
-          path: "tst/googletest/"
-          ref: "release-1.12.1"
-
-      - uses: actions/checkout@v2
-      - name: Checkout qHttpServer
-        uses: actions/checkout@v2
-        with:
-          repository: qt-labs/qthttpserver
-          path: "src/qthttpserver"
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.7
-      - name: download python and paddleocr
-        run: |
-          python -VV
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade setuptools
-          python -m pip install "protobuf<=3.20.2,>=3.1.0"
-          python -m pip install paddlepaddle==2.5.1
-          python -m pip install paddleocr
-          python -m pip install imutils
-          python -m pip install "Pillow<10.0.0"
-          python -m pip install opencv-python
-          python -m pip install numpy
-          python -m pip install pywin32
-        if: matrix.config.python          
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: '5.15.2'
-          host: 'windows'
-          modules: 'qtnetworkauth qtcharts'
-          target: "desktop"
-          arch: win64_msvc2019_64
-          dir: "${{github.workspace}}/qt/"
-          install-deps: "true"
-          cache: 'true'
-          cache-key-prefix: 'install-qt-action-windows'          
-
-      - name: Install MSVC compiler
-        uses: ilammy/msvc-dev-cmd@v1
-        with: 
-          # 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
-          toolset: 14.2
-          arch: x64
-
-      - 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
-            nmake
-            nmake install
-            cd ../..          
-
-      - name: Secrets
-        if: github.ref == 'refs/heads/master'
-        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
-          cd ..        
-
-      - name: Clone vcpkg
-        run: git clone https://github.com/microsoft/vcpkg.git
-        working-directory: ${{ runner.workspace }}
-  
-      - name: Bootstrap vcpkg
-        run: .\vcpkg\bootstrap-vcpkg.bat
-        working-directory: ${{ runner.workspace }}
-        
-      - name: Create vcpkg.json
-        working-directory: ${{ runner.workspace }}
-        run: |
-          echo '{
-            "name": "qdomyos-zwift",
-            "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
-            "dependencies": [
-              "protobuf",
-              "protobuf-c",
-              "abseil"
-            ],
-            "builtin-baseline": "8c2fcacefba009d63672f9d137f192765e632c9f"
-          }' > vcpkg.json
-      
-      - name: Install dependencies
-        run: |
-          .\vcpkg\vcpkg install --triplet x64-windows --x-install-root=D:\a\qdomyos-zwift\vcpkg\installed
-        working-directory: ${{ runner.workspace }}
-  
-      - name: Build
-        run: |
-            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
-            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose           
-            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
-            qmake            
-            nmake
-            cd src/debug
-            mkdir output
-            mkdir appx
-            cp qdomyos-zwift.exe output/
-            cd output
-            windeployqt --qmldir ../../ qdomyos-zwift.exe
-            cp ../../../icons/iOS/iTunesArtwork@2x.png .
-            cp ../../AppxManifest.xml .
-            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
-            cp ../../adb/* adb/
-            cd ..
-            cd appx
-            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz   
-        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
-            qmake           
-            nmake
-            cd src/debug
-            mkdir output
-            mkdir appx
-            cp qdomyos-zwift.exe output/
-            cd output
-            windeployqt --qmldir ../../ qdomyos-zwift.exe
-            cp "C:/mingw64/bin/libwinpthread-1.dll" .
-            cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
-            cp "C:/mingw64/bin/libstdc++-6.dll" .              
-            cp ../../../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 ..
-            cd appx
-            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz          
-        if: matrix.config.python == false            
-
-      - name: patching qt for bluetooth
-        run: cp qt-patches/windows/5.15.2/binary/msvc2019/*.* ${{ github.workspace }}/src/debug/output/
-
-      - name: Zip artifact for deployment
-        run: Compress-Archive src/debug/output windows-msvc2019-binary.zip
-        if: matrix.config.python
-
-      - name: Zip artifact for deployment
-        run: Compress-Archive src/debug/output windows-msvc2019-binary-no-python.zip
-        if:  ${{ ! matrix.config.python }}
-
-      - name: Archive windows binary
-        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@v4
-        with:
-          name: windows-msvc2019-binary-no-python
-          path: windows-msvc2019-binary-no-python.zip
-        if:  ${{ ! matrix.config.python }}
-
-  window-msvc2019-aiserver-build:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: bluetiger9/SmtpClient-for-Qt
-          path: "src/smtpclient/"
-          ref: 3fa4a0fe5797070339422cf18b5e9ed8dcb91f9c
-
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: cagnulein/qmdnsengine
-          path: "src/qmdnsengine/"
-          ref: "zwift"   
-
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: google/googletest
-          path: "tst/googletest/"
-          ref: "release-1.12.1"
-
-      - uses: actions/checkout@v2
-      - name: Checkout qHttpServer
-        uses: actions/checkout@v2
-        with:
-          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:
-          version: '5.15.2'
-          host: 'windows'
-          modules: 'qtnetworkauth qtcharts'
-          target: "desktop"
-          arch: win64_msvc2019_64
-          dir: "${{github.workspace}}/qt/"
-          install-deps: "true"
-          cache: 'true'
-          cache-key-prefix: 'install-qt-action-windows'          
-
-      - name: Install MSVC compiler
-        uses: ilammy/msvc-dev-cmd@v1
-        with: 
-          # 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
-          toolset: 14.2
-          arch: x64
-
-      - 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
-            nmake
-            nmake install
-            cd ../..          
-
-      - name: Secrets
-        if: github.ref == 'refs/heads/master'
-        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
-          cd ..                    
-
-      - name: Clone vcpkg
-        run: git clone https://github.com/microsoft/vcpkg.git
-        working-directory: ${{ runner.workspace }}
-  
-      - name: Bootstrap vcpkg
-        run: .\vcpkg\bootstrap-vcpkg.bat
-        working-directory: ${{ runner.workspace }}
-        
-      - name: Create vcpkg.json
-        working-directory: ${{ runner.workspace }}
-        run: |
-          echo '{
-            "name": "qdomyos-zwift",
-            "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
-            "dependencies": [
-              "protobuf",
-              "protobuf-c",
-              "abseil"
-            ],
-            "builtin-baseline": "8c2fcacefba009d63672f9d137f192765e632c9f"
-          }' > vcpkg.json
-      
-      - name: Install dependencies
-        run: |
-          .\vcpkg\vcpkg install --triplet x64-windows --x-install-root=D:\a\qdomyos-zwift\vcpkg\installed
-        working-directory: ${{ runner.workspace }}
-
-      - name: Build
-        run: |
-            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
-            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose           
-            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
-            cd src
-            echo "#define AISERVER" >> aiserver.h
-            cd ..
-            qmake
-            nmake
-            cd src/debug
-            mkdir output
-            mkdir appx
-            cp qdomyos-zwift.exe output/
-            cd output
-            windeployqt --qmldir ../../ qdomyos-zwift.exe
-            cp ../../../icons/iOS/iTunesArtwork@2x.png .
-            cp ../../AppxManifest.xml .
-            cp ../../windows/zwift-incline-ai-server.py zwift-incline.py
-            cp ../../windows/zwift-incline-climb-portal-ai-server.py zwift-incline-climb-portal.py
-            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 ..
-            cd appx
-            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz                      
-
-      - name: patching qt for bluetooth
-        run: cp qt-patches/windows/5.15.2/binary/msvc2019/*.* ${{ github.workspace }}/src/debug/output/
-
-      - name: Zip artifact for deployment
-        run: Compress-Archive src/debug/output windows-msvc2019-ai-server-binary.zip
-
-      - name: Archive windows binary
-        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-20241016
-        with:
-          args: >
-            bash -c "
-            set -ex &&
-            apt-get update && 
-            apt-get install -y build-essential git cmake qtbase5-dev qtbase5-private-dev qtchooser qt5-qmake qtbase5-dev-tools qttools5-dev-tools libqt5svg5-dev qtmultimedia5-dev libqt5charts5-dev qtpositioning5-dev qtconnectivity5-dev libqt5websockets5-dev libqt5texttospeech5-dev libqt5bluetooth5 libqt5networkauth5-dev qml-module-qtlocation qml-module-qtpositioning qtlocation5-dev libqt5quickcontrols2-5 qtquickcontrols2-5-dev qml-module-qtquick-controls2 &&
-            export QT_SELECT=qt5 &&
-            export PATH=/usr/lib/qt5/bin:$PATH &&
-            cd /github/workspace &&
-            sed -i '/QtHttpServer/d' qdomyos-zwift.pro &&
-            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/#include <QtHttpServer/\/\/#include <QtHttpServer/' {} + &&
-            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/QHttpServer/\/\/QHttpServer/' {} + &&
-            cat qdomyos-zwift.pro &&
-            qmake &&
-            make -j$(nproc)
-            "
-
-      - name: 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-20241016
-        with:
-          args: >
-            bash -c "
-            set -ex &&
-            apt-get update && 
-            apt-get install -y build-essential git cmake qtbase5-dev qtbase5-private-dev qtchooser qt5-qmake qtbase5-dev-tools qttools5-dev-tools libqt5svg5-dev qtmultimedia5-dev libqt5charts5-dev qtpositioning5-dev qtconnectivity5-dev libqt5websockets5-dev libqt5texttospeech5-dev libqt5bluetooth5 libqt5networkauth5-dev qml-module-qtlocation qml-module-qtpositioning qtlocation5-dev libqt5quickcontrols2-5 qtquickcontrols2-5-dev qml-module-qtquick-controls2 &&
-            export QT_SELECT=qt5 &&
-            export PATH=/usr/lib/qt5/bin:$PATH &&
-            cd /github/workspace &&
-            sed -i '/QtHttpServer/d' qdomyos-zwift.pro &&
-            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/#include <QtHttpServer/\/\/#include <QtHttpServer/' {} + &&
-            find src -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's/QHttpServer/\/\/QHttpServer/' {} + &&
-            cat qdomyos-zwift.pro &&
-            qmake &&
-            make -j$(nproc)
-            "
-
-      - name: 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-2024-10-28/2024-10-22-raspios-bookworm-arm64-lite.img.xz
-          xz -d 2024-10-22-raspios-bookworm-arm64-lite.img.xz
-          ORIGINAL_SIZE=$(stat -c %s 2024-10-22-raspios-bookworm-arm64-lite.img)
-          NEW_SIZE=$((ORIGINAL_SIZE + 2*1024*1024*1024))  # Add 2GB
-          truncate -s $NEW_SIZE 2024-10-22-raspios-bookworm-arm64-lite.img
-          sudo apt-get update
-          sudo apt-get install -y parted
-          sudo parted 2024-10-22-raspios-bookworm-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 2024-10-22-raspios-bookworm-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/
-          sudo mkdir -p /mnt/raspbian_p1
-          sudo mount /dev/mapper/$(basename $LOOP_DEVICE)p1 /mnt/raspbian_p1
-
-      - 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: Modify boot config to enable bluetooth
-        run: |
-          # The following line makes it specific for Raspberry Pi Zero 2W. 
-          # though I expect it is needed for Raspberry Pi 3B and maybe others as well
-          echo "[pi02]" | sudo tee -a /mnt/raspbian_p1/config.txt
-          echo "dtoverlay=miniuart-bt" | sudo tee -a /mnt/raspbian_p1/config.txt
-
-      - name: Unmount Raspberry Pi image
-        run: |
-          sudo umount /mnt/raspbian
-          sudo umount /mnt/raspbian_p1
-          sudo kpartx -d ${{ env.LOOP_DEVICE }}
-          sudo losetup -d ${{ env.LOOP_DEVICE }}
-
-      - name: Compress modified Raspberry Pi image
-        run: |
-          xz -z 2024-10-22-raspios-bookworm-arm64-lite.img
-
-      - name: Upload Raspberry Pi image as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: raspberry-pi-64bit-image
-          path: 2024-10-22-raspios-bookworm-arm64-lite.img.xz
-  
-  upload_to_release:
-    permissions: write-all
-    runs-on: ubuntu-20.04 
-    if: github.event_name == 'schedule'
-    needs: [linux-x86-build, window-msvc2019-build, ios-build, window-build, android-build]  # Specify the job dependencies
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-      - name: Update nightly release
-        uses: andelf/nightly-release@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: nightly
-          prerelease: false
-          name: 'QZ nightly build $$'
-          body: |
-            This is a nightly build of QZ.
-
-            You can use this if you want to try new features without waiting for releases.
-            From time to time, in development builds, old difficult-to-reproduce bugs are
-            fixed, but it is also true that in the development process with the introduction
-            of new complex code, the stability of the program may suffer compared to
-            official releases, so **use it with caution**!
-
-            __Please help us improve QZ by reporting any issues you encounter!__ :wink:
-          files: |
-            windows-msvc2019-binary-no-python/*
-            windows-msvc2019-binary/*
-            windows-msvc2019-ai-server-binary/*            
-            windows-binary-no-python/*
-            windows-binary/*
-            fdroid-android-trial/*
-            raspberry-pi-binary/*
-            raspberry-pi-64bit-binary/*
-            2024-10-22-raspios-bookworm-arm64-lite.img.xz

.gitignore

@@ -49,4 +49,3 @@ src/inner_templates/googlemaps/cesium-key.js
 *.autosave
 .vscode/settings.json
 /tst/Devices/.vs
-src/inner_templates/googlemaps/cesium-key.js

.gitmodules

@@ -13,10 +13,3 @@
 	path = tst/googletest
 	url = https://github.com/google/googletest.git
 	branch = tags/release-1.12.1
-[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

@@ -7,122 +7,58 @@ Zwift bridge for Treadmills and Bike!
 [<img src="docs/img/app_store.png">](https://apps.apple.com/app/id1543684531?fbclid=IwAR10H6y3mEgwkTlGJON3e8voYOh2wt3kLFOpFzoIXaYZ_N0y0pDvKxHMUaM)
 <a href="https://www.buymeacoffee.com/cagnulein" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
 
-<table>
-<tr>
-  <td>
-<img src="icons/AppScreen/iOS%20Phones%20-%206.5_/screenshot1.jpeg" style="height: 400px !important; box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" >
-    </td>
-  <td>
-<img src="icons/AppScreen/iOS%20Phones%20-%206.5_/screenshot2.jpeg" style="height: 400px !important; box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" >
-    </td>
-  <td>
-<img src="icons/AppScreen/iOS%20Phones%20-%206.5_/screenshot3.jpeg" style="height: 400px !important; box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" >
-    </td>
-  <td>
-<img src="icons/AppScreen/iOS%20Phones%20-%206.5_/screenshot4.jpeg" style="height: 400px !important; box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" >
-    </td>
-  <td>
-<img src="icons/AppScreen/iOS%20Phones%20-%206.5_/screenshot5.jpeg" style="height: 400px !important; box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" >
-    </td>
-  </tr>
-</table>
+![UI](docs/img/treadmill-bridge-schema.png)
+
+[![Video](https://img.youtube.com/vi/GgG3dMhmo2Y/0.jpg)](https://www.youtube.com/watch?v=GgG3dMhmo2Y)
+
+![UI](docs/img/ui.png)
+![UI](docs/img/realtime-chart.png)
+
+UI on Linux
+
+![UI](docs/img/ui-mac.png)
+
+UI on MacOS
 
 ### Features
 
-# UI Features
-
-|Feature|Bike|Treadmill|Elliptical|Rower|Notes|
-|:---|:---:|:---:|:---:|:---:|---:|
-|Tiles Customization|X|X|X|X|Order and visibility of each tile|
-|Profiles|X|X|X|X|Different user or different fitness device profiles|
-|UI Zoom Customization|X|X|X|X||
-
-# Peloton Features
-
-|Feature|Bike|Treadmill|Elliptical|Rower|Notes|
-|:---|:---:|:---:|:---:|:---:|---:|
-|Bike metrics on the peloton app|X||X|||
-|Power zone with auto resistance|X|||||
-|Peloton real-time resistance conversion|X||X||with the possibility to customize it|
-|Peloton real-time auto-resistance|X||X||with the possibility to customize it|
-|Peloton auto speed and auto inclination||X|X||with the possibility to customize it|
-
-# Heart Rate Features
-
-|Feature|Bike|Treadmill|Elliptical|Rower|Notes|
-|:---|:---:|:---:|:---:|:---:|---:|
-|Heart Rate support|X|X|X|X|Apple Watch, ANT+ devices and Bluetooth devices|
-|Heart Rate Zones Customizations|X|X|X|X||
-|Ability to calculate Wattage from HR and Cadence|X||||for the bikes that doesn't have a power sensor|
-
-# 3rd Apps Compatibility
-
-|Feature|Bike|Treadmill|Elliptical|Rower|Notes|
-|:---|:---:|:---:|:---:|:---:|---:|
-|Zwift Compatibility|X|X|X|X||
-|Zwift Auto resistance|X||X|||
-|Zwift Auto inclination and speed||X|X||https://www.youtube.com/watch?v=KTQ2n7yeDbo|
-|Wahoo RGT Compatibility|X|X|X|X||
-|VzFit Compatibility|X|X|X|X||
-|Rouvy Compatibility|X|X|X|X||
-|IFIT app Compatibility|X|||||
-|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|
-|:---|:---:|:---:|:---:|:---:|---:|
-|Builtin video support (Kinomap like)|X|X|X|X|Files could be local or on the cloud!|
-|GPX auto following|X|X|X|X||
-|2D/3D maps for GPX|X|X|X|X||
-|ZWO (Zwift workout file) compatibility|X|X|X|X||
-|XML Workout file compatibility|X|X|X|X||
-|Auto follow workout based on your heart rate|X|X|X|X||
-|Random workout|X|X|X|X||
-
-
-# Statistics 
-
-|Feature|Bike|Treadmill|Elliptical|Rower|Notes|
-|:---|:---:|:---:|:---:|:---:|---:|
-|E-Mail report|X|X|X|X|at the end of the workout|
-|Strava integration|X|X|X|X|press stop at the end of the workout to auto upload it|
-
-# Misc
-
-|Feature|Bike|Treadmill|Elliptical|Rower|Notes|
-|:---|:---:|:---:|:---:|:---:|---:|
-|Resistance shifting with bluetooth remote|X||X|||
-|TTS support|X|X|X|X||
+1. Domyos compatible
+2. Toorx TRX Route Key compatible
+3. Echelon Connect Sport compatible
+4. Zwift compatible
+5. Create, load and save train programs
+6. Measure distance, elevation gain and watts
+7. Gpx import (with difficulty slider)
+8. Realtime Charts
 
+![First Success](docs/img/first_success.jpg)
 
 ### Installation 
 
-  You can install it on multiple platforms.
-  Read the [installation procedure](docs/10_Installation.md)
+You can install on multiple platforms.
+Read the [installation procedure](docs/10_Installation.md)
 
 
 ### Tested on
 
-  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).
+You can run the app on [Macintosh or Linux devices](docs/10_Installation.md). IOS and Android are also supported.
 
-### No GUI version
+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).
+
+### No gui version
 
 run as
 
-  $ sudo ./qdomyos-zwift -no-gui
+$ sudo ./qdomyos-zwift -no-gui
 
 ### Reference
 
-  => GitHub Repository: [QDomyos-Zwift on GitHub](https://github.com/ProH4Ck/treadmill-bridge)
+https://github.com/ProH4Ck/treadmill-bridge
 
-  => 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/)
+https://www.livestrong.com/article/422012-what-is-10-degrees-in-incline-on-a-treadmill/
 
-  => Icon Attribution: Icons used in this documentation are from [Flaticon.com](https://www.flaticon.com)
+Icons used in this documentation comes from [flaticon.com](https://www.flaticon.com)
 
 ### Blog
 
-  => Related Blog: [Roberto Viola's Blog](https://robertoviola.cloud)
+https://robertoviola.cloud

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift-Bridging-Header.h

@@ -2,4 +2,3 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "swiftDebug.h"

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/MainController.swift

@@ -104,9 +104,6 @@ extension MainController: WorkoutTrackingDelegate {
             "\(heartRate)" as AnyObject])
         WorkoutTracking.distance = WatchKitConnection.distance
         WorkoutTracking.kcal = WatchKitConnection.kcal
-        WorkoutTracking.speed = WatchKitConnection.speed
-        WorkoutTracking.power = WatchKitConnection.power
-        WorkoutTracking.cadence = WatchKitConnection.cadence
                 
 		if Locale.current.measurementSystem != "Metric" {
 			self.distanceLabel.setText("Distance \(String(format:"%.2f", WorkoutTracking.distance))")

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/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>

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

@@ -24,9 +24,6 @@ class WatchKitConnection: NSObject {
     public static var distance = 0.0
     public static var kcal = 0.0
     public static var stepCadence = 0
-    public static var speed = 0.0
-    public static var cadence = 0.0
-    public static var power = 0.0
     weak var delegate: WatchKitConnectionDelegate?
     
     private override init() {
@@ -69,13 +66,6 @@ extension WatchKitConnection: WatchKitConnectionProtocol {
             WatchKitConnection.distance = dDistance
             let dKcal = Double(result["kcal"] as! Double)
             WatchKitConnection.kcal = dKcal
-            
-            let dSpeed = Double(result["speed"] as! Double)
-            WatchKitConnection.speed = dSpeed
-            let dPower = Double(result["power"] as! Double)
-            WatchKitConnection.power = dPower
-            let dCadence = Double(result["cadence"] as! Double)
-            WatchKitConnection.cadence = dCadence
         }, errorHandler: { (error) in
             print(error)
         })

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

@@ -31,10 +31,6 @@ class WorkoutTracking: NSObject {
     public static var cadenceTimeStamp = NSDate().timeIntervalSince1970
     public static var cadenceLastSteps = Double()
     public static var cadenceSteps = 0
-    public static var speed = Double()
-    public static var power = Double()
-    public static var cadence = Double()
-    public static var lastDateMetric = Date()
     var sport: Int = 0
     let healthStore = HKHealthStore()
     let configuration = HKWorkoutConfiguration()
@@ -150,37 +146,14 @@ extension WorkoutTracking: WorkoutTrackingProtocol {
                 HKSampleType.workoutType()
                 ])
             
-            var infoToShare: Set<HKSampleType> = []
-            
-            if #available(watchOSApplicationExtension 10.0, *) {
-                infoToShare = Set([
-                    HKSampleType.quantityType(forIdentifier: .stepCount)!,
-                    HKSampleType.quantityType(forIdentifier: .heartRate)!,
-                    HKSampleType.quantityType(forIdentifier: .distanceCycling)!,
-                    HKSampleType.quantityType(forIdentifier: .distanceWalkingRunning)!,
-                    HKSampleType.quantityType(forIdentifier: .activeEnergyBurned)!,
-                    HKSampleType.quantityType(forIdentifier: .cyclingPower)!,
-                    HKSampleType.quantityType(forIdentifier: .cyclingSpeed)!,
-                    HKSampleType.quantityType(forIdentifier: .cyclingCadence)!,
-                    HKSampleType.quantityType(forIdentifier: .runningPower)!,
-                    HKSampleType.quantityType(forIdentifier: .runningSpeed)!,
-                    HKSampleType.quantityType(forIdentifier: .runningStrideLength)!,
-                    HKSampleType.quantityType(forIdentifier: .runningVerticalOscillation)!,
-                    HKSampleType.quantityType(forIdentifier: .walkingSpeed)!,
-                    HKSampleType.quantityType(forIdentifier: .walkingStepLength)!,
-                    HKSampleType.workoutType()
-                    ])
-            } else {
-                // Fallback on earlier versions
-                infoToShare = Set([
-                    HKSampleType.quantityType(forIdentifier: .stepCount)!,
-                    HKSampleType.quantityType(forIdentifier: .heartRate)!,
-                    HKSampleType.quantityType(forIdentifier: .distanceCycling)!,
-                    HKSampleType.quantityType(forIdentifier: .distanceWalkingRunning)!,
-                    HKSampleType.quantityType(forIdentifier: .activeEnergyBurned)!,
-                    HKSampleType.workoutType()
-                    ])
-            }
+            let infoToShare = Set([
+                HKSampleType.quantityType(forIdentifier: .stepCount)!,
+                HKSampleType.quantityType(forIdentifier: .heartRate)!,
+                HKSampleType.quantityType(forIdentifier: .distanceCycling)!,
+                HKSampleType.quantityType(forIdentifier: .distanceWalkingRunning)!,
+                HKSampleType.quantityType(forIdentifier: .activeEnergyBurned)!,				
+                HKSampleType.workoutType()
+                ])
             
             HKHealthStore().requestAuthorization(toShare: infoToShare, read: infoToRead) { (success, error) in
                 if success {
@@ -195,7 +168,6 @@ extension WorkoutTracking: WorkoutTrackingProtocol {
     }
     
     func startWorkOut() {
-        WorkoutTracking.lastDateMetric = Date()
         print("Start workout")
         configWorkout()
         workoutSession.startActivity(with: Date())
@@ -340,135 +312,6 @@ extension WorkoutTracking: HKLiveWorkoutBuilderDelegate {
                 handleSendStatisticsData(statistics)
             }
         }
-        
-        if(sport == 0) {
-            if #available(watchOSApplicationExtension 10.0, *) {            
-                let wattPerInterval = HKQuantity(unit: HKUnit.watt(),
-                                                doubleValue: WorkoutTracking.power)
-                
-                if(WorkoutTracking.lastDateMetric.distance(to: Date()) < 1) {
-                    return
-                }
-                
-                guard let powerType = HKQuantityType.quantityType(
-                    forIdentifier: .cyclingPower) else {
-                return
-                }
-                let wattPerIntervalSample = HKQuantitySample(type: powerType,
-                                                                quantity: wattPerInterval,
-                                                            start: WorkoutTracking.lastDateMetric,
-                                                            end: Date())
-                workoutBuilder.add([wattPerIntervalSample]) {(success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                }
-
-                let cadencePerInterval = HKQuantity(unit: HKUnit.count().unitDivided(by: HKUnit.second()),
-                                                    doubleValue: WorkoutTracking.cadence / 60.0)
-                
-                guard let cadenceType = HKQuantityType.quantityType(
-                    forIdentifier: .cyclingCadence) else {
-                return
-                }
-                let cadencePerIntervalSample = HKQuantitySample(type: cadenceType,
-                                                                quantity: cadencePerInterval,
-                                                            start: WorkoutTracking.lastDateMetric,
-                                                            end: Date())
-                workoutBuilder.add([cadencePerIntervalSample]) {(success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                }
-                
-                let speedPerInterval = HKQuantity(unit: HKUnit.meter().unitDivided(by: HKUnit.second()),
-                                                doubleValue: WorkoutTracking.speed * 0.277778)
-                
-                guard let speedType = HKQuantityType.quantityType(
-                    forIdentifier: .cyclingSpeed) else {
-                return
-                }
-                let speedPerIntervalSample = HKQuantitySample(type: speedType,
-                                                                quantity: speedPerInterval,
-                                                            start: WorkoutTracking.lastDateMetric,
-                                                            end: Date())
-                workoutBuilder.add([speedPerIntervalSample]) {(success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                }
-
-            } else {
-                // Fallback on earlier versions
-            }
-        } else if(sport == 1) {
-            if #available(watchOSApplicationExtension 10.0, *) {            
-                let wattPerInterval = HKQuantity(unit: HKUnit.watt(),
-                                                doubleValue: WorkoutTracking.power)
-                
-                if(WorkoutTracking.lastDateMetric.distance(to: Date()) < 1) {
-                    return
-                }
-                
-                guard let powerType = HKQuantityType.quantityType(
-                    forIdentifier: .runningPower) else {
-                return
-                }
-                let wattPerIntervalSample = HKQuantitySample(type: powerType,
-                                                                quantity: wattPerInterval,
-                                                            start: WorkoutTracking.lastDateMetric,
-                                                            end: Date())
-                workoutBuilder.add([wattPerIntervalSample]) {(success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                }
-            
-                let speedPerInterval = HKQuantity(unit: HKUnit.meter().unitDivided(by: HKUnit.second()),
-                                                doubleValue: WorkoutTracking.speed * 0.277778)
-                
-                guard let speedType = HKQuantityType.quantityType(
-                    forIdentifier: .runningSpeed) else {
-                return
-                }
-                let speedPerIntervalSample = HKQuantitySample(type: speedType,
-                                                                quantity: speedPerInterval,
-                                                            start: WorkoutTracking.lastDateMetric,
-                                                            end: Date())
-                workoutBuilder.add([speedPerIntervalSample]) {(success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                }
-
-            } else {
-                // Fallback on earlier versions
-            }
-        } else if(sport == 2) {
-            if #available(watchOSApplicationExtension 10.0, *) {                                      
-                let speedPerInterval = HKQuantity(unit: HKUnit.meter().unitDivided(by: HKUnit.second()),
-                                                doubleValue: WorkoutTracking.speed * 0.277778)
-                
-                guard let speedType = HKQuantityType.quantityType(
-                    forIdentifier: .walkingSpeed) else {
-                return
-                }
-                let speedPerIntervalSample = HKQuantitySample(type: speedType,
-                                                                quantity: speedPerInterval,
-                                                            start: WorkoutTracking.lastDateMetric,
-                                                            end: Date())
-                workoutBuilder.add([speedPerIntervalSample]) {(success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                }
-
-            } else {
-                // Fallback on earlier versions
-            }
-        }
-        
-        WorkoutTracking.lastDateMetric = Date()
     }
     
     func workoutBuilderDidCollectEvent(_ workoutBuilder: HKLiveWorkoutBuilder) {

docs/10_Installation.md

@@ -10,7 +10,7 @@ These instructions build the app itself, not the test project.
 
 ```buildoutcfg
 $ sudo apt update && sudo apt upgrade # this is very important on raspberry pi: you need the bluetooth firmware updated!
-$ sudo apt install git qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtbase5-private-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qml-module* libqt5texttospeech5-dev libqt5texttospeech5 libqt5location5-plugins qtlocation5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 g++ make
+$ sudo apt install git qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qml-module* libqt5texttospeech5-dev libqt5texttospeech5 libqt5location5-plugins qtlocation5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 g++ make
 $ git clone https://github.com/cagnulein/qdomyos-zwift.git
 $ cd qdomyos-zwift
 $ git submodule update --init src/smtpclient/
@@ -28,7 +28,7 @@ $ sudo ./qdomyos-zwift
 You will need to (at a minimum) to install the xcode Command Line Tools (CLI) thanks to @richardwait
 https://developer.apple.com/download/more/?=xcode
 
-Download and install https://download.qt.io/archive/qt/5.12/5.12.12/qt-opensource-mac-x64-5.12.12.dmg and simply run the qdomyos-zwift release for MacOs
+Download and install http://download.qt.io/official_releases/qt/5.12/5.12.9/qt-opensource-mac-x64-5.12.9.dmg and simply run the qdomyos-zwift release for MacOs
 
 ## On Raspberry Pi Zero W
 
@@ -77,7 +77,7 @@ Apply the changes `sudo systemctl restart dhcpcd.service` and ensure you have in
 
 #### Enable SSH access
 
-You might want to access your raspberry remotely while it is attached to your fitness equipment. 
+You might want to access your raspberry remotely while it is attached to your fitness equipement. 
 
 `sudo raspi-config` > `Interface Options` > `SSH`
 
@@ -106,7 +106,7 @@ This operation takes a moment to complete.
 #### Install qdomyos-zwift from sources
 
 ```bash
-sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtbase5-private-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 qtlocation5-dev qtquickcontrols2-5-dev libqt5texttospeech5-dev libqt5texttospeech5 g++ make
+sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 qtlocation5-dev qtquickcontrols2-5-dev libqt5texttospeech5-dev libqt5texttospeech5 g++ make
 git clone https://github.com/cagnulein/qdomyos-zwift.git
 cd qdomyos-zwift
 git submodule update --init src/smtpclient/  
@@ -117,11 +117,6 @@ qmake qdomyos-zwift.pro
 make  
 ```
 
-If you need GUI also do a
-```
-apt install qml-module*
-```
-
 Please note :
 - Don't build the application with `-j4` option (this will fail)
 - Build operation is circa 45 minutes (subsequent builds are faster)
@@ -180,7 +175,7 @@ Then reboot to check operations (`sudo reboot`)
 
 ### (optional) Enable overlay FS
 
-Once that everything is working as expected, and if you dedicate your Raspberry pi to this usage, you might want to enable the read-only overlay FS.
+Once that everything is working as expected, and if you dedicate your raspeberry pi to this usage, you might want to enable the read-only overlay FS.
 
 By enabling the overlay read-only system, your SD card will be read-only only and every file written will be to RAM.
 Then at each reboot the RAM is erased and you'll revert to the initial status of the overlay file-system.

docs/30_usage.md

@@ -18,7 +18,7 @@ Please refer to this article for more information under [QML Operations](https:/
 
 ## Configuration in NativeQT mode
 
-This is the list of settings available in the application. These settings need to be appended to the binary command line.  
+This is the list of settings available in the application. These settings needs to be appended to the binary command line.  
 *Example :* `sudo ./qdomyos-zwift -no-gui` for disabling any graphical interface.
 
 | **Option**              		| **Type** | **Default** | **Function**                                                                 |
@@ -35,8 +35,8 @@ This is the list of settings available in the application. These settings need t
 | -heart-service          		| Boolean  | True        | Simulate HR service (required for applications not reading FTMS)             |
 | -only-virtualbike       		| Boolean  | False       |                                                                              |
 | -only-virtualtreadmill  		| Boolean  | False       |                                                                              |
-| -no-reconnection        		| Boolean  | False       | QZ will not try to reconnect your fitness equipment if enabled              |
-| -bluetooth-relaxed      		| Boolean  | False       | In case of deconnections from QZ to your fitness equipment                  |
+| -no-reconnection        		| Boolean  | False       | QZ will not try to reconnect your fitness equipement if enabled              |
+| -bluetooth-relaxed      		| Boolean  | False       | In case of deconnections from QZ to your fitness equipement                  |
 | -bike-cadence-sensor    		| Boolean  | False       |                                                                              |
 | -bike-power-sensor      		| Boolean  | False       |                                                                              |
 | -battery-service        		| Boolean  | False       |                                                                              |
@@ -45,7 +45,7 @@ This is the list of settings available in the application. These settings need t
 | -run-cadence-sensor     		| Boolean  | False       |                                                                              |
 | -nordictrack-10-treadmill  	| Boolean  | False       | Enable NordicTrack compatibility mode                                        |
 | -train                  		| String   |             | Force training program                                                       |
-| -name                   		| String   |             | Force bluetooth device name (if QZ struggles to find your fitness equipment) |
+| -name                   		| String   |             | Force bluetooth device name (if QZ struggles finding your fitness equipment) |
 | -poll-device-time       		| Int      | 200 (ms)    | Frequency to refresh information from QZ to Fitness equipment               |
 | -bike-resistance-gain   		| Int      |             | Adjust resistance from the fitness application                               |
 | -bike-resistance-offset 		| Int      |             | Set another resistance point than default                                    |

docs/50_writing_tests.md

@@ -1,396 +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 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

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

helpers/wireshark-json-filter.py

@@ -1,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/binary/msvc2019/Qt5Bluetooth.prl

@@ -1,5 +0,0 @@
-QMAKE_PRL_BUILD_DIR = C:/qt-everywhere-src-5.15.2/qtconnectivity/src/bluetooth
-QMAKE_PRO_INPUT = bluetooth.pro
-QMAKE_PRL_TARGET = Qt5Bluetooth.lib
-QMAKE_PRL_CONFIG = lex yacc depend_includepath testcase_targets import_plugins import_qpa_plugin windows prepare_docs qt_docs_targets qt_build_extra file_copies qmake_use qt warn_on release link_prl flat debug_and_release precompile_header autogen_precompile_source embed_manifest_dll embed_manifest_exe shared shared release no_plugin_manifest win32 msvc copy_dir_files sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl compile_examples f16c force_debug_info largefile precompile_header rdrnd rdseed shani x86SimdAlways prefix_build force_independent utf8_source create_prl link_prl no_private_qt_headers_warning QTDIR_build qt_example_installs exceptions_off testcase_exceptions release ReleaseBuild Release build_pass c++11 generated_privates relative_qt_rpath target_qt c++11 strict_c++ c++14 c++1z qt_install_headers need_fwd_pri qt_install_module debug_and_release build_all create_cmake skip_target_version_ext release ReleaseBuild Release build_pass have_target dll exclusive_builds debug_info no_autoqmake thread moc resources
-QMAKE_PRL_VERSION = 5.15.2

qt-patches/windows/5.15.2/binary/msvc2019/Qt5Bluetoothd.prl

@@ -1,5 +0,0 @@
-QMAKE_PRL_BUILD_DIR = C:/qt-everywhere-src-5.15.2/qtconnectivity/src/bluetooth
-QMAKE_PRO_INPUT = bluetooth.pro
-QMAKE_PRL_TARGET = Qt5Bluetoothd.lib
-QMAKE_PRL_CONFIG = lex yacc debug depend_includepath testcase_targets import_plugins import_qpa_plugin windows prepare_docs qt_docs_targets qt_build_extra file_copies qmake_use qt warn_on link_prl flat debug_and_release precompile_header autogen_precompile_source embed_manifest_dll embed_manifest_exe shared shared no_plugin_manifest win32 msvc copy_dir_files sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl compile_examples f16c force_debug_info largefile precompile_header rdrnd rdseed shani x86SimdAlways prefix_build force_independent utf8_source create_prl link_prl no_private_qt_headers_warning QTDIR_build qt_example_installs exceptions_off testcase_exceptions debug DebugBuild Debug build_pass c++11 generated_privates relative_qt_rpath target_qt c++11 strict_c++ c++14 c++1z qt_install_headers need_fwd_pri qt_install_module debug_and_release build_all create_cmake skip_target_version_ext debug DebugBuild Debug build_pass have_target dll no_plist exclusive_builds debug_info no_autoqmake thread moc resources
-QMAKE_PRL_VERSION = 5.15.2

src/ChartFooter.qml

@@ -1,25 +0,0 @@
-import QtQuick 2.7
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.0
-import Qt.labs.settings 1.0
-
-ColumnLayout {    
-    anchors.fill: parent
-    Loader {
-        id: chartFooterLoader
-        sourceComponent: ChartFooterInnerJS
-        anchors.fill: parent
-        active: false
-    }
-
-    Loader {
-        anchors.fill: parent
-        source: CHARTJS ? "ChartFooterInnerJS.qml":"ChartFooterInnerNoJS.qml"
-        onLoaded: {
-            if(CHARTJS) {
-                chartFooterLoader.active = true;
-            }
-        }
-    }
-}

src/ChartFooterInnerJS.qml

@@ -1,31 +0,0 @@
-import QtQuick 2.7
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.0
-import Qt.labs.settings 1.0
-import QtWebView 1.1
-
-ColumnLayout {
-    anchors.fill: parent
-    Settings {
-        id: settings
-    }
-    WebView {
-        id: webView
-        anchors.fill: parent
-        url: "http://localhost:" + settings.value("template_inner_QZWS_port") + "/chartjs/chartlive.htm"
-        visible: rootItem.chartFooterVisible
-        onLoadingChanged: {
-            if (loadRequest.errorString) {
-                console.error(loadRequest.errorString);
-                console.error("port " + settings.value("template_inner_QZWS_port"));
-            }
-        }
-        onVisibleChanged: {
-            console.log("onVisibleChanged" + visible)
-            if(visible === true) {
-                reload();
-            }
-        }
-    }
-}

src/ChartFooterInnerNoJS.qml

@@ -1,12 +0,0 @@
-import QtQuick 2.7
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.0
-import Qt.labs.settings 1.0
-
-ColumnLayout {
-    anchors.fill: parent
-    Settings {
-        id: settings
-    }
-}

src/Computrainer.h

@@ -37,9 +37,12 @@
 #include <QThread>
 
 #ifdef WIN32
-#include <windows.h>
+#include <windef.h>
+#endif
 
+#ifdef WIN32
 #include <winbase.h>
+#include <windows.h>
 #else
 #include <sys/ioctl.h>
 #include <termios.h> // unix!!

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=