trying fixing virtual ifit (not tested)

.github/FUNDING.yml

@@ -7,6 +7,6 @@ ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
-issuehunt: cagnulein
+issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: ['https://www.buymeacoffee.com/cagnulein'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/stale.yml

@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 15
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-#closeComment: false

.github/workflows/main.yml

@@ -4,7 +4,6 @@ name: CI
 
 env:
   DISPLAY: ':99'
-  ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
@@ -14,264 +13,13 @@ on:
     branches: [ master,  github-workflow-playground ]
   pull_request:
     branches: [ master ]
-#  schedule:
-#    - cron: "0 */12 * * *"
+  schedule:
+    - cron: "0 */12 * * *"    
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  window-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 submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: microsoft/MSIX-Toolkit
-          path: "src/MSIX-Toolkit/"
-          ref: b82af826d29e93e4c85d34fad8a405b6c49905e7
-
-      - 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.10.11
-      - name: download python and paddleocr
-        run: |
-          python -VV
-          python -m pip install opencv-python
-          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
-        with:
-          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-qt5-webview
-          msystem: mingw64
-          release: false
-
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.9
-        with:
-          cmake-version: '3.20.x'
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: '5.15.2'
-          host: 'windows'
-          modules: 'qtnetworkauth qtcharts'
-          target: "desktop"
-          arch: win64_mingw81
-          dir: "${{github.workspace}}/qt/"
-          install-deps: "true"
-          cache: 'true'
-          cache-key-prefix: 'install-qt-action-windows'          
-
-      - name: download 3rd party files for qthttpserver
-        run: |
-            cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
-
-      - name: Build qthttpserver
-        run: |
-            cd src\qthttpserver 
-            qmake
-            make -j8
-            make install
-            cd ../..
-
-      - name: 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
-            mkdir appx
-            cp qdomyos-zwift.exe output/
-            cd output
-            windeployqt --qmldir ../../ qdomyos-zwift.exe
-            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 .
-            mkdir adb
-            mkdir python
-            Copy-Item -Path C:\hostedtoolcache\windows\Python\3.10.11\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: |
-            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
-            mkdir appx
-            cp qdomyos-zwift.exe output/
-            cd output
-            windeployqt --qmldir ../../ qdomyos-zwift.exe
-            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 .
-            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: Zip artifact for deployment
-        run: Compress-Archive src/debug/output release.zip
-
-      - name: Archive windows binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: windows-binary
-          path: release.zip
-        if: matrix.config.python
-
-      - name: Archive windows binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: windows-binary-no-python
-          path: release.zip
-        if:  ${{ ! matrix.config.python }}
-
-#  window-steam-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: msys2/setup-msys2@v2
-#        with:
-#          install: mingw-w64-x86_64-toolchain
-#          msystem: mingw64
-#          release: false
-#
-#      - name: Setup cmake
-#        uses: jwlawson/actions-setup-cmake@v1.9
-#        with:
-#          cmake-version: '3.20.x'
-#
-#      - name: Install Qt
-#        uses: jurplel/install-qt-action@v2
-#        with:
-#          version: '5.15.2'
-#          host: 'windows'
-#          modules: 'qtnetworkauth qtcharts'
-#          target: "desktop"
-#          arch: win64_mingw81
-#          dir: "${{github.workspace}}/qt/"
-#          install-deps: "true"
-#
-#      - 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
-#            echo "#define STEAM_STORE" >> secret.h
-#            cd ..
-#            make -j8
-#            cd src/debug
-#            mkdir output
-#            mkdir appx
-#            cp qdomyos-zwift.exe output/
-#            cd output
-#            windeployqt --qmldir ../../ qdomyos-zwift.exe
-#            cp "${{github.workspace}}/qt/Qt/5.15.2/mingw81_64/bin/libwinpthread-1.dll" .
-#            cp "${{github.workspace}}/qt/Qt/5.15.2/mingw81_64/bin/libgcc_s_seh-1.dll" .
-#            cp "${{github.workspace}}/qt/Qt/5.15.2/mingw81_64/bin/libstdc++-6.dll" .
-#
-#      - uses: game-ci/steam-deploy@v1
-#        with:
-#          username: ${{ secrets.STEAM_USERNAME }}
-#          password: ${{ secrets.STEAM_PASSWORD }}
-#          configVdf: ${{ secrets.STEAM_CONFIG_VDF}}
-#          ssfnFileName: ${{ secrets.STEAM_SSFN_FILE_NAME }}
-#          ssfnFileContents: ${{ secrets.STEAM_SSFN_FILE_CONTENTS }}
-#          appId: 2267200
-#          buildDescription: 2.12
-#          rootPath: src/debug/output
-#          depot1Path: ./
-#          #depot2Path: StandaloneLinux64
-#          releaseBranch: prerelease
-
   # This workflow contains a single job called "build"
-  linux-x86-build:
+  build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -294,7 +42,7 @@ jobs:
       - name: Xvfb install and run
         run: |
           sudo apt-get install -y xvfb
-          Xvfb -ac ${{ env.DISPLAY }} -screen 0 1280x780x24 &
+          Xvfb -ac ${{ env.DISPLAY }} -screen 0 1280x780x24 &    
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
@@ -303,73 +51,18 @@ jobs:
         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 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
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: '5.15.2'
-          host: 'linux'
-          modules: 'qtnetworkauth qtcharts'
-          cache: 'true'
-          cache-key-prefix: 'install-qt-action-linux'                    
-
-      - name: download 3rd party files for qthttpserver
-        run: |
-            cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
-
-      - name: Build qthttpserver
-        run: |
-            cd src/qthttpserver 
-            qmake
-            make -j8
-            make install
-            cd ../..
-
+        run: sudo apt update -y && sudo apt-get install -y qt5-default libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-default libqt5networkauth5-dev libqt5websockets5* libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev
+      
       - name: Compile Linux Desktop
-        run: qmake; make -j8
-
+        run: cd src; qmake; make -j8
+        
       - name: Archive linux-desktop binary
         uses: actions/upload-artifact@v2
         with:
           name: linux-desktop-binary
-          path: src/qdomyos-zwift         
-
-      - name: Test
-        run: cd tst; GTEST_OUTPUT=xml:test-results/ GTEST_COLOR=1 ./qdomyos-zwift-tests; cd ..
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: test_results_xml
-          path: tst/test-results/**/*.xml               
+          path: src/qdomyos-zwift              
 
 #      - name: Test Peloton API
 #        if: github.event_name == 'push' || github.event_name == 'schedule'
@@ -410,7 +103,7 @@ jobs:
 #          modules: 'qtcharts debug_info'
 #          dir: '${{ github.workspace }}/output/android/'
 #          cached: ${{ steps.cache-qt-android.outputs.cache-hit }}
-
+      
 #      - name: Compile Android
 #        run: cd src; qmake; make -j4
 
@@ -422,183 +115,6 @@ jobs:
 #          target: 'desktop'
 #          modules: 'qtcharts debug_info'
 #          dir: '${{ github.workspace }}/output/macos/'
-
+      
 #      - name: Compile MacOS
 #        run: cd src; qmake; make -j4
-
-
-  # This workflow contains a single job called "build"
-  android-build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-#      - name: Cache Qt Linux Desktop
-#        id: cache-qt-linux-desktop
-#        uses: actions/cache@v1
-#        with:
-#          path: '${{ github.workspace }}/output/linux-desktop/'
-#          key: ${{ runner.os }}-QtCache-Linux-Desktop
-
-#      - name: Cache Qt Linux Android
-#        id: cache-qt-android
-#        uses: actions/cache@v1
-#        with:
-#          path: '${{ github.workspace }}/output/android/'
-#          key: ${{ runner.os }}-QtCache-Android
-
-      - name: Xvfb install and run
-        run: |
-          sudo apt-get install -y xvfb
-          Xvfb -ac ${{ env.DISPLAY }} -screen 0 1280x780x24 &
-
-      # 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:
-          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
-
-#      - name: Test Peloton API
-#        if: github.event_name == 'push' || github.event_name == 'schedule'
-#        run: cd /home/runner/work/qdomyos-zwift/qdomyos-zwift/src/; ./qdomyos-zwift -test-peloton -peloton-username ${{ secrets.peloton_username }} -peloton-password ${{ secrets.peloton_password }}
-#        timeout-minutes: 2
-
-#      - name: Test Home Fitness Buddy API
-#        run: cd /home/runner/work/qdomyos-zwift/qdomyos-zwift/src/; ./qdomyos-zwift -test-hfb
-#        timeout-minutes: 2
-
-#      - uses: actions/checkout@v2
-#        with:
-#          repository: nttld/setup-ndk
-#          path: setup-ndk
-      # The packages.json in nttld/setup-ndk has already been updated,
-      # https://github.com/nttld/setup-ndk/commit/831db5b02a0f0cab80614619efe461a3dcc140e6
-      # but `dist/*` has not been rebuilt yet. Build it.
-      # https://github.com/nttld/setup-ndk/tree/main/dist
-#      - name: Locally rebuilt setup-ndk
-#        run: |
-#          npm -prefix ./setup-ndk install
-#          npm -prefix ./setup-ndk run all
-      # Install using locally rebuilt setup-ndk
-#      - name: Setup Android NDK r21d
-#        uses: ./setup-ndk
-      #- uses: nttld/setup-ndk@v1
-#        with:
-#          ndk-version: r21d
-
-# waiting github.com/jurplel/install-qt-action/issues/63
-      - name: Install Qt Android
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: '5.15.2'
-          host: 'linux'
-          target: 'android'
-          arch: 'android'
-          modules: 'qtcharts  qtnetworkauth'
-          dir: '${{ github.workspace }}/output/android/'
-          cache: 'true'
-          cache-key-prefix: 'install-qt-action-android'                    
-
-      - name: Install Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '11'
-
-      - name: Set Android NDK 21 && build
-        run: |
-          # Install NDK 21 after GitHub update
-          # https://github.com/actions/virtual-environments/issues/5595
-          ANDROID_ROOT="/usr/local/lib/android"
-          ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk"
-          SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager"
-          echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-          export ANDROID_NDK="${ANDROID_SDK_ROOT}/ndk-bundle"
-          export ANDROID_NDK_ROOT="${ANDROID_NDK}"
-
-          ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK
-          rm -rf /usr/local/lib/android/sdk/ndk/25.1.8937393
-          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
-
-      - 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
-
-  ios-build:
-    # The type of runner that the job will run on
-    runs-on: macos-latest
-
-    steps:
-      # 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:
-          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 Qt iOS
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: '5.15.2'
-          host: 'mac'
-          target: 'ios'
-          modules: 'qtcharts  qtnetworkauth'
-          dir: '${{ github.workspace }}/output/ios/'
-          cache: 'true'
-          cache-key-prefix: 'install-qt-action-ios'                    
-          
-      - name: fix qt
-        run: find ${{ github.workspace }}/output/ios/ -name 'ios.conf' -exec sed -i '' 's/ios-simulator/iphonesimulator/g' {} \;
-      
-      - name: fix qt
-        run: find ${{ github.workspace }}/output/ios/ -name 'devices.py' -exec sed -i '' 's/\/usr\/bin\/python/\/usr\/bin\/python3/g' {} \;        
-
-      - name: fix qt
-        run: find ./ -name 'qdomyos-zwift-lib.pro' -exec sed -i '' 's/TARGET = qdomyos-zwift/TARGET = qdomyoszwift/g' {} \;                
-
-      - name: patching qt for bluetooth
-        run: cp qt-patches/ios/5.15.2/binary/*.* ${{ github.workspace }}/output/ios/Qt/5.15.2/ios/lib/
-
-      - name: Build
-        run: qmake CONFIG+=debug && make -j4
-

.gitignore

@@ -18,14 +18,9 @@ src/build/*
 
 src/debug-*
 
-src/secret.h
-
 *.swo
 *.swp
 
-build-qdomyos-zwift-Android_Qt_5_15_2_Clang_Multi_Abi-Debug/*
-**/node_modules/*
-
 template-examples/youtube-viewer/node_modules/*
 template-examples/youtube-viewer/*.json
 template-examples/youtube-viewer/.eslintrc.js
@@ -38,14 +33,3 @@ template-examples/train-program-saver/*.json
 template-examples/train-program-saver/.eslintrc.js
 template-examples/train-program-saver/.jshintrc
 template-examples/train-program-saver/debug.js
-
-google_test/*
-
-# Qt-es
-*.pro.user
-*build-*
-!build-qdomyos-zwift-Qt_*_for_iOS-Debug # Needed for Apple Watch
-src/inner_templates/googlemaps/cesium-key.js
-*.autosave
-.vscode/settings.json
-/tst/Devices/.vs

.gitmodules

@@ -3,13 +3,4 @@
 	url = https://github.com/KDAB/android_openssl.git
 [submodule "src/smtpclient"]
 	path = src/smtpclient
-	url = https://github.com/cagnulein/SmtpClient-for-Qt.git
-	branch = cagnulein-patch-2
-[submodule "src/qmdnsengine"]
-	path = src/qmdnsengine
-	url = https://github.com/cagnulein/qmdnsengine.git
-	branch = zwift
-[submodule "tst/googletest"]
-	path = tst/googletest
-	url = https://github.com/google/googletest.git
-	branch = tags/release-1.12.1
+	url = https://github.com/bluetiger9/SmtpClient-for-Qt.git

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-roberto.viola83@gmail.com.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

QZ_ESP32/QZ_ESP32.ino

@@ -1,437 +0,0 @@
-/** NimBLE_Server Demo:
- *
-This is working to broadcast Power and Cadence under the Cycling Power Service Profile
-Data tested against Edge and Phone
- * 
-*/
-#include <Arduino.h>
-#include <NimBLEDevice.h>
-
-short powerInstantaneous = 0;
-short cadenceInstantaneous = 0;
-short speedInstantaneous = 0;
-float powerScale = 1.28; // incoming power is multiplied by this value for correction
-short resistance = 0; //Not currently doing anything with this value after receiving it
-bool notify = false;
-
-// Define stuff for the Client that will receive data from Fitness Machine
-// The remote service we wish to connect to.
-static BLEUUID serviceUUID("1826"); // Fitness Machine
-// The characteristic of the remote service we are interested in.
-static BLEUUID charUUID("2ad2"); // Indoor Bike (Fitness Machine)
-
-
-static BLEUUID HRserviceUUID("180D"); // HR Service
-static BLEUUID HRcharUUID("2a37"); // HR Measuremente
-
-static boolean doConnect = false;
-static boolean connected = false;
-static boolean doScan = false;
-static BLERemoteCharacteristic *pRemoteCharacteristic;
-static BLEAdvertisedDevice *myDevice;
-/* 
- * Server Stuff
- */
-static NimBLEServer *pServer;
-/**  None of these are required as they will be handled by the library with defaults. **
- **                       Remove as you see fit for your needs                        */
-class ServerCallbacks : public NimBLEServerCallbacks
-{
-  void onConnect(NimBLEServer *pServer)
-  {
-    Serial.println("Client connected");
-    Serial.println("Multi-connect support: start advertising");
-    NimBLEDevice::startAdvertising();
-  };
-  /** Alternative onConnect() method to extract details of the connection. 
-     *  See: src/ble_gap.h for the details of the ble_gap_conn_desc struct.
-     */
-  void onConnect(NimBLEServer *pServer, ble_gap_conn_desc *desc)
-  {
-    Serial.print("Client address: ");
-    Serial.println(NimBLEAddress(desc->peer_ota_addr).toString().c_str());
-    /** We can use the connection handle here to ask for different connection parameters.
-         *  Args: connection handle, min connection interval, max connection interval
-         *  latency, supervision timeout.
-         *  Units; Min/Max Intervals: 1.25 millisecond increments.
-         *  Latency: number of intervals allowed to skip.
-         *  Timeout: 10 millisecond increments, try for 5x interval time for best results.  
-         */
-    pServer->updateConnParams(desc->conn_handle, 24, 48, 0, 60);
-  };
-  void onDisconnect(NimBLEServer *pServer)
-  {
-    Serial.println("Client disconnected - start advertising");
-    NimBLEDevice::startAdvertising();
-  };
-  void onMTUChange(uint16_t MTU, ble_gap_conn_desc *desc)
-  {
-    Serial.printf("MTU updated: %u for connection ID: %u\n", MTU, desc->conn_handle);
-  };
-};
-
-/** Handler class for characteristic actions */
-class CharacteristicCallbacks : public NimBLECharacteristicCallbacks
-{
-  void onRead(NimBLECharacteristic *pCharacteristic)
-  {
-    Serial.print(pCharacteristic->getUUID().toString().c_str());
-    Serial.print(": onRead(), value: ");
-    Serial.println(pCharacteristic->getValue().c_str());
-  };
-
-  void onWrite(NimBLECharacteristic *pCharacteristic)
-  {
-    Serial.print(pCharacteristic->getUUID().toString().c_str());
-    Serial.print(": onWrite(), value: ");
-    Serial.println(pCharacteristic->getValue().c_str());
-  };
-  /** Called before notification or indication is sent, 
-     *  the value can be changed here before sending if desired.
-     */
-  void onNotify(NimBLECharacteristic *pCharacteristic)
-  {
-    Serial.println("Sending notification to clients");
-  };
-
-  /** The status returned in status is defined in NimBLECharacteristic.h.
-     *  The value returned in code is the NimBLE host return code.
-     */
-  void onStatus(NimBLECharacteristic *pCharacteristic, Status status, int code)
-  {
-    String str = ("Notification/Indication status code: ");
-    str += status;
-    str += ", return code: ";
-    str += code;
-    str += ", ";
-    str += NimBLEUtils::returnCodeToString(code);
-    Serial.println(str);
-  };
-
-  void onSubscribe(NimBLECharacteristic *pCharacteristic, ble_gap_conn_desc *desc, uint16_t subValue)
-  {
-    String str = "Client ID: ";
-    str += desc->conn_handle;
-    str += " Address: ";
-    str += std::string(NimBLEAddress(desc->peer_ota_addr)).c_str();
-    if (subValue == 0)
-    {
-      str += " Unsubscribed to ";
-    }
-    else if (subValue == 1)
-    {
-      str += " Subscribed to notifications for ";
-    }
-    else if (subValue == 2)
-    {
-      str += " Subscribed to indications for ";
-    }
-    else if (subValue == 3)
-    {
-      str += " Subscribed to notifications and indications for ";
-    }
-    str += std::string(pCharacteristic->getUUID()).c_str();
-
-    Serial.println(str);
-  };
-};
-
-/** Handler class for descriptor actions */
-class DescriptorCallbacks : public NimBLEDescriptorCallbacks
-{
-  void onWrite(NimBLEDescriptor *pDescriptor)
-  {
-    std::string dscVal((char *)pDescriptor->getValue(), pDescriptor->getLength());
-    Serial.print("Descriptor witten value:");
-    Serial.println(dscVal.c_str());
-  };
-
-  void onRead(NimBLEDescriptor *pDescriptor)
-  {
-    Serial.print(pDescriptor->getUUID().toString().c_str());
-    Serial.println(" Descriptor read");
-  };
-};
-/* 
- * Client Stuff
- */
-// This callback is for when data is received from Server
-static void notifyCallback(
-    BLERemoteCharacteristic *pBLERemoteCharacteristic,
-    uint8_t *pData,
-    size_t length,
-    bool isNotify)
-{
-  powerInstantaneous = pData[8] | pData[9] << 8;       // 2 bytes of power
-  cadenceInstantaneous = 60; //(pData[4] | pData[5] << 8) / 2; // 2 bytes of power in 0.5 resolution RPM, convert to RPM
-  resistance = pData[6];                                 // 1 byte of resistance
-  Serial.printf("Power = %d | Cadence = %d | Resistance = %d\n", powerInstantaneous, cadenceInstantaneous, resistance);
-}
-
-/**  None of these are required as they will be handled by the library with defaults. **
- **                       Remove as you see fit for your needs                        */
-class MyClientCallback : public BLEClientCallbacks
-{
-  void onConnect(BLEClient *pclient)
-  {
-  }
-
-  void onDisconnect(BLEClient *pclient)
-  {
-    connected = false;
-    Serial.println("onDisconnect");
-  }
-};
-
-bool connectToServer()
-{
-  Serial.print("Forming a connection to ");
-  Serial.println(myDevice->getAddress().toString().c_str());
-
-  BLEClient *pClient = BLEDevice::createClient();
-  Serial.println(" - Created client");
-
-  pClient->setClientCallbacks(new MyClientCallback());
-
-  // Connect to the remove BLE Server.
-  pClient->connect(myDevice); // if you pass BLEAdvertisedDevice instead of address, it will be recognized type of peer device address (public or private)
-  Serial.println(" - Connected to server");
-
-  // Obtain a reference to the service we are after in the remote BLE server.
-  BLERemoteService *pRemoteService = pClient->getService(serviceUUID);
-  if (pRemoteService == nullptr)
-  {
-    Serial.print("Failed to find our service UUID: ");
-    Serial.println(serviceUUID.toString().c_str());
-    pClient->disconnect();
-    return false;
-  }
-  Serial.println(" - Found our service");
-
-  // Obtain a reference to the characteristic in the service of the remote BLE server.
-  pRemoteCharacteristic = pRemoteService->getCharacteristic(charUUID);
-  if (pRemoteCharacteristic == nullptr)
-  {
-    Serial.print("Failed to find our characteristic UUID: ");
-    Serial.println(charUUID.toString().c_str());
-    pClient->disconnect();
-    return false;
-  }
-  Serial.println(" - Found our characteristic");
-
-  // Read the value of the characteristic.
-  if (pRemoteCharacteristic->canRead())
-  {
-    std::string value = pRemoteCharacteristic->readValue();
-    Serial.print("The characteristic value was: ");
-    Serial.println(value.c_str());
-  }
-
-  if (pRemoteCharacteristic->canNotify())
-    pRemoteCharacteristic->registerForNotify(notifyCallback);
-
-  connected = true;
-  return true;
-}
-
-/**
- * Scan for BLE servers and find the first one that advertises the service we are looking for.
- */
-class MyAdvertisedDeviceCallbacks : public BLEAdvertisedDeviceCallbacks
-{
-  /**
-   * Called for each advertising BLE server.
-   */
-
-  /*** Only a reference to the advertised device is passed now
-  void onResult(BLEAdvertisedDevice advertisedDevice) { **/
-  void onResult(BLEAdvertisedDevice *advertisedDevice)
-  {
-    Serial.print("BLE Advertised Device found: ");
-    Serial.println(advertisedDevice->toString().c_str());
-
-    // We have found a device, let us now see if it contains the service we are looking for.
-    /********************************************************************************
-    if (advertisedDevice.haveServiceUUID() && advertisedDevice.isAdvertisingService(serviceUUID)) {
-********************************************************************************/
-    if (advertisedDevice->haveServiceUUID() && advertisedDevice->isAdvertisingService(serviceUUID))
-    {
-
-      BLEDevice::getScan()->stop();
-      /*******************************************************************
-      myDevice = new BLEAdvertisedDevice(advertisedDevice);
-*******************************************************************/
-      myDevice = advertisedDevice; /** Just save the reference now, no need to copy the object */
-      doConnect = true;
-      doScan = true;
-
-    } // Found our server
-  }   // onResult
-};    // MyAdvertisedDeviceCallbacks
-
-//delays for X ms, should not block execution
-void softDelay(unsigned long delayTime)
-{
-  unsigned long startTime = millis();
-  while ((millis() - startTime) < delayTime)
-  {
-    //wait
-  }
-}
-
-/** Define callback instances globally to use for multiple Characteristics \ Descriptors */
-// This section is for the Server that will broadcast the data as Cycling Power
-static DescriptorCallbacks dscCallbacks;
-static CharacteristicCallbacks chrCallbacks;
-NimBLECharacteristic *CyclingPowerFeature = NULL;
-NimBLECharacteristic *CyclingPowerMeasurement = NULL;
-NimBLECharacteristic *CyclingPowerSensorLocation = NULL;
-NimBLECharacteristic *HRMeasurement = NULL;
-unsigned char bleBuffer[8];
-unsigned char slBuffer[1];
-unsigned char fBuffer[4];
-unsigned short revolutions = 0;
-unsigned short timestamp = 0;
-unsigned short flags = 0x20;
-byte sensorlocation = 0x0D;
-long lastNotify = 0;
-long lastRevolution = 0;
-
-void setup()
-{
-  Serial.begin(115200);
-  Serial.println("Starting NimBLE Server");
-
-  /** sets device name */
-  NimBLEDevice::init("QZESP");
-  /** Optional: set the transmit power, default is 3db */
-  NimBLEDevice::setPower(ESP_PWR_LVL_P9); /** +9db */
-
-  pServer = NimBLEDevice::createServer();
-  pServer->setCallbacks(new ServerCallbacks());
-
-  fBuffer[0] = 0x00;
-  fBuffer[1] = 0x00;
-  fBuffer[2] = 0x00;
-  fBuffer[3] = 0x08;
-
-  slBuffer[0] = sensorlocation & 0xff;
-
-  NimBLEService *pDeadService = pServer->createService("1818");
-  CyclingPowerFeature = pDeadService->createCharacteristic(
-      "2A65",
-      NIMBLE_PROPERTY::READ);
-  CyclingPowerSensorLocation = pDeadService->createCharacteristic(
-      "2A5D",
-      NIMBLE_PROPERTY::READ);
-  CyclingPowerMeasurement = pDeadService->createCharacteristic(
-      "2A63",
-      NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
-
-  CyclingPowerFeature->setValue(fBuffer, 4);
-  CyclingPowerSensorLocation->setValue(slBuffer, 1);
-  CyclingPowerMeasurement->setValue(slBuffer, 1);
-
-  /** Start the services when finished creating all Characteristics and Descriptors */
-  pDeadService->start();
-
-#if 0
-  // HR service
-  NimBLEService *pHRService = pServer->createService("180D");
-  HRMeasurement = pHRService->createCharacteristic(
-      "2A37",
-      NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
-
-  HRMeasurement->setValue(fBuffer, 2);
-
-  /** Start the services when finished creating all Characteristics and Descriptors */
-  pHRService->start();  
-#endif
-
-  NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
-  /** Add the services to the advertisement data **/
-//  pAdvertising->addServiceUUID(pHRService->getUUID());
-  pAdvertising->addServiceUUID(pDeadService->getUUID());  
-  pAdvertising->setScanResponse(true);
-  pAdvertising->start();
-
-  Serial.println("Advertising Started");
-
-  Serial.println("Starting Arduino BLE Client application...");
-  BLEDevice::init("");
-
-  // Retrieve a Scanner and set the callback we want to use to be informed when we
-  // have detected a new device.  Specify that we want active scanning and start the
-  // scan to run for 5 seconds.
-  BLEScan *pBLEScan = BLEDevice::getScan();
-  pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks());
-  pBLEScan->setInterval(1349);
-  pBLEScan->setWindow(449);
-  pBLEScan->setActiveScan(true);
-  pBLEScan->start(5, false);
-}
-
-void loop()
-{
-  // If the flag "doConnect" is true then we have scanned for and found the desired
-  // BLE Server with which we wish to connect.  Now we connect to it.  Once we are
-  // connected we set the connected flag to be true.
-  if (doConnect == true)
-  {
-    if (connectToServer())
-    {
-      Serial.println("We are now connected to the BLE Server.");
-    }
-    else
-    {
-      Serial.println("We have failed to connect to the server; there is nothing more we will do.");
-    }
-    doConnect = false;
-  }
-  // If we are connected to a peer BLE Server, update the characteristic each time we are reached
-  // with the current time since boot.
-  if (connected)
-  {
-    //Stuff to do when connected to Client
-  }
-  else if (doScan)
-  {
-    BLEDevice::getScan()->start(0); // this is just sample to start scan after disconnect, most likely there is better way to do it in arduino
-  }
-
-  // convert RPM to timestamp
-  if (cadenceInstantaneous != 0 && (millis()) >= (lastRevolution + (60000 / cadenceInstantaneous)))
-  {
-    revolutions++;                                  // One crank revolution should have passed, add one revolution
-    timestamp = (unsigned short)(((millis() * 1024) / 1000) % 65536); // create timestamp and format
-    lastRevolution = millis();
-  }
-
-  if (millis() - lastNotify >= 1000) // do this every second
-  {
-    //if (pServer->getConnectedCount() > 0)
-    {
-      bleBuffer[0] = flags & 0xff;
-      bleBuffer[1] = (flags >> 8) & 0xff;
-      bleBuffer[2] = powerInstantaneous & 0xff;
-      bleBuffer[3] = (powerInstantaneous >> 8) & 0xff;
-      bleBuffer[4] = revolutions & 0xff;
-      bleBuffer[5] = (revolutions >> 8) & 0xff;
-      bleBuffer[6] = timestamp & 0xff;
-      bleBuffer[7] = (timestamp >> 8) & 0xff;
-      CyclingPowerMeasurement->setValue(bleBuffer, 8);
-      CyclingPowerMeasurement->notify();
-
-      /*bleBuffer[0] = 0;
-      bleBuffer[1] = powerInstantaneous;
-
-      HRMeasurement->setValue(bleBuffer, 2);
-      HRMeasurement->notify();*/
-      lastNotify = millis();
-    }
-  }
-  /*if (pServer->getConnectedCount() == 0)
-  {
-    powerInstantaneous = 0;
-  }*/
-}

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift.xcodeproj/xcshareddata/xcschemes/watchkit.xcscheme

@@ -54,10 +54,8 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/qdomyoszwift">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "876E4E102594747F00BD5714"
@@ -65,7 +63,7 @@
             BlueprintName = "watchkit"
             ReferencedContainer = "container:qdomyoszwift.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -73,10 +71,8 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/qdomyoszwift">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "876E4E102594747F00BD5714"
@@ -84,14 +80,7 @@
             BlueprintName = "watchkit"
             ReferencedContainer = "container:qdomyoszwift.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableName = "watchkit.app"
-            BlueprintName = "watchkit"
-            ReferencedContainer = "container:qdomyoszwift.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift.xcodeproj/xcuserdata/cagnulein.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -193,38 +193,6 @@
             endingLineNumber = "57"
             landmarkName = "BLEPeripheralManager"
             landmarkType = "3">
-            <Locations>
-               <Location
-                  uuid = "16D24B27-D0FB-4EC3-BAE8-56101FE7949B - 1c798ec95ff8d4b7"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "qdomyoszwift.BLEPeripheralManager.crankRevolutions.modify : Swift.Optional&lt;Swift.UInt16&gt;"
-                  moduleName = "qdomyoszwift"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/%3Ccompiler-generated%3E"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "0"
-                  endingLineNumber = "0"
-                  offsetFromSymbolStart = "16">
-               </Location>
-               <Location
-                  uuid = "16D24B27-D0FB-4EC3-BAE8-56101FE7949B - 5ebbef0dc9913f07"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "qdomyoszwift.BLEPeripheralManager.init() -&gt; qdomyoszwift.BLEPeripheralManager"
-                  moduleName = "qdomyoszwift"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/cagnulein/qdomyos-zwift/src/ios/BLEPeripheralManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "57"
-                  endingLineNumber = "57"
-                  offsetFromSymbolStart = "132">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -367,7 +335,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "38"
             endingLineNumber = "38"
-            landmarkName = "lockscreen::stepCadence()"
+            landmarkName = "lockscreen::virtualbike_setHeartRate(heartRate)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -375,7 +343,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "FE5697FF-F44C-43C2-A98D-C400EE56F047"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../src/ios/lockscreen.mm"
@@ -383,8 +351,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "44"
             endingLineNumber = "44"
-            landmarkName = "unknown"
-            landmarkType = "0">
+            landmarkName = "lockscreen::virtualbike_setCadence(crankRevolutions, lastCrankEventTime)"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -399,7 +367,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "37"
             endingLineNumber = "37"
-            landmarkName = "lockscreen::stepCadence()"
+            landmarkName = "lockscreen::virtualbike_setHeartRate(heartRate)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -407,7 +375,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "3DBE0495-050A-4979-85D4-28B78676F212"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../src/ios/lockscreen.mm"
@@ -415,7 +383,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "43"
             endingLineNumber = "43"
-            landmarkName = "lockscreen::setKcal(kcal)"
+            landmarkName = "lockscreen::virtualbike_setCadence(crankRevolutions, lastCrankEventTime)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -431,7 +399,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "32"
             endingLineNumber = "32"
-            landmarkName = "lockscreen::heartRate()"
+            landmarkName = "lockscreen::virtualbike_ios()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -463,7 +431,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "35"
                   endingLineNumber = "35"
-                  offsetFromSymbolStart = "32">
+                  offsetFromSymbolStart = "22">
                </Location>
                <Location
                   uuid = "18F27065-9FB2-44A2-99D0-7D41061141A3 - 4daffae51fb2d733"
@@ -478,7 +446,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "35"
                   endingLineNumber = "35"
-                  offsetFromSymbolStart = "36">
+                  offsetFromSymbolStart = "28">
                </Location>
             </Locations>
          </BreakpointContent>

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qz.storekit

@@ -1,62 +0,0 @@
-{
-  "identifier" : "2816EB89",
-  "nonRenewingSubscriptions" : [
-
-  ],
-  "products" : [
-
-  ],
-  "settings" : {
-
-  },
-  "subscriptionGroups" : [
-    {
-      "id" : "F012E388",
-      "localizations" : [
-
-      ],
-      "name" : "Swag Bag",
-      "subscriptions" : [
-        {
-          "adHocOffers" : [
-
-          ],
-          "codeOffers" : [
-
-          ],
-          "displayPrice" : "1.99",
-          "familyShareable" : false,
-          "groupNumber" : 1,
-          "internalID" : "F108BD35",
-          "introductoryOffer" : null,
-          "localizations" : [
-            {
-              "description" : "Swag Bag",
-              "displayName" : "Swag Bag",
-              "locale" : "en_US"
-            },
-            {
-              "description" : "Swag Bag",
-              "displayName" : "Swag Bag",
-              "locale" : "en_GB"
-            },
-            {
-              "description" : "Swag Bag",
-              "displayName" : "Swag Bag",
-              "locale" : "it"
-            }
-          ],
-          "productID" : "org.cagnulein.qdomyoszwift.swagbag",
-          "recurringSubscriptionPeriod" : "P1M",
-          "referenceName" : "SwagBag",
-          "subscriptionGroupID" : "F012E388",
-          "type" : "RecurringSubscription"
-        }
-      ]
-    }
-  ],
-  "version" : {
-    "major" : 1,
-    "minor" : 2
-  }
-}

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json

@@ -1,25 +1,21 @@
 {
   "images" : [
     {
-      "filename" : "circular38mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : "<=145"
     },
     {
-      "filename" : "circular40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "circular42mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">145"
     },
     {
-      "filename" : "circular44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json

@@ -1,25 +1,21 @@
 {
   "images" : [
     {
-      "filename" : "extra-large38mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : "<=145"
     },
     {
-      "filename" : "extra-large40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "extra-large42mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">145"
     },
     {
-      "filename" : "extra-large44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json

@@ -1,13 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "graphic-bezel40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "graphic-bezel44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json

@@ -1,13 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "graphic-circular40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "graphic-circular44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json

@@ -1,13 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "graphic-corner40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "graphic-corner44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json

@@ -1,25 +1,21 @@
 {
   "images" : [
     {
-      "filename" : "graphic-extra-large38mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : "<=145"
     },
     {
-      "filename" : "graphic-extra-large40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "graphic-extra-large42mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">145"
     },
     {
-      "filename" : "graphic-extra-large44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json

@@ -1,13 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "graphic-large-rectangular40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "graphic-large-rectangular44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json

@@ -1,25 +1,21 @@
 {
   "images" : [
     {
-      "filename" : "modular38mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : "<=145"
     },
     {
-      "filename" : "modular40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "modular42mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">145"
     },
     {
-      "filename" : "modular44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json

@@ -1,25 +1,21 @@
 {
   "images" : [
     {
-      "filename" : "utility38mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : "<=145"
     },
     {
-      "filename" : "utility40mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">161"
     },
     {
-      "filename" : "utility42mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">145"
     },
     {
-      "filename" : "utility44mm@2x.png",
       "idiom" : "watch",
       "scale" : "2x",
       "screen-width" : ">183"

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

@@ -13,59 +13,6 @@ class ComplicationController: NSObject, CLKComplicationDataSource {
     
     // MARK: - Timeline Configuration
     
-    private func templateForComplication(complication: CLKComplication) -> CLKComplicationTemplate? {
-        // Init default output:
-        var template: CLKComplicationTemplate? = nil
-        
-        // Graphic Complications are only availably since watchOS 5.0:
-        if #available(watchOSApplicationExtension 5.0, *) {
-            // NOTE: Watch faces that support graphic templates are available only on Apple Watch Series 4 or later. So the binary on older devices (e.g. Watch Series 3) will not contain the images.
-            if complication.family == .graphicCircular {
-                let imageTemplate = CLKComplicationTemplateGraphicCircularImage()
-                // Check if asset exists, to prevent crash on non-supported devices:
-                if let fullColorImage = UIImage(named: "Complication/Graphic Circular") {
-                    let imageProvider = CLKFullColorImageProvider.init(fullColorImage: fullColorImage)
-                    imageTemplate.imageProvider = imageProvider
-                    template = imageTemplate
-                }
-            }
-            else if complication.family == .graphicCorner {
-                let imageTemplate = CLKComplicationTemplateGraphicCornerCircularImage()
-                // Check if asset exists, to prevent crash on non-supported devices:
-                if let fullColorImage = UIImage(named: "Complication/Graphic Corner") {
-                    let imageProvider = CLKFullColorImageProvider.init(fullColorImage: fullColorImage)
-                    imageTemplate.imageProvider = imageProvider
-                    template = imageTemplate
-                }
-            }
-        }
-        
-        // For all watchOS versions:
-        if complication.family == .circularSmall {
-            let imageTemplate = CLKComplicationTemplateCircularSmallSimpleImage()
-            let imageProvider = CLKImageProvider(onePieceImage: UIImage(named: "Complication/Circular")!)
-            imageProvider.tintColor = UIColor.blue
-            imageTemplate.imageProvider = imageProvider
-            template = imageTemplate
-        }
-        else if complication.family == .modularSmall {
-            let imageTemplate = CLKComplicationTemplateModularSmallSimpleImage()
-            let imageProvider = CLKImageProvider(onePieceImage: UIImage(named: "Complication/Modular")!)
-            imageProvider.tintColor = UIColor.blue
-            imageTemplate.imageProvider = imageProvider
-            template = imageTemplate
-        }
-        else if complication.family == .utilitarianSmall {
-            let imageTemplate = CLKComplicationTemplateUtilitarianSmallSquare()
-            let imageProvider = CLKImageProvider(onePieceImage: UIImage(named: "Complication/Utilitarian")!)
-            imageProvider.tintColor = UIColor.blue
-            imageTemplate.imageProvider = imageProvider
-            template = imageTemplate
-        }
-        
-        return template
-    }
-
     func getSupportedTimeTravelDirections(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimeTravelDirections) -> Void) {
         handler([.forward, .backward])
     }
@@ -86,9 +33,7 @@ class ComplicationController: NSObject, CLKComplicationDataSource {
     
     func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimelineEntry?) -> Void) {
         // Call the handler with the current timeline entry
-        let template = templateForComplication(complication: complication)
-                let timelineEntry = CLKComplicationTimelineEntry(date: Date(), complicationTemplate: template!)
-                handler(timelineEntry)
+        handler(nil)
     }
     
     func getTimelineEntries(for complication: CLKComplication, before date: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) {
@@ -101,15 +46,11 @@ class ComplicationController: NSObject, CLKComplicationDataSource {
         handler(nil)
     }
     
-    func getPlaceholderTemplate(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTemplate?) -> Void) {
-        // This method will be called once per supported complication, and the results will be cached
-        handler(templateForComplication(complication: complication))
-    }
     // MARK: - Placeholder Templates
     
     func getLocalizableSampleTemplate(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTemplate?) -> Void) {
         // This method will be called once per supported complication, and the results will be cached
-        handler(templateForComplication(complication: complication))
+        handler(nil)
     }
     
 }

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit Extension/Info.plist

@@ -8,8 +8,6 @@
 	<string>watchkit Extension</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
-	<key>NSMotionUsageDescription</key>
-	<string>access to step cadence in order to show it in the application</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -24,21 +22,6 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CLKComplicationPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
-	<key>CLKComplicationSupportedFamilies</key>
-	<array>
-		<string>CLKComplicationFamilyModularSmall</string>
-		<string>CLKComplicationFamilyModularLarge</string>
-		<string>CLKComplicationFamilyUtilitarianSmall</string>
-		<string>CLKComplicationFamilyUtilitarianSmallFlat</string>
-		<string>CLKComplicationFamilyUtilitarianLarge</string>
-		<string>CLKComplicationFamilyCircularSmall</string>
-		<string>CLKComplicationFamilyExtraLarge</string>
-		<string>CLKComplicationFamilyGraphicCorner</string>
-		<string>CLKComplicationFamilyGraphicBezel</string>
-		<string>CLKComplicationFamilyGraphicCircular</string>
-		<string>CLKComplicationFamilyGraphicRectangular</string>
-		<string>CLKComplicationFamilyGraphicExtraLarge</string>
-	</array>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

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

@@ -8,56 +8,26 @@
 
 import WatchKit
 import HealthKit
-import CoreMotion
 
 class MainController: WKInterfaceController {
     @IBOutlet weak var userNameLabel: WKInterfaceLabel!
     @IBOutlet weak var stepCountsLabel: WKInterfaceLabel!
-    @IBOutlet weak var caloriesLabel: WKInterfaceLabel!
-    @IBOutlet weak var distanceLabel: WKInterfaceLabel!
     @IBOutlet weak var heartRateLabel: WKInterfaceLabel!
     @IBOutlet weak var startButton: WKInterfaceButton!
-    @IBOutlet weak var cmbSports: WKInterfacePicker!
     static var start: Bool! = false
-    let pedometer = CMPedometer()
-    var sport: Int = 0
     
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
-        let sports: [WKPickerItem] = [WKPickerItem(),WKPickerItem(),WKPickerItem(),WKPickerItem(),WKPickerItem()]
-        sports[0].title = "Bike"
-        sports[1].title = "Run"
-        sports[2].title = "Walk"
-        sports[3].title = "Elliptical"
-        sports[4].title = "Rowing"
-        cmbSports.setItems(sports)
-        sport = UserDefaults.standard.value(forKey: "sport") as? Int ?? 0
-        cmbSports.setSelectedItemIndex(sport)
         
         // Configure interface objects here.
         print("AWAKE")
     }
     
-    @IBAction func changeSport(_ value: Int) {
-        self.sport = value
-        UserDefaults.standard.set(value, forKey: "sport")
-        UserDefaults.standard.synchronize()
-    }
-    
     override func willActivate() {
         // This method is called when watch view controller is about to be visible to user
         super.willActivate()
         print("WILL ACTIVE")
         WorkoutTracking.shared.fetchStepCounts()
-        if CMPedometer.isStepCountingAvailable() {
-            pedometer.startUpdates(from: Date()) { pedometerData, error in
-                guard let pedometerData = pedometerData, error == nil else { return }
-                self.stepCountsLabel.setText("\(Int(((pedometerData.currentCadence?.doubleValue ?? 0) * 60.0 / 2.0))) STEP CAD.")
-                WatchKitConnection.stepCadence = Int(((pedometerData.currentCadence?.doubleValue ?? 0) * 60.0 / 2.0))
-                WatchKitConnection.shared.sendMessage(message: ["stepCadence":
-                    "\(WatchKitConnection.stepCadence)" as AnyObject])
-            }
-        }
     }
     
     override func didDeactivate() {
@@ -74,7 +44,6 @@ extension MainController {
             MainController.start = true
             startButton.setTitle("Stop")
             WorkoutTracking.authorizeHealthKit()
-            WorkoutTracking.shared.setSport(sport)
             WorkoutTracking.shared.startWorkOut()
             WorkoutTracking.shared.delegate = self
             
@@ -90,7 +59,6 @@ extension MainController {
 }
 
 extension MainController: WorkoutTrackingDelegate {
-    
     func didReceiveHealthKitDistanceCycling(_ distanceCycling: Double) {
         
     }
@@ -104,21 +72,10 @@ extension MainController: WorkoutTrackingDelegate {
             "\(heartRate)" as AnyObject])
         WorkoutTracking.distance = WatchKitConnection.distance
         WorkoutTracking.kcal = WatchKitConnection.kcal
-                
-		if Locale.current.measurementSystem != "Metric" {
-			self.distanceLabel.setText("Distance \(String(format:"%.2f", WorkoutTracking.distance))")
-		} else {
-			self.distanceLabel.setText("Distance \(String(format:"%.2f", WorkoutTracking.distance * 1.60934))")
-		}
-        self.caloriesLabel.setText("KCal \(Int(WorkoutTracking.kcal))")
-        //WorkoutTracking.cadenceSteps = pedometer.
     }
     
     func didReceiveHealthKitStepCounts(_ stepCounts: Double) {
-        //stepCountsLabel.setText("\(stepCounts) STEPS")
-    }
-    func didReceiveHealthKitStepCadence(_ stepCadence: Double) {
-        
+        stepCountsLabel.setText("\(stepCounts) STEPS")
     }
 }
 
@@ -127,11 +84,3 @@ extension MainController: WatchKitConnectionDelegate {
         userNameLabel.setText(userName)
     }
 }
-
-extension Locale
-{
-   var measurementSystem : String?
-   {
-      return (self as NSLocale).object(forKey: NSLocale.Key.measurementSystem) as? String
-   }
-}

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

@@ -23,7 +23,6 @@ class WatchKitConnection: NSObject {
     static let shared = WatchKitConnection()
     public static var distance = 0.0
     public static var kcal = 0.0
-    public static var stepCadence = 0
     weak var delegate: WatchKitConnectionDelegate?
     
     private override init() {

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

@@ -12,7 +12,6 @@ import HealthKit
 protocol WorkoutTrackingDelegate: class {
     func didReceiveHealthKitHeartRate(_ heartRate: Double)
     func didReceiveHealthKitStepCounts(_ stepCounts: Double)
-    func didReceiveHealthKitStepCadence(_ stepCadence: Double)
     func didReceiveHealthKitDistanceCycling(_ distanceCycling: Double)
     func didReceiveHealthKitActiveEnergyBurned(_ activeEnergyBurned: Double)
 }
@@ -28,10 +27,6 @@ class WorkoutTracking: NSObject {
     static let shared = WorkoutTracking()
     public static var distance = Double()
     public static var kcal = Double()
-    public static var cadenceTimeStamp = NSDate().timeIntervalSince1970
-    public static var cadenceLastSteps = Double()
-    public static var cadenceSteps = 0
-    var sport: Int = 0
     let healthStore = HKHealthStore()
     let configuration = HKWorkoutConfiguration()
     var workoutSession: HKWorkoutSession!
@@ -84,13 +79,7 @@ extension WorkoutTracking {
                 
                 if let sum = result.sumQuantity() {
                     resultCount = sum.doubleValue(for: HKUnit.count())
-                    let now = NSDate().timeIntervalSince1970
-                    let deltaT = now - WorkoutTracking.cadenceTimeStamp
-                    let deltaC = resultCount - WorkoutTracking.cadenceLastSteps
-                    WorkoutTracking.cadenceLastSteps = resultCount
-                    WorkoutTracking.cadenceTimeStamp = now
                     weakSelf.delegate?.didReceiveHealthKitStepCounts(resultCount)
-                    weakSelf.delegate?.didReceiveHealthKitStepCadence((deltaC / deltaT) * 60)
                 } else {
                     print("Failed to fetch steps rate 2")
                 }
@@ -102,23 +91,8 @@ extension WorkoutTracking {
         }
     }
     
-    func setSport(_ sport: Int) {
-        self.sport = sport
-    }
-    
     private func configWorkout() {
-        var activityType = HKWorkoutActivityType.cycling
-        if self.sport == 1 {
-            activityType = HKWorkoutActivityType.running
-        } else if self.sport == 2 {
-            activityType = HKWorkoutActivityType.walking
-        } else if self.sport == 3 {
-            activityType = HKWorkoutActivityType.elliptical
-        } else if self.sport == 4 {
-            activityType = HKWorkoutActivityType.rowing
-        }
-        
-        configuration.activityType = activityType
+        configuration.activityType = .cycling
         configuration.locationType = .indoor
         
         do {
@@ -150,7 +124,6 @@ extension WorkoutTracking: WorkoutTrackingProtocol {
                 HKSampleType.quantityType(forIdentifier: .stepCount)!,
                 HKSampleType.quantityType(forIdentifier: .heartRate)!,
                 HKSampleType.quantityType(forIdentifier: .distanceCycling)!,
-                HKSampleType.quantityType(forIdentifier: .distanceWalkingRunning)!,
                 HKSampleType.quantityType(forIdentifier: .activeEnergyBurned)!,				
                 HKSampleType.workoutType()
                 ])
@@ -176,10 +149,6 @@ extension WorkoutTracking: WorkoutTrackingProtocol {
             if let error = error {
                 print(error)
             }
-
-            if self.sport > 0 {
-                self.workoutBuilder.dataSource?.enableCollection(for: HKQuantityType.quantityType(forIdentifier: .distanceWalkingRunning)!, predicate: nil)
-            }
         }
     }
     
@@ -204,72 +173,29 @@ extension WorkoutTracking: WorkoutTrackingProtocol {
                                                       end: Date())
         
         workoutBuilder.add([sample]) {(success, error) in}
+        
+        guard let quantityTypeDistance = HKQuantityType.quantityType(
+                forIdentifier: .distanceCycling) else {
+          return
+        }
             
         let unitDistance = HKUnit.mile()
         let miles = WorkoutTracking.distance
         let quantityMiles = HKQuantity(unit: unitDistance,
                                   doubleValue: miles)
         
-        if(sport == 0) {
-            
-            guard let quantityTypeDistance = HKQuantityType.quantityType(
-                    forIdentifier: .distanceCycling) else {
-              return
-            }
-            
-            
-            let sampleDistance = HKCumulativeQuantitySeriesSample(type: quantityTypeDistance,
-                                                          quantity: quantityMiles,
-                                                          start: workoutSession.startDate!,
-                                                          end: Date())
-            
-            workoutBuilder.add([sampleDistance]) {(success, error) in
-                if let error = error {
-                    print(error)
-                }
-                self.workoutBuilder.endCollection(withEnd: Date()) { (success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                    self.workoutBuilder.finishWorkout{ (workout, error) in
-                        if let error = error {
-                            print(error)
-                        }
-                        workout?.setValue(quantityMiles, forKey: "totalDistance")
-                    }
-                }
-            }
-        } else {
-            
-            guard let quantityTypeDistance = HKQuantityType.quantityType(
-                forIdentifier: .distanceWalkingRunning) else {
-              return
-            }
-      
-            let sampleDistance = HKCumulativeQuantitySeriesSample(type: quantityTypeDistance,
-                                                          quantity: quantityMiles,
-                                                          start: workoutSession.startDate!,
-                                                          end: Date())
-            
-            workoutBuilder.add([sampleDistance]) {(success, error) in
-                if let error = error {
-                    print(error)
-                }
-                self.workoutBuilder.endCollection(withEnd: Date()) { (success, error) in
-                    if let error = error {
-                        print(error)
-                    }
-                    self.workoutBuilder.finishWorkout{ (workout, error) in
-                        if let error = error {
-                            print(error)
-                        }
-                        workout?.setValue(quantityMiles, forKey: "totalDistance")
-                    }
-                }
-            }
-        }
+        let sampleDistance = HKCumulativeQuantitySeriesSample(type: quantityTypeDistance,
+                                                      quantity: quantityMiles,
+                                                      start: workoutSession.startDate!,
+                                                      end: Date())
         
-   
+        workoutBuilder.add([sample]) {(success, error) in}
+        workoutBuilder.add([sampleDistance]) {(success, error) in}
+        
+        workoutBuilder.endCollection(withEnd: Date()) { (success, error) in
+            
+        }
+        workoutBuilder.finishWorkout{ (success, error) in }
     }
     
     func fetchStepCounts() {

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit/Interface.storyboard

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="20037" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Tpn-rd-UUX">
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="17506" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Tpn-rd-UUX">
     <device id="watch38"/>
     <dependencies>
         <deployment identifier="watchOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="20006"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="17500"/>
     </dependencies>
     <scenes>
         <!--Main-->
@@ -12,26 +12,16 @@
             <objects>
                 <controller identifier="Main" hidesWhenLoading="NO" id="Tpn-rd-UUX" customClass="MainController" customModule="watchkit_Extension">
                     <items>
-                        <label width="136" alignment="left" text="QZ Fitness" textAlignment="center" id="SlU-M7-WGB"/>
+                        <label width="136" alignment="left" text="qdomyos-zwift" textAlignment="center" id="SlU-M7-WGB"/>
+                        <label width="136" alignment="left" text="Heart Rate" id="Nda-m1-XRw"/>
+                        <label width="136" alignment="left" text="Step Counts" id="HpA-e9-6YV"/>
                         <button width="1" alignment="left" title="Start" id="vZg-X8-uY5">
                             <connections>
                                 <action selector="startWorkout" destination="Tpn-rd-UUX" id="UaW-pR-tn6"/>
                             </connections>
                         </button>
-                        <label width="136" alignment="left" text="Heart Rate" id="Nda-m1-XRw"/>
-                        <label width="136" alignment="left" text="Step Counts" id="HpA-e9-6YV"/>
-                        <label width="136" alignment="left" text="Calories" id="Szi-Jp-J3S"/>
-                        <label width="136" alignment="left" text="Distance" id="eRf-NJ-6If"/>
-                        <picker height="100" alignment="left" id="OTR-HF-vYb">
-                            <connections>
-                                <action selector="changeSport:" destination="Tpn-rd-UUX" id="3vY-lq-IhZ"/>
-                            </connections>
-                        </picker>
                     </items>
                     <connections>
-                        <outlet property="caloriesLabel" destination="Szi-Jp-J3S" id="trd-YS-bJy"/>
-                        <outlet property="cmbSports" destination="OTR-HF-vYb" id="Ws5-w9-ZT8"/>
-                        <outlet property="distanceLabel" destination="eRf-NJ-6If" id="ZE2-OB-jqN"/>
                         <outlet property="heartRateLabel" destination="Nda-m1-XRw" id="1la-8R-3jG"/>
                         <outlet property="startButton" destination="vZg-X8-uY5" id="pJc-09-kfV"/>
                         <outlet property="stepCountsLabel" destination="HpA-e9-6YV" id="Z88-ej-6oG"/>

defaults.pri

@@ -1,15 +0,0 @@
-QT += gui bluetooth widgets xml positioning quick networkauth websockets texttospeech location multimedia
-QTPLUGIN += qavfmediaplayer
-QT+= charts
-
-unix:android: QT += androidextras gui-private
-
-android: include(android_openssl/openssl.pri)
-
-INCLUDEPATH += $$PWD/src/qmdnsengine/src/include
-
-ANDROID_PACKAGE_SOURCE_DIR = $$PWD/src/android
-
-ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64
-
-#QMAKE_CXXFLAGS += -Werror=suggest-override

docker/linux/Dockerfile

@@ -1,24 +1,10 @@
-FROM ubuntu:latest
+FROM debian:stable
 MAINTAINER cagnulein
 
-ARG DEBIAN_FRONTEND=noninteractive
-ENV TZ=Europe/Moscow
 ENV MAKEFLAGS -j8
 WORKDIR /usr/local/src
 
-RUN apt-get update && apt-get install -y tzdata
+# utils
 RUN apt -y update
 RUN apt -y upgrade
-RUN apt update -y && apt-get install -y git qt5-default libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-default libqt5networkauth5-dev libqt5websockets5* libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev build-essential
-
-RUN git clone https://github.com/cagnulein/qdomyos-zwift.git
-WORKDIR /usr/local/src/qdomyos-zwift
-
-RUN git submodule update --init src/smtpclient/
-RUN git submodule update --init src/qmdnsengine/
-WORKDIR /usr/local/src/qdomyos-zwift/src
-RUN qmake
-RUN make -j4
-
-WORKDIR /usr/local/src/qdomyos-zwift/src
-CMD ["./qdomyos-zwift","-no-gui"]
+RUN apt -y install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-default

docs/10_Installation.md

@@ -4,20 +4,17 @@ QDomyos-Zwift can be installed from source on MacOs, Linux, Android and IOS.
 
 Once you've installed QDomyos-Zwift, you can access the [operation guide](30_usage.md) for more information.
 
-These instructions build the app itself, not the test project.
-
 ## On a Linux System (from source)
 
 ```buildoutcfg
 $ sudo apt update && sudo apt upgrade # this is very important on raspberry pi: you need the bluetooth firmware updated!
-$ sudo apt install git qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qml-module* libqt5texttospeech5-dev libqt5texttospeech5 libqt5location5-plugins qtlocation5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 g++ make
+$ sudo sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev
 $ git clone https://github.com/cagnulein/qdomyos-zwift.git
 $ cd qdomyos-zwift
 $ git submodule update --init src/smtpclient/
 $ git submodule update --init src/qmdnsengine/
-$ git submodule update --init tst/googletest/
 $ cd src
-$ qmake qdomyos-zwift.pro
+$ qmake
 $ make -j4
 $ sudo ./qdomyos-zwift
 ```
@@ -28,13 +25,13 @@ $ 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 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
+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 relase for MacOs
 
 ## On Raspberry Pi Zero W
 
 ![raspi](../docs/img/raspi-bike.jpg)
 
-This guide will walk you through steps to setup an autonomous, headless raspberry bridge.
+This guide will walk you through steps to setup an autonomous, headless raspberry brigde.
 
 
 ### Initial System Preparation
@@ -105,17 +102,15 @@ This operation takes a moment to complete.
 
 #### Install qdomyos-zwift from sources
 
-```bash
-sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 qtlocation5-dev qtquickcontrols2-5-dev libqt5texttospeech5-dev libqt5texttospeech5 g++ make
-git clone https://github.com/cagnulein/qdomyos-zwift.git
-cd qdomyos-zwift
-git submodule update --init src/smtpclient/  
-git submodule update --init src/qmdnsengine/  
-git submodule update --init tst/googletest/
-cd src
-qmake qdomyos-zwift.pro    
-make  
-```
+`sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-assistant libqt5networkauth5-dev libqt5websockets5-dev`
+
+`git clone https://github.com/cagnulein/qdomyos-zwift.git`  
+`cd qdomyos-zwift`  
+`git submodule update --init src/smtpclient/`  
+`git submodule update --init src/qmdnsengine/`  
+`cd src`    
+`qmake`    
+`make`  
 
 Please note :
 - Don't build the application with `-j4` option (this will fail)

docs/20_supported_devices_and_applications.md

@@ -11,12 +11,26 @@ This list is not exhaustive. Please report any application known to be working w
 |[Fulgaz](21_applications_detail.md#fulgaz)|![bike](img/20_bike.png)|![IOS](img/20_apple.png) ![Android](img/20_android.png) ![PC](img/20_windows.png)|Yes|Yes|Yes|Yes, no FTMS support (see note)|Yes (see note) |
 
 # Supported devices
-Check the full list https://github.com/cagnulein/qdomyos-zwift/wiki/Equipment-Compatibility
-
 This list is not exhaustive. 
 Try the qdomyos app with your fitness appliance and report how it is going.
 If it's not working, you can [ask for your device to be supported](#ask-for-device-support)
 
+## Supported bikes
+
+|Manufacturer|Model|Speed|RPM|Power|HRM|Resistence Control|
+|------------|-----|------------|---|-----|---|------------------|
+|[Echelon](22_devices_detail.md#echelon)|Connect Sport|Yes|Yes|Yes|Yes|N/A|
+|[Sportstech](22_devices_detail.md#sportstech)|ESX500|Yes|Yes|Yes|Yes|Yes|
+
+## Supported treadmills
+
+|Manufacturer|Model|Speed|HRM|Inclinaison Control| Speed control|
+|------------|-----|------------|---|-------------------|--------------|
+|Domyos|Intense Run|Yes|Yes|Yes|Yes|
+|Domyos|T900c|Yes|Yes|Yes|Yes|
+|Toorx|TRX Route Key|Yes|Yes|Yes|Yes|
+
+
 # Ask for device support
 
 You can ask for supporting a device by opening an issue and following these steps.
@@ -36,7 +50,7 @@ An android device is required for this operation.
 8. Disable the option Enable Bluetooth HCI snoop log
 9. in Developer Options: Bug report->Full report
 10. wait a random amount of time (10-20 seconds)
-11. A notification will appear at the top of the device. Click on it, share, email it to yourself. If it doesn't appear you need to use ADB to pull the file from the phone itself
+11. A notification will appear at the top of the device. Click on it, share, email it to yourself
 12. You'll get a zip file with the entire report. In the FS/Data/Log/bt directory of the zipfile is the file you want.
 13. attach the log file in a new issue with a short description of the steps you did in the app when you used it
 

docs/21_applications_detail.md

@@ -26,5 +26,5 @@ You can have ae true 4k video stream while you ride ("extreme quality" setting)
 The application do not read the FTMS value. It is required to start the application with `-heart-service` or `bike_heartrate_service: true` in settings.
 
 ### Resistance management
-You can adjust resistance using arrows [up and down](img/21_zwift-resistance-buttons.jpg) rom the riding screen.
+You can adjust resistence using arrows [up and down](img/21_zwift-resistance-buttons.jpg) rom the riding screen.
 

docs/30_usage.md

@@ -21,34 +21,32 @@ Please refer to this article for more information under [QML Operations](https:/
 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**                                                                 |
-|:------------------------------|:---------|:------------|:-----------------------------------------------------------------------------|
-| -no-gui                 		| Boolean  | False       | Disable GUI                                                                  |
-| -qml                    		| Boolean  | True        | Enables the QML interface                                                    |
-| -noqml                    	| Boolean  | False       | Enables the NativeQT interface                                               |
-| -miles                  		| Boolean  | False       | Switches to Imperial Units System                                             |
-| -no-console             		| Boolean  | False       | Not in use                                                                   |
-| -test-resistance        		| Boolean  | False       |                                                                              |
-| -no-log                 		| Boolean  | False       | Disable Logging                                                              |
-| -no-write-resistance    		| Boolean  | False       | Disable resistance instructions from QZ to your fitness equipment            |
-| -no-heart-service       		| Boolean  | False       | Do not simulate external HR monitor, use only FTMS                           |
-| -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 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       |                                                                              |
-| -service-changed        		| Boolean  | False       |                                                                              |
-| -bike-wheel-revs        		| Boolean  | False       |                                                                              |
-| -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 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                                    |
+| **Option**              | **Type** | **Default** | **Function**                                                                 |
+|:------------------------|:---------|:------------|:-----------------------------------------------------------------------------|
+| -no-gui                 | Boolean  | False       | Disable GUI                                                                  |
+| -qml                    | Boolean  | False       | Enables the QML interface                                                    |
+| -miles                  | Boolean  | False       | Swithes to Imperial Units System                                             |
+| -no-console             | Boolean  | False       | Not in use                                                                   |
+| -test-resistance        | Boolean  | False       |                                                                              |
+| -no-log                 | Boolean  | False       | Disable Logging                                                              |
+| -no-write-resistance    | Boolean  | False       | Disable resistance instructions from QZ to your fitness equipment            |
+| -no-heart-service       | Boolean  | False       | Do not simulate external HR monitor, use only FTMS                           |
+| -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 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       |                                                                              |
+| -service-changed        | Boolean  | False       |                                                                              |
+| -bike-wheel-revs        | Boolean  | False       |                                                                              |
+| -run-cadence-sensor     | Boolean  | False       |                                                                              |
+| -train                  | String   |             | Force training program                                                       |
+| -name                   | String   |             | Force bluetooth device name (if QZ struggles finding your fitness equipment) |
+| -poll-device-time       | Int      | 200 (ms)    | Frequency to refresh informations 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/40_web_socket_api.md

@@ -1,365 +0,0 @@
-# QDomyos-Zwift WebSocket API Installation & Operation guide
-
-# Installation
-## About
-
-The QDomyos-Zwift WebSocket API can be installed from source on Linux, Raspberry Pi (4, 3, zero W), macOS, Android and IOS.
-
-However, this guide will only focus on the Linux (Debian 11) Installation and Raspberry Pi cause there are the most useful case in headless control.
-
-If you already install the Web Socket, feel free to [skip to the Usage section](#usage).
-
-## Requirement
-
-To Install QDomyos-Zwift with WebSocket API you will need Qt 5.12.2+ and the following modules :
-- Qt Bluetooth
-- Qt Widgets
-- Qt Positioning
-- Qt XML
-- Qt Charts
-- Qt Network
-- Qt Network Authorization
-- Qt WebSockets
-- Qt Assistant
-
-Unfortunately under Debian 11 (or Raspbian 11) the Qt 5 packages are not recent enough for compilation however this guide will explain how to manually compile the latest version of Qt (5.12.12)
-
-If you already had Qt 5.12.2 or more, feel free to [skip to Install Qt Httpserver](#install-qt-httpserver).
-
-## Install Qt 5.12.2
-
-*If you compile for a Raspberry Pi Zero, it's* ***faster and easy*** *to do all the Raspberry Pi task on a Raspberry Pi 4 and after copy compiled binary files toe the Raspberry Pi Zero*
-
-For more info on the steps [please refer to the source](#source)
-
-Before do anything. Make sure all your packages are updated :
-
-```bash
-apt update && apt upgrade # this is very important on raspberry pi: you need the bluetooth firmware updated!
-```
-
-After download last version of Qt Source and extract them :
-```bash
-wget https://download.qt.io/official_releases/qt/5.12/5.12.12/single/qt-everywhere-src-5.12.12.tar.xz
-```
-
-If you compile for a Raspberry Pi you will need the Raspberry Pi Qt Configuration for raspberry pi and install it in the source :
-
-```bash
-git clone https://github.com/oniongarlic/qt-raspberrypi-configuration.git
-cd qt-raspberrypi-configuration && make install DESTDIR=../qt-everywhere-src-5.12.12
-```
-
-Install the bare minimum required development packages for building Qt 5 with apt :
-```bash
-apt install build-essential libfontconfig1-dev libdbus-1-dev libfreetype6-dev libicu-dev libinput-dev libxkbcommon-dev libsqlite3-dev libssl-dev libpng-dev libjpeg-dev libglib2.0-dev libraspberrypi-dev
-```
-
-*For raspberry Pi install `libraspberrypi-dev` package* :
-```bash
-apt install libraspberrypi-dev
-```
-
-
-Now install all required development packages for building all Qt 5 modules:
-```bash
-apt install bluez libgbm-dev
-apt install libudev-dev libinput-dev libts-dev libxcb-xinerama0-dev libxcb-xinerama0 gdbserver
-apt install libegl1-mesa libegl1-mesa-dev libgles2-mesa libgles2-mesa-dev
-apt install wiringpi libnfc-bin libnfc-dev fonts-texgyre libts-dev
-apt install libbluetooth-dev bluez-tools gstreamer1.0-plugins* libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libopenal-data libopenal1 libopenal-dev pulseaudio
-apt install libgstreamer*-dev
-apt install gstreamer*-dev
-apt install libasound2-dev libavcodec-dev libavformat-dev libswscale-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev gstreamer-tools libgstreamer-plugins-*
-apt install qtdeclarative5-dev
-apt install libvlc-dev
-```
-
-On Raspbian Stretch/Buster/Bullseye the OpenGL library files have been renamed so that they wouldn't conflict with Mesa installed ones. Unfortunately Qt configure script is still looking for the old names.
-So ***on your target Raspberry Pi*** you need to symlink those file to make sure Qt run correctly.
-```bash
-ln -s /usr/lib/arm-linux-gnueabihf/libGLESv2.so /usr/lib/libbrcmGLESv2.so
-ln -s /usr/lib/arm-linux-gnueabihf/libEGL.so /usr/lib/libbrcmEGL.so
-```
-
-Now all dependency are installed. It's time to create build folder and compiled.
-```bash
-mkdir build
-cd build
-
-# For Raspberry Pi Zero or 3
-PKG_CONFIG_LIBDIR=/usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig ../qt-everywhere-src-5.12.12/configure -platform linux-rpi-g++ -v -opengl es2 -eglfs -no-gtk -opensource -confirm-license -release -reduce-exports -force-pkg-config -nomake examples -no-compile-examples -skip qtwayland -skip qtwebengine -no-feature-geoservices_mapboxgl -qt-pcre -no-pch -ssl -evdev -system-freetype -fontconfig -glib -prefix /opt/Qt/5.12.12 -qpa eglfs
-CFLAGS="-march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" make -j3 # Remove -j3 if you compiled directly on Raspberry Pi Zero
-
-# For Raspberry Pi 4
-PKG_CONFIG_LIBDIR=/usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig ../qt-everywhere-src-5.12.12/configure -platform linux-rpi4-v3d-g++ -v -opengl es2 -eglfs -no-gtk -opensource -confirm-license -release -reduce-exports -force-pkg-config -nomake examples -no-compile-examples -skip qtwayland -skip qtwebengine -no-feature-geoservices_mapboxgl -qt-pcre -no-pch -ssl -evdev -system-freetype -fontconfig -glib -prefix /opt/Qt/5.12.12 -qpa eglfs
-CFLAGS="-march=armv8-a -mtune=cortex-a72 -mfpu=crypto-neon-fp-armv8" make -j3
-
-# For Debian 11 x64 (Not tested)
-../qt-everywhere-src-5.12.12/configure -v -opengl es2 -eglfs -no-gtk -opensource -confirm-license -release -reduce-exports -force-pkg-config -nomake examples -no-compile-examples -skip qtwayland -skip qtwebengine -no-feature-geoservices_mapboxgl -qt-pcre -no-pch -ssl -evdev -system-freetype -fontconfig -glib -prefix /opt/Qt/5.12.12 -qpa eglfs
-make
-```
-
-Finally, if you cross compiled you can transfer the build folder to other machine and then just run as root in the build folder :
-```bash
-make install
-```
-
-# Install Qt Httpserver
-
-Like explain in PR #252, to make work the Http Server you will need to manually compile `qthttpserver` module.
-
-For that just run following commands in your home directory :
-```bash
-cd ~
-git clone https://github.com/qt-labs/qthttpserver
-cd ~/qthttpserver/src/3rdparty/http-parser
-wget https://raw.githubusercontent.com/nodejs/http-parser/main/http_parser.h
-wget https://raw.githubusercontent.com/nodejs/http-parser/main/http_parser.c
-cd ~/qthttpserver/src
-qmake # Please note if you compiled Qt you need to specify /opt/Qt/5.12.12/bin/qmake
-make
-# Wait...
-sudo make install
-```
-
-***You have successfully installed Qt Httpserver***
-
-# Install QDomyos-Zwift
-
-If you already compile QDomyos-Zwift and you just compiled a new version of Qt.
-Please delete the whole QDomyos-Zwift folder and restart from scratch to prevent linking issues.
-
-```bash
-cd ~
-git clone https://github.com/cagnulein/qdomyos-zwift.git
-cd ~/qdomyos-zwift
-git submodule update --init ~/qdomyos-zwift/src/smtpclient/
-cd ~/qdomyos-zwift/src
-qmake # Please note if you compiled Qt you need to specify /opt/Qt/5.12.12/bin/qmake
-make -j4 # Remove -j4 if you compiled on Raspberry Pi Zero
-```
-
-Now installed you need to compile like say in PR #252 and issue #572 template/debug in the same directory of source file of QDomyos-Zwift.
-```bash
-cp -r ~/qdomyos-zwift/src/templates/debug ~/qdomyos-zwift/src/.
-cp -r ~/qdomyos-zwift/src/templates/debug/* ~/qdomyos-zwift/src/.
-```
-
-Last if you can't run QML version (probably because you don't had a X11 Server.) you need to manually edit the configuration file in `/root/.config/Roberto Viola/qDomyos-Zwift.conf` and add :
-```
-template_inner_QZWS_enabled=true
-template_inner_QZWS_folders=:/inner_templates//chartjs
-template_inner_QZWS_ips=192.168.1.42
-template_inner_QZWS_port=34107
-template_inner_QZWS_type=WebServer
-```
-
-In this config file we open an HTTP Server on port 34107 with bind to 192.168.1.42 but feel free to change these values.
-
-Finally, ***do not move `qdomyos-zwift` from src folder*** and run it as Root
-
-# Usage
-
-The way that [WebSocket](https://developer.mozilla.org/docs/Web/API/WebSockets_API) work in QDomyos-Zwift is by sending commands and listen events.
-
-## Workout Event
-
-The workout Event is the default message send almost every second by QDomyos-Zwift to inform you which state is your equipment.
-
-Here what is look like :
-```json
-{
-  "BIKE_TYPE": 2,
-  "ELLIPTICAL_TYPE": 4,
-  "ROWING_TYPE": 3,
-  "TREADMILL_TYPE": 1,
-  "UNKNOWN_TYPE": 0,
-  "deviceId": "0B:54:49:D1:BC:DA",
-  "deviceName": "Domyos-TC-0314",
-  "deviceRSSI": 0,
-  "deviceType": 1,
-  "deviceConnected": false,
-  "devicePaused": false,
-  "elapsed_s": 0,
-  "elapsed_m": 0,
-  "elapsed_h": 0,
-  "pace_s": 0,
-  "pace_m": 0,
-  "pace_h": 0,
-  "moving_s": 0,
-  "moving_m": 0,
-  "moving_h": 0,
-  "speed": 0,
-  "speed_avg": 0,
-  "calories": 0,
-  "distance": 0,
-  "heart": 0,
-  "heart_avg": 0,
-  "heart_max": 0,
-  "jouls": 0,
-  "elevation": 0,
-  "difficult": 1,
-  "watts": 0,
-  "watts_avg": 0,
-  "watts_max": 0,
-  "kgwatts": 0,
-  "kgwatts_avg": 0,
-  "kgwatts_max": 0,
-  "workoutName": "",
-  "workoutStartDate": "",
-  "instructorName": "",
-  "latitude": null,
-  "longitude": null,
-  "nickName": "N/A",
-  "inclination": 0,
-  "inclination_avg": 0
-}
-```
-
-## Commands
-
-To send commands you will need to send a socket message in JSON format like : 
-```json
-{
-  "msg": "pause"
-}
-```
-
-which `msg` is always the name of the command. Command also return on WebSocket message like to acknowledge command :
-```json
-{
-  "msg": "R_pause"
-}
-```
-
-Here is a list of the most "useful" commands
-
-### Start
-#### Description :
-Allows you to start the bike / treadmill (Reset Timer if bike / treadmill is stopped)
-
-#### Send :
-```json
-{
-  "msg": "start"
-}
-```
-#### Response :
-```json
-{
-  "msg": "R_start"
-}
-```
-
-### Pause
-#### Description :
-Allows you to stop (pause) the bike / treadmill without reset timer.
-
-#### Send :
-```json
-{
-  "msg": "pause"
-}
-```
-#### Response :
-```json
-{
-  "msg": "R_pause"
-}
-```
-
-### Stop
-#### Description :
-Allows you to stop the bike / treadmill and reset timer.
-
-#### Send :
-```json
-{
-  "msg": "stop"
-}
-```
-#### Response :
-```json
-{
-  "msg": "R_stop"
-}
-```
-
-### SetSpeed
-#### Description :
-Allows you to control the treadmill speed.
-
-#### Send :
-```json
-{
-  "msg": "setspeed",
-  "content": {
-    "value": 8.0
-  }
-}
-```
-#### Response :
-```json
-{
-  "msg": "R_setspeed",
-  "content": {
-    "value": 8.0
-  }
-}
-```
-
-### SetResistance
-#### Description :
-Allows you to control the resistance bike or the treadmill incline.
-
-#### Send :
-```json
-{
-  "msg": "setresistance",
-  "content": {
-    "value": 8.0
-  }
-}
-```
-#### Response :
-```json
-{
-  "msg": "R_setresistance",
-  "content": {
-    "value": 8.0
-  }
-}
-```
-
-### SetFanSpeed
-#### Description :
-Allows you to control the fan bike / treadmill speed.
-
-#### Send :
-```json
-{
-  "msg": "setfanspeed",
-  "content": {
-    "value": 8.0
-  }
-}
-```
-#### Response :
-```json
-{
-  "msg": "R_setfanspeed",
-  "content": {
-    "value": 8.0
-  }
-}
-```
-
-# Source
-How compile Qt 5.12.10 on Raspberry Pi : https://www.tal.org/tutorials/building-qt-512-raspberry-pi
-
-How cross compile Qt 5.12.5 on Raspberry Pi (in French) : https://wiki.logre.eu/index.php/Cross-compilation_Qt_5.12.5_pour_Raspberry_Pi
-
-Issue [REQ] Add to qdomyos an API for remote access to treadmill #572
-
-PR "Templated" connections and Web server #252

docs/specs/org.bluetooth.characteristic.cross_trainer_data.xml

@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright 2017 Bluetooth SIG, Inc. All rights reserved.-->
-<Characteristic xsi:noNamespaceSchemaLocation="http://schemas.bluetooth.org/Documents/characteristic.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-name="Cross Trainer Data"
-type="org.bluetooth.characteristic.cross_trainer_data" uuid="2ACE"
-last-modified="2017-02-14" approved="Yes">
-  <InformativeText>
-    <Summary>The Cross Trainer Data characteristic is used to send
-    training-related data to the Client from a cross trainer
-    (Server).</Summary>
-  </InformativeText>
-  <Value>
-    <Field name="Flags">
-      <Requirement>Mandatory</Requirement>
-      <Format>24bit</Format>
-      <BitField>
-        <Bit index="0" size="1" name="More Data">
-          <Enumerations>
-            <Enumeration key="0" value="False" requires="C1" />
-            <Enumeration key="1" value="True" />
-          </Enumerations>
-        </Bit>
-        <Bit index="1" size="1" name="Average Speed present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C2" />
-          </Enumerations>
-        </Bit>
-        <Bit index="2" size="1" name="Total Distance Present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C3" />
-          </Enumerations>
-        </Bit>
-        <Bit index="3" size="1" name="Step Count present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C4" />
-          </Enumerations>
-        </Bit>
-        <Bit index="4" size="1" name="Stride Count present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C5" />
-          </Enumerations>
-        </Bit>
-        <Bit index="5" size="1" name="Elevation Gain present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C6" />
-          </Enumerations>
-        </Bit>
-        <Bit index="6" size="1"
-        name="Inclination and Ramp Angle Setting present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C7" />
-          </Enumerations>
-        </Bit>
-        <Bit index="7" size="1" name="Resistance Level Present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C8" />
-          </Enumerations>
-        </Bit>
-        <Bit index="8" size="1" name="Instantaneous Power present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C9" />
-          </Enumerations>
-        </Bit>
-        <Bit index="9" size="1" name="Average Power present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C10" />
-          </Enumerations>
-        </Bit>
-        <Bit index="10" size="1" name="Expended Energy present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C11" />
-          </Enumerations>
-        </Bit>
-        <Bit index="11" size="1" name="Heart Rate present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C12" />
-          </Enumerations>
-        </Bit>
-        <Bit index="12" size="1"
-        name="Metabolic Equivalent present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C13" />
-          </Enumerations>
-        </Bit>
-        <Bit index="13" size="1" name="Elapsed Time present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C14" />
-          </Enumerations>
-        </Bit>
-        <Bit index="14" size="1" name="Remaining Time present">
-          <Enumerations>
-            <Enumeration key="0" value="False" />
-            <Enumeration key="1" value="True" requires="C15" />
-          </Enumerations>
-        </Bit>
-        <Bit index="15" size="1" name="Movement Direction">
-          <Enumerations>
-            <Enumeration key="0" value="Forward" />
-            <Enumeration key="1" value="Backward" />
-          </Enumerations>
-        </Bit>
-        <ReservedForFutureUse index="16" size="8" />
-      </BitField>
-    </Field>
-    <Field name="Instantaneous Speed">
-      <InformativeText>Kilometer per hour with a resolution of
-      0.01</InformativeText>
-      <Requirement>C1</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.velocity.kilometre_per_hour</Unit>
-      <DecimalExponent>-2</DecimalExponent>
-    </Field>
-    <Field name="Average Speed">
-      <InformativeText>Kilometer per hour with a resolution of
-      0.01</InformativeText>
-      <Requirement>C2</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.velocity.kilometre_per_hour</Unit>
-      <DecimalExponent>-2</DecimalExponent>
-    </Field>
-    <Field name="Total Distance">
-      <InformativeText>Meters with a resolution of
-      1</InformativeText>
-      <Requirement>C3</Requirement>
-      <Format>uint24</Format>
-      <Unit>org.bluetooth.unit.length.metre</Unit>
-    </Field>
-    <Field name="Step Per Minute">
-      <InformativeText>Step/minute with a resolution of
-      1</InformativeText>
-      <Requirement>C4</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.step_per_minute</Unit>
-    </Field>
-    <Field name="Average Step Rate">
-      <InformativeText>Step/minute with a resolution of
-      1</InformativeText>
-      <Requirement>C4</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.step_per_minute</Unit>
-    </Field>
-    <Field name="Stride Count">
-      <InformativeText>Unitless with a resolution of
-      0.1</InformativeText>
-      <Requirement>C5</Requirement>
-      <Format>uint16</Format>
-      <DecimalExponent>-1</DecimalExponent>
-      <Unit>org.bluetooth.unit.unitless</Unit>
-    </Field>
-    <Field name="Positive Elevation Gain">
-      <InformativeText>Meters with a resolution of
-      1</InformativeText>
-      <Requirement>C6</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.length.metre</Unit>
-    </Field>
-    <Field name="Negative Elevation Gain">
-      <InformativeText>Meters with a resolution of
-      1</InformativeText>
-      <Requirement>C6</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.length.metre</Unit>
-    </Field>
-    <Field name="Inclination">
-      <InformativeText>Percent with a resolution of
-      0.1</InformativeText>
-      <Requirement>C7</Requirement>
-      <Format>sint16</Format>
-      <Unit>org.bluetooth.unit.percentage</Unit>
-      <DecimalExponent>-1</DecimalExponent>
-    </Field>
-    <Field name="Ramp Angle Setting">
-      <InformativeText>Degree with a resolution of
-      0.1</InformativeText>
-      <Requirement>C7</Requirement>
-      <Format>sint16</Format>
-      <Unit>org.bluetooth.unit.plane_angle.degree</Unit>
-      <DecimalExponent>-1</DecimalExponent>
-    </Field>
-    <Field name="Resistance Level">
-      <InformativeText>Unitless with a resolution of
-      0.1</InformativeText>
-      <Requirement>C8</Requirement>
-      <Format>sint16</Format>
-      <DecimalExponent>-1</DecimalExponent>
-      <Unit>org.bluetooth.unit.unitless</Unit>
-    </Field>
-    <Field name="Instantaneous Power">
-      <InformativeText>Watts with a resolution of
-      1</InformativeText>
-      <Requirement>C9</Requirement>
-      <Format>sint16</Format>
-      <Unit>org.bluetooth.unit.power.watt</Unit>
-    </Field>
-    <Field name="Average Power">
-      <InformativeText>Watts with a resolution of
-      1</InformativeText>
-      <Requirement>C10</Requirement>
-      <Format>sint16</Format>
-      <Unit>org.bluetooth.unit.power.watt</Unit>
-    </Field>
-    <Field name="Total Energy">
-      <InformativeText>Kilo Calorie with a resolution of
-      1</InformativeText>
-      <Requirement>C11</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.energy.kilogram_calorie</Unit>
-    </Field>
-    <Field name="Energy Per Hour">
-      <InformativeText>Kilo Calorie with a resolution of
-      1</InformativeText>
-      <Requirement>C11</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.energy.kilogram_calorie</Unit>
-    </Field>
-    <Field name="Energy Per Minute">
-      <InformativeText>Kilo Calorie with a resolution of
-      1</InformativeText>
-      <Requirement>C11</Requirement>
-      <Format>uint8</Format>
-      <Unit>org.bluetooth.unit.energy.kilogram_calorie</Unit>
-    </Field>
-    <Field name="Heart Rate">
-      <InformativeText>Beats per minute with a resolution of
-      1</InformativeText>
-      <Requirement>C12</Requirement>
-      <Format>uint8</Format>
-      <Unit>org.bluetooth.unit.period.beats_per_minute</Unit>
-    </Field>
-    <Field name="Metabolic Equivalent">
-      <InformativeText>Metabolic Equivalent with a resolution of
-      0.1</InformativeText>
-      <Requirement>C13</Requirement>
-      <Format>uint8</Format>
-      <DecimalExponent>-1</DecimalExponent>
-      <Unit>org.bluetooth.unit.metabolic_equivalent</Unit>
-    </Field>
-    <Field name="Elapsed Time">
-      <InformativeText>Second with a resolution of
-      1</InformativeText>
-      <Requirement>C14</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.time.second</Unit>
-    </Field>
-    <Field name="Remaining Time">
-      <InformativeText>Second with a resolution of
-      1</InformativeText>
-      <Requirement>C15</Requirement>
-      <Format>uint16</Format>
-      <Unit>org.bluetooth.unit.time.second</Unit>
-    </Field>
-  </Value>
-  <Note>The fields in the above table, reading from top to bottom,
-  are shown in the order of LSO to MSO, where LSO = Least
-  Significant Octet and MSO = Most Significant Octet. The Least
-  Significant Octet represents the eight bits numbered 0 to
-  7.</Note>
-</Characteristic>

generate_appx_windows_store.bat

@@ -1,6 +0,0 @@
-copy icons\iOS\iTunesArtwork@2x.png build-qdomyos-zwift-Qt_5_15_2_for_UWP_64bit_MSVC_2019-Release\release
-del build-qdomyos-zwift-Qt_5_15_2_for_UWP_64bit_MSVC_2019-Release\release\qz.appx
-cd build-qdomyos-zwift-Qt_5_15_2_for_UWP_64bit_MSVC_2019-Release\release
-"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\makeappx.exe" pack /d . /p qz
-explorer build-qdomyos-zwift-Qt_5_15_2_for_UWP_64bit_MSVC_2019-Release\release
-pause

qHttpServerBin/5.15.2/android/lib/libQt5HttpServer_arm64-v8a.prl

@@ -3,5 +3,5 @@ QMAKE_PRO_INPUT = httpserver.pro
 QMAKE_PRL_TARGET = libQt5HttpServer_arm64-v8a.so
 QMAKE_PRL_CONFIG = lex yacc depend_includepath testcase_targets import_plugins import_qpa_plugin prepare_docs qt_docs_targets qt_build_extra file_copies qmake_use qt warn_on release link_prl android_install unversioned_soname unversioned_libname plugin_with_soname android_deployment_settings clang_pch_style android-21 shared cross_compile shared release android linux unix posix gcc clang llvm copy_dir_files cross_compile compile_examples enable_new_dtags neon precompile_header prefix_build force_independent force_bootstrap builtin_testdata utf8_source create_prl link_prl no_private_qt_headers_warning QTDIR_build qt_example_installs exceptions_off testcase_exceptions explicitlib arm64-v8a Arm64-v8aBuild Arm64-v8a build_pass qtquickcompiler arm64-v8a Arm64-v8aBuild Arm64-v8a build_pass relative_qt_rpath git_build target_qt c++11 strict_c++ c++14 c++1z c99 c11 hide_symbols qt_install_headers need_fwd_pri qt_install_module create_cmake compiler_supports_fpmath qt_android_deps no_linker_version_script create_pc create_libtool arm64-v8a Arm64-v8aBuild Arm64-v8a build_pass have_target dll armeabi-v7a_and_arm64-v8a_and_x86_and_x86_64 build_all exclusive_builds multi_android_abi no_autoqmake thread moc resources
 QMAKE_PRL_VERSION = 5.12.0
-QMAKE_PRL_LIBS = C:/Qt/5.15.2/android/lib/libQt5SslServer_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5Network_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5Core_arm64-v8a.so
-QMAKE_PRL_LIBS_FOR_CMAKE = C:/Qt/5.15.2/android/lib/libQt5SslServer_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5Network_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5Core_arm64-v8a.so;
+QMAKE_PRL_LIBS = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5Network_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_arm64-v8a.so C:/Qt/5.15.2/android/lib/libQt5Core_arm64-v8a.so
+QMAKE_PRL_LIBS_FOR_CMAKE = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5Network_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_arm64-v8a.so;C:/Qt/5.15.2/android/lib/libQt5Core_arm64-v8a.so;

qHttpServerBin/5.15.2/android/lib/libQt5HttpServer_armeabi-v7a.prl

@@ -3,5 +3,5 @@ QMAKE_PRO_INPUT = httpserver.pro
 QMAKE_PRL_TARGET = libQt5HttpServer_armeabi-v7a.so
 QMAKE_PRL_CONFIG = lex yacc depend_includepath testcase_targets import_plugins import_qpa_plugin prepare_docs qt_docs_targets qt_build_extra file_copies qmake_use qt warn_on release link_prl android_install unversioned_soname unversioned_libname plugin_with_soname android_deployment_settings clang_pch_style android-21 shared cross_compile shared release android linux unix posix gcc clang llvm copy_dir_files cross_compile compile_examples enable_new_dtags neon precompile_header prefix_build force_independent force_bootstrap builtin_testdata utf8_source create_prl link_prl no_private_qt_headers_warning QTDIR_build qt_example_installs exceptions_off testcase_exceptions explicitlib armeabi-v7a Armeabi-v7aBuild Armeabi-v7a build_pass optimize_size qtquickcompiler armeabi-v7a Armeabi-v7aBuild Armeabi-v7a build_pass relative_qt_rpath git_build target_qt c++11 strict_c++ c++14 c++1z c99 c11 hide_symbols qt_install_headers need_fwd_pri qt_install_module create_cmake compiler_supports_fpmath qt_android_deps no_linker_version_script create_pc create_libtool armeabi-v7a Armeabi-v7aBuild Armeabi-v7a build_pass have_target dll armeabi-v7a_and_arm64-v8a_and_x86_and_x86_64 build_all exclusive_builds multi_android_abi no_autoqmake thread moc resources
 QMAKE_PRL_VERSION = 5.12.0
-QMAKE_PRL_LIBS = C:/Qt/5.15.2/android/lib/libQt5SslServer_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5Network_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5Core_armeabi-v7a.so
-QMAKE_PRL_LIBS_FOR_CMAKE = C:/Qt/5.15.2/android/lib/libQt5SslServer_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5Network_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5Core_armeabi-v7a.so;
+QMAKE_PRL_LIBS = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5Network_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_armeabi-v7a.so C:/Qt/5.15.2/android/lib/libQt5Core_armeabi-v7a.so
+QMAKE_PRL_LIBS_FOR_CMAKE = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5Network_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_armeabi-v7a.so;C:/Qt/5.15.2/android/lib/libQt5Core_armeabi-v7a.so;

qHttpServerBin/5.15.2/android/lib/libQt5HttpServer_x86.prl

@@ -3,5 +3,5 @@ QMAKE_PRO_INPUT = httpserver.pro
 QMAKE_PRL_TARGET = libQt5HttpServer_x86.so
 QMAKE_PRL_CONFIG = lex yacc depend_includepath testcase_targets import_plugins import_qpa_plugin prepare_docs qt_docs_targets qt_build_extra file_copies qmake_use qt warn_on release link_prl android_install unversioned_soname unversioned_libname plugin_with_soname android_deployment_settings clang_pch_style android-21 shared cross_compile shared release android linux unix posix gcc clang llvm copy_dir_files cross_compile compile_examples enable_new_dtags neon precompile_header prefix_build force_independent force_bootstrap builtin_testdata utf8_source create_prl link_prl no_private_qt_headers_warning QTDIR_build qt_example_installs exceptions_off testcase_exceptions explicitlib x86 X86Build X86 build_pass qtquickcompiler x86 X86Build X86 build_pass relative_qt_rpath git_build target_qt c++11 strict_c++ c++14 c++1z c99 c11 hide_symbols qt_install_headers need_fwd_pri qt_install_module create_cmake compiler_supports_fpmath qt_android_deps no_linker_version_script create_pc create_libtool x86 X86Build X86 build_pass have_target dll armeabi-v7a_and_arm64-v8a_and_x86_and_x86_64 build_all exclusive_builds multi_android_abi no_autoqmake thread moc resources
 QMAKE_PRL_VERSION = 5.12.0
-QMAKE_PRL_LIBS = C:/Qt/5.15.2/android/lib/libQt5SslServer_x86.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86.so C:/Qt/5.15.2/android/lib/libQt5Network_x86.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86.so C:/Qt/5.15.2/android/lib/libQt5Core_x86.so
-QMAKE_PRL_LIBS_FOR_CMAKE = C:/Qt/5.15.2/android/lib/libQt5SslServer_x86.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86.so;C:/Qt/5.15.2/android/lib/libQt5Network_x86.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86.so;C:/Qt/5.15.2/android/lib/libQt5Core_x86.so;
+QMAKE_PRL_LIBS = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_x86.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86.so C:/Qt/5.15.2/android/lib/libQt5Network_x86.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86.so C:/Qt/5.15.2/android/lib/libQt5Core_x86.so
+QMAKE_PRL_LIBS_FOR_CMAKE = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_x86.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86.so;C:/Qt/5.15.2/android/lib/libQt5Network_x86.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86.so;C:/Qt/5.15.2/android/lib/libQt5Core_x86.so;

qHttpServerBin/5.15.2/android/lib/libQt5HttpServer_x86_64.prl

@@ -3,5 +3,5 @@ QMAKE_PRO_INPUT = httpserver.pro
 QMAKE_PRL_TARGET = libQt5HttpServer_x86_64.so
 QMAKE_PRL_CONFIG = lex yacc depend_includepath testcase_targets import_plugins import_qpa_plugin prepare_docs qt_docs_targets qt_build_extra file_copies qmake_use qt warn_on release link_prl android_install unversioned_soname unversioned_libname plugin_with_soname android_deployment_settings clang_pch_style android-21 shared cross_compile shared release android linux unix posix gcc clang llvm copy_dir_files cross_compile compile_examples enable_new_dtags neon precompile_header prefix_build force_independent force_bootstrap builtin_testdata utf8_source create_prl link_prl no_private_qt_headers_warning QTDIR_build qt_example_installs exceptions_off testcase_exceptions explicitlib x86_64 X86_64Build X86_64 build_pass qtquickcompiler x86_64 X86_64Build X86_64 build_pass relative_qt_rpath git_build target_qt c++11 strict_c++ c++14 c++1z c99 c11 hide_symbols qt_install_headers need_fwd_pri qt_install_module create_cmake compiler_supports_fpmath qt_android_deps no_linker_version_script create_pc create_libtool x86_64 X86_64Build X86_64 build_pass have_target dll armeabi-v7a_and_arm64-v8a_and_x86_and_x86_64 build_all exclusive_builds multi_android_abi no_autoqmake thread moc resources
 QMAKE_PRL_VERSION = 5.12.0
-QMAKE_PRL_LIBS = C:/Qt/5.15.2/android/lib/libQt5SslServer_x86_64.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86_64.so C:/Qt/5.15.2/android/lib/libQt5Network_x86_64.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86_64.so C:/Qt/5.15.2/android/lib/libQt5Core_x86_64.so
-QMAKE_PRL_LIBS_FOR_CMAKE = C:/Qt/5.15.2/android/lib/libQt5SslServer_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5Network_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5Core_x86_64.so;
+QMAKE_PRL_LIBS = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_x86_64.so C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86_64.so C:/Qt/5.15.2/android/lib/libQt5Network_x86_64.so C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86_64.so C:/Qt/5.15.2/android/lib/libQt5Core_x86_64.so
+QMAKE_PRL_LIBS_FOR_CMAKE = D:/Dati/GoogleDrive/cpp/build-qthttpserver-Android_Qt_5_15_2_Clang_Multi_Abi-Release/lib/libQt5SslServer_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5WebSockets_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5Network_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5Concurrent_x86_64.so;C:/Qt/5.15.2/android/lib/libQt5Core_x86_64.so;

qHttpServerBin/5.15.2/headers/http_parser.h

@@ -1,449 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#ifndef http_parser_h
-#define http_parser_h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Also update SONAME in the Makefile whenever you change these. */
-#define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 9
-#define HTTP_PARSER_VERSION_PATCH 4
-
-#include <stddef.h>
-#if defined(_WIN32) && !defined(__MINGW32__) && \
-  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
-#include <BaseTsd.h>
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#elif (defined(__sun) || defined(__sun__)) && defined(__SunOS_5_9)
-#include <sys/inttypes.h>
-#else
-#include <stdint.h>
-#endif
-
-/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
- * faster
- */
-#ifndef HTTP_PARSER_STRICT
-# define HTTP_PARSER_STRICT 1
-#endif
-
-/* Maximium header size allowed. If the macro is not defined
- * before including this header then the default is used. To
- * change the maximum header size, define the macro in the build
- * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
- * the effective limit on the size of the header, define the macro
- * to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
- */
-#ifndef HTTP_MAX_HEADER_SIZE
-# define HTTP_MAX_HEADER_SIZE (80*1024)
-#endif
-
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-
-
-/* Callbacks should return non-zero to indicate an error. The parser will
- * then halt execution.
- *
- * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
- * returning '1' from on_headers_complete will tell the parser that it
- * should not expect a body. This is used when receiving a response to a
- * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
- * chunked' headers that indicate the presence of a body.
- *
- * Returning `2` from on_headers_complete will tell parser that it should not
- * expect neither a body nor any futher responses on this connection. This is
- * useful for handling responses to a CONNECT request which may not contain
- * `Upgrade` or `Connection: upgrade` headers.
- *
- * http_data_cb does not return data chunks. It will be called arbitrarily
- * many times for each string. E.G. you might get 10 callbacks for "on_url"
- * each providing just a few characters more data.
- */
-typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
-typedef int (*http_cb) (http_parser*);
-
-
-/* Status Codes */
-#define HTTP_STATUS_MAP(XX)                                                 \
-  XX(100, CONTINUE,                        Continue)                        \
-  XX(101, SWITCHING_PROTOCOLS,             Switching Protocols)             \
-  XX(102, PROCESSING,                      Processing)                      \
-  XX(200, OK,                              OK)                              \
-  XX(201, CREATED,                         Created)                         \
-  XX(202, ACCEPTED,                        Accepted)                        \
-  XX(203, NON_AUTHORITATIVE_INFORMATION,   Non-Authoritative Information)   \
-  XX(204, NO_CONTENT,                      No Content)                      \
-  XX(205, RESET_CONTENT,                   Reset Content)                   \
-  XX(206, PARTIAL_CONTENT,                 Partial Content)                 \
-  XX(207, MULTI_STATUS,                    Multi-Status)                    \
-  XX(208, ALREADY_REPORTED,                Already Reported)                \
-  XX(226, IM_USED,                         IM Used)                         \
-  XX(300, MULTIPLE_CHOICES,                Multiple Choices)                \
-  XX(301, MOVED_PERMANENTLY,               Moved Permanently)               \
-  XX(302, FOUND,                           Found)                           \
-  XX(303, SEE_OTHER,                       See Other)                       \
-  XX(304, NOT_MODIFIED,                    Not Modified)                    \
-  XX(305, USE_PROXY,                       Use Proxy)                       \
-  XX(307, TEMPORARY_REDIRECT,              Temporary Redirect)              \
-  XX(308, PERMANENT_REDIRECT,              Permanent Redirect)              \
-  XX(400, BAD_REQUEST,                     Bad Request)                     \
-  XX(401, UNAUTHORIZED,                    Unauthorized)                    \
-  XX(402, PAYMENT_REQUIRED,                Payment Required)                \
-  XX(403, FORBIDDEN,                       Forbidden)                       \
-  XX(404, NOT_FOUND,                       Not Found)                       \
-  XX(405, METHOD_NOT_ALLOWED,              Method Not Allowed)              \
-  XX(406, NOT_ACCEPTABLE,                  Not Acceptable)                  \
-  XX(407, PROXY_AUTHENTICATION_REQUIRED,   Proxy Authentication Required)   \
-  XX(408, REQUEST_TIMEOUT,                 Request Timeout)                 \
-  XX(409, CONFLICT,                        Conflict)                        \
-  XX(410, GONE,                            Gone)                            \
-  XX(411, LENGTH_REQUIRED,                 Length Required)                 \
-  XX(412, PRECONDITION_FAILED,             Precondition Failed)             \
-  XX(413, PAYLOAD_TOO_LARGE,               Payload Too Large)               \
-  XX(414, URI_TOO_LONG,                    URI Too Long)                    \
-  XX(415, UNSUPPORTED_MEDIA_TYPE,          Unsupported Media Type)          \
-  XX(416, RANGE_NOT_SATISFIABLE,           Range Not Satisfiable)           \
-  XX(417, EXPECTATION_FAILED,              Expectation Failed)              \
-  XX(421, MISDIRECTED_REQUEST,             Misdirected Request)             \
-  XX(422, UNPROCESSABLE_ENTITY,            Unprocessable Entity)            \
-  XX(423, LOCKED,                          Locked)                          \
-  XX(424, FAILED_DEPENDENCY,               Failed Dependency)               \
-  XX(426, UPGRADE_REQUIRED,                Upgrade Required)                \
-  XX(428, PRECONDITION_REQUIRED,           Precondition Required)           \
-  XX(429, TOO_MANY_REQUESTS,               Too Many Requests)               \
-  XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
-  XX(451, UNAVAILABLE_FOR_LEGAL_REASONS,   Unavailable For Legal Reasons)   \
-  XX(500, INTERNAL_SERVER_ERROR,           Internal Server Error)           \
-  XX(501, NOT_IMPLEMENTED,                 Not Implemented)                 \
-  XX(502, BAD_GATEWAY,                     Bad Gateway)                     \
-  XX(503, SERVICE_UNAVAILABLE,             Service Unavailable)             \
-  XX(504, GATEWAY_TIMEOUT,                 Gateway Timeout)                 \
-  XX(505, HTTP_VERSION_NOT_SUPPORTED,      HTTP Version Not Supported)      \
-  XX(506, VARIANT_ALSO_NEGOTIATES,         Variant Also Negotiates)         \
-  XX(507, INSUFFICIENT_STORAGE,            Insufficient Storage)            \
-  XX(508, LOOP_DETECTED,                   Loop Detected)                   \
-  XX(510, NOT_EXTENDED,                    Not Extended)                    \
-  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
-
-enum http_status
-  {
-#define XX(num, name, string) HTTP_STATUS_##name = num,
-  HTTP_STATUS_MAP(XX)
-#undef XX
-  };
-
-
-/* Request Methods */
-#define HTTP_METHOD_MAP(XX)         \
-  XX(0,  DELETE,      DELETE)       \
-  XX(1,  GET,         GET)          \
-  XX(2,  HEAD,        HEAD)         \
-  XX(3,  POST,        POST)         \
-  XX(4,  PUT,         PUT)          \
-  /* pathological */                \
-  XX(5,  CONNECT,     CONNECT)      \
-  XX(6,  OPTIONS,     OPTIONS)      \
-  XX(7,  TRACE,       TRACE)        \
-  /* WebDAV */                      \
-  XX(8,  COPY,        COPY)         \
-  XX(9,  LOCK,        LOCK)         \
-  XX(10, MKCOL,       MKCOL)        \
-  XX(11, MOVE,        MOVE)         \
-  XX(12, PROPFIND,    PROPFIND)     \
-  XX(13, PROPPATCH,   PROPPATCH)    \
-  XX(14, SEARCH,      SEARCH)       \
-  XX(15, UNLOCK,      UNLOCK)       \
-  XX(16, BIND,        BIND)         \
-  XX(17, REBIND,      REBIND)       \
-  XX(18, UNBIND,      UNBIND)       \
-  XX(19, ACL,         ACL)          \
-  /* subversion */                  \
-  XX(20, REPORT,      REPORT)       \
-  XX(21, MKACTIVITY,  MKACTIVITY)   \
-  XX(22, CHECKOUT,    CHECKOUT)     \
-  XX(23, MERGE,       MERGE)        \
-  /* upnp */                        \
-  XX(24, MSEARCH,     M-SEARCH)     \
-  XX(25, NOTIFY,      NOTIFY)       \
-  XX(26, SUBSCRIBE,   SUBSCRIBE)    \
-  XX(27, UNSUBSCRIBE, UNSUBSCRIBE)  \
-  /* RFC-5789 */                    \
-  XX(28, PATCH,       PATCH)        \
-  XX(29, PURGE,       PURGE)        \
-  /* CalDAV */                      \
-  XX(30, MKCALENDAR,  MKCALENDAR)   \
-  /* RFC-2068, section 19.6.1.2 */  \
-  XX(31, LINK,        LINK)         \
-  XX(32, UNLINK,      UNLINK)       \
-  /* icecast */                     \
-  XX(33, SOURCE,      SOURCE)       \
-
-enum http_method
-  {
-#define XX(num, name, string) HTTP_##name = num,
-  HTTP_METHOD_MAP(XX)
-#undef XX
-  };
-
-
-enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
-
-
-/* Flag values for http_parser.flags field */
-enum flags
-  { F_CHUNKED               = 1 << 0
-  , F_CONNECTION_KEEP_ALIVE = 1 << 1
-  , F_CONNECTION_CLOSE      = 1 << 2
-  , F_CONNECTION_UPGRADE    = 1 << 3
-  , F_TRAILING              = 1 << 4
-  , F_UPGRADE               = 1 << 5
-  , F_SKIPBODY              = 1 << 6
-  , F_CONTENTLENGTH         = 1 << 7
-  };
-
-
-/* Map for errno-related constants
- *
- * The provided argument should be a macro that takes 2 arguments.
- */
-#define HTTP_ERRNO_MAP(XX)                                           \
-  /* No error */                                                     \
-  XX(OK, "success")                                                  \
-                                                                     \
-  /* Callback-related errors */                                      \
-  XX(CB_message_begin, "the on_message_begin callback failed")       \
-  XX(CB_url, "the on_url callback failed")                           \
-  XX(CB_header_field, "the on_header_field callback failed")         \
-  XX(CB_header_value, "the on_header_value callback failed")         \
-  XX(CB_headers_complete, "the on_headers_complete callback failed") \
-  XX(CB_body, "the on_body callback failed")                         \
-  XX(CB_message_complete, "the on_message_complete callback failed") \
-  XX(CB_status, "the on_status callback failed")                     \
-  XX(CB_chunk_header, "the on_chunk_header callback failed")         \
-  XX(CB_chunk_complete, "the on_chunk_complete callback failed")     \
-                                                                     \
-  /* Parsing-related errors */                                       \
-  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
-  XX(HEADER_OVERFLOW,                                                \
-     "too many header bytes seen; overflow detected")                \
-  XX(CLOSED_CONNECTION,                                              \
-     "data received after completed connection: close message")      \
-  XX(INVALID_VERSION, "invalid HTTP version")                        \
-  XX(INVALID_STATUS, "invalid HTTP status code")                     \
-  XX(INVALID_METHOD, "invalid HTTP method")                          \
-  XX(INVALID_URL, "invalid URL")                                     \
-  XX(INVALID_HOST, "invalid host")                                   \
-  XX(INVALID_PORT, "invalid port")                                   \
-  XX(INVALID_PATH, "invalid path")                                   \
-  XX(INVALID_QUERY_STRING, "invalid query string")                   \
-  XX(INVALID_FRAGMENT, "invalid fragment")                           \
-  XX(LF_EXPECTED, "LF character expected")                           \
-  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
-  XX(INVALID_CONTENT_LENGTH,                                         \
-     "invalid character in content-length header")                   \
-  XX(UNEXPECTED_CONTENT_LENGTH,                                      \
-     "unexpected content-length header")                             \
-  XX(INVALID_CHUNK_SIZE,                                             \
-     "invalid character in chunk size header")                       \
-  XX(INVALID_CONSTANT, "invalid constant string")                    \
-  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
-  XX(STRICT, "strict mode assertion failed")                         \
-  XX(PAUSED, "parser is paused")                                     \
-  XX(UNKNOWN, "an unknown error occurred")                           \
-  XX(INVALID_TRANSFER_ENCODING,                                      \
-     "request has invalid transfer-encoding")                        \
-
-
-/* Define HPE_* values for each errno value above */
-#define HTTP_ERRNO_GEN(n, s) HPE_##n,
-enum http_errno {
-  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
-};
-#undef HTTP_ERRNO_GEN
-
-
-/* Get an http_errno value from an http_parser */
-#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
-
-
-struct http_parser {
-  /** PRIVATE **/
-  unsigned int type : 2;         /* enum http_parser_type */
-  unsigned int flags : 8;       /* F_* values from 'flags' enum; semi-public */
-  unsigned int state : 7;        /* enum state from http_parser.c */
-  unsigned int header_state : 7; /* enum header_state from http_parser.c */
-  unsigned int index : 5;        /* index into current matcher */
-  unsigned int uses_transfer_encoding : 1; /* Transfer-Encoding header is present */
-  unsigned int allow_chunked_length : 1; /* Allow headers with both
-                                          * `Content-Length` and
-                                          * `Transfer-Encoding: chunked` set */
-  unsigned int lenient_http_headers : 1;
-
-  uint32_t nread;          /* # bytes read in various scenarios */
-  uint64_t content_length; /* # bytes in body. `(uint64_t) -1` (all bits one)
-                            * if no Content-Length header.
-                            */
-
-  /** READ-ONLY **/
-  unsigned short http_major;
-  unsigned short http_minor;
-  unsigned int status_code : 16; /* responses only */
-  unsigned int method : 8;       /* requests only */
-  unsigned int http_errno : 7;
-
-  /* 1 = Upgrade header was present and the parser has exited because of that.
-   * 0 = No upgrade header present.
-   * Should be checked when http_parser_execute() returns in addition to
-   * error checking.
-   */
-  unsigned int upgrade : 1;
-
-  /** PUBLIC **/
-  void *data; /* A pointer to get hook to the "connection" or "socket" object */
-};
-
-
-struct http_parser_settings {
-  http_cb      on_message_begin;
-  http_data_cb on_url;
-  http_data_cb on_status;
-  http_data_cb on_header_field;
-  http_data_cb on_header_value;
-  http_cb      on_headers_complete;
-  http_data_cb on_body;
-  http_cb      on_message_complete;
-  /* When on_chunk_header is called, the current chunk length is stored
-   * in parser->content_length.
-   */
-  http_cb      on_chunk_header;
-  http_cb      on_chunk_complete;
-};
-
-
-enum http_parser_url_fields
-  { UF_SCHEMA           = 0
-  , UF_HOST             = 1
-  , UF_PORT             = 2
-  , UF_PATH             = 3
-  , UF_QUERY            = 4
-  , UF_FRAGMENT         = 5
-  , UF_USERINFO         = 6
-  , UF_MAX              = 7
-  };
-
-
-/* Result structure for http_parser_parse_url().
- *
- * Callers should index into field_data[] with UF_* values iff field_set
- * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
- * because we probably have padding left over), we convert any port to
- * a uint16_t.
- */
-struct http_parser_url {
-  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
-  uint16_t port;                /* Converted UF_PORT string */
-
-  struct {
-    uint16_t off;               /* Offset into buffer in which field starts */
-    uint16_t len;               /* Length of run in buffer */
-  } field_data[UF_MAX];
-};
-
-
-/* Returns the library version. Bits 16-23 contain the major version number,
- * bits 8-15 the minor version number and bits 0-7 the patch level.
- * Usage example:
- *
- *   unsigned long version = http_parser_version();
- *   unsigned major = (version >> 16) & 255;
- *   unsigned minor = (version >> 8) & 255;
- *   unsigned patch = version & 255;
- *   printf("http_parser v%u.%u.%u\n", major, minor, patch);
- */
-unsigned long http_parser_version(void);
-
-void http_parser_init(http_parser *parser, enum http_parser_type type);
-
-
-/* Initialize http_parser_settings members to 0
- */
-void http_parser_settings_init(http_parser_settings *settings);
-
-
-/* Executes the parser. Returns number of parsed bytes. Sets
- * `parser->http_errno` on error. */
-size_t http_parser_execute(http_parser *parser,
-                           const http_parser_settings *settings,
-                           const char *data,
-                           size_t len);
-
-
-/* If http_should_keep_alive() in the on_headers_complete or
- * on_message_complete callback returns 0, then this should be
- * the last message on the connection.
- * If you are the server, respond with the "Connection: close" header.
- * If you are the client, close the connection.
- */
-int http_should_keep_alive(const http_parser *parser);
-
-/* Returns a string version of the HTTP method. */
-const char *http_method_str(enum http_method m);
-
-/* Returns a string version of the HTTP status code. */
-const char *http_status_str(enum http_status s);
-
-/* Return a string name of the given error */
-const char *http_errno_name(enum http_errno err);
-
-/* Return a string description of the given error */
-const char *http_errno_description(enum http_errno err);
-
-/* Initialize all http_parser_url members to 0 */
-void http_parser_url_init(struct http_parser_url *u);
-
-/* Parse a URL; return nonzero on failure */
-int http_parser_parse_url(const char *buf, size_t buflen,
-                          int is_connect,
-                          struct http_parser_url *u);
-
-/* Pause or un-pause the parser; a nonzero value pauses */
-void http_parser_pause(http_parser *parser, int paused);
-
-/* Checks if this is the final chunk of the body. */
-int http_body_is_final(const http_parser *parser);
-
-/* Change the maximum header size provided at compile time. */
-void http_parser_set_max_header_size(uint32_t size);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

qdomyos-zwift.pro

@@ -1,24 +0,0 @@
-TEMPLATE = subdirs
-CONFIG+=ordered
-
-!ios: !android: {
-SUBDIRS = \
-    src/qdomyos-zwift-lib.pro \
-    src/qdomyos-zwift.pro \
-    tst/qdomyos-zwift-tests.pro
-    
-tst.depends = src/qdomyos-zwift-lib.pro
-}
-
-android:  {
-    SUBDIRS = \
-        src/qdomyos-zwift.pro
-}
-
-ios: {
-    SUBDIRS = \
-        src/qdomyos-zwift-lib.pro \
-        src/qdomyos-zwift.pro
-}
-
- 

qt-patches/android/5.15.0/qtconnectivity/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java

@@ -1018,7 +1018,7 @@ public class QtBluetoothLE {
 
     /*
      * Already executed in GattCallback so executed by the HandlerThread. No need to
-     * post it to the Handler.
+     * post it to the Hander.
      */
     private void scheduleMtuExchange() {
         ReadWriteJob newJob = new ReadWriteJob();

qt-patches/ios/5.15.2/qtconnectivity/src/bluetooth/osx/osxbtcentralmanager.mm

@@ -385,11 +385,11 @@ QT_USE_NAMESPACE
     }
 
     [uuids addObject:nsUuid];
-    // With the latest CoreBluetooth, we can synchronously retrieve peripherals:
+    // With the latest CoreBluetooth, we can synchronously retrive peripherals:
     QT_BT_MAC_AUTORELEASEPOOL;
     NSArray *const peripherals = [manager retrievePeripheralsWithIdentifiers:uuids];
     if (!peripherals || peripherals.count != 1) {
-        qCWarning(QT_BT_OSX) << "failed to retrieve a peripheral";
+        qCWarning(QT_BT_OSX) << "failed to retrive a peripheral";
         if (notifier)
             emit notifier->CBManagerError(QLowEnergyController::UnknownRemoteDeviceError);
         return;
@@ -648,7 +648,7 @@ QT_USE_NAMESPACE
     servicesToDiscoverDetails.removeAll(serviceUuid);
 
     const NSUInteger nHandles = qt_countGATTEntries(service);
-    Q_ASSERT_X(nHandles, Q_FUNC_INFO, "unexpected number of GATT entries");
+    Q_ASSERT_X(nHandles, Q_FUNC_INFO, "unexpected number of GATT entires");
 
     const QLowEnergyHandle maxHandle = std::numeric_limits<QLowEnergyHandle>::max();
     if (nHandles >= maxHandle || lastValidHandle > maxHandle - nHandles) {
@@ -1058,7 +1058,7 @@ QT_USE_NAMESPACE
 
     // TODO: test that we NEVER have the same characteristic twice in array!
     // At the moment I just protect against this by iterating in a reverse
-    // order (at least avoiding a potential infinite loop with '-indexOfObject:').
+    // order (at least avoiding a potential inifite loop with '-indexOfObject:').
     NSArray *const cs = service.characteristics;
     if (cs.count == 1)
         return nil;
@@ -1091,7 +1091,7 @@ QT_USE_NAMESPACE
 
     // TODO: test that we NEVER have the same characteristic twice in array!
     // At the moment I just protect against this by iterating in a reverse
-    // order (at least avoiding a potential infinite loop with '-indexOfObject:').
+    // order (at least avoiding a potential inifite loop with '-indexOfObject:').
     NSArray *const cs = service.characteristics;
     if (cs.count == 1)
         return nil;
@@ -1597,8 +1597,8 @@ QT_USE_NAMESPACE
     } else {
         // This is (probably) the result of update notification.
         // It's very possible we can have an invalid handle here (0) -
-        // if something else is wrong (we subscribed for a notification),
-        // disconnected (but other application is connected) and still receiving
+        // if something esle is wrong (we subscribed for a notification),
+        // disconnected (but other application is connected) and still receiveing
         // updated values ...
         // TODO: this must be properly tested.
         if (!chHandle) {

src/AppxManifest.xml

@@ -1,30 +0,0 @@
-<Package xmlns=\"http://schemas.microsoft.com/appx/manifest/foundation/windows10\" xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\" xmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\" xmlns:uap3=\"http://schemas.microsoft.com/appx/manifest/uap/windows10/3\" xmlns:mobile=\"http://schemas.microsoft.com/appx/manifest/mobile/windows10\" xmlns:iot=\"http://schemas.microsoft.com/appx/manifest/iot/windows10\" IgnorableNamespaces=\"uap uap3 mp mobile iot\">
-<Identity Name=\"35433QZdiRobertoViola.QZFitness\" Publisher=\"CN=CA24F902-6882-40DF-B1E3-2E1B81CD730C\" Version=\"2.10.83.0\" ProcessorArchitecture=\"x64\"/>
-<Properties>
-<DisplayName>QZ Fitness</DisplayName>
-<PublisherDisplayName>QZ di Roberto Viola</PublisherDisplayName>
-<Description>QZ Fitness syncs fitness bikes, ellipticals, rowers, and treadmills to training apps like Echelon, Peloton, Zwift and Strava providing you with an unparalleled level of connectivity that keeps you informed and in control of your workouts</Description>
-<Logo>50.png</Logo>
-</Properties>
-<Dependencies>
-<TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.19041.0\" MaxVersionTested=\"10.0.19041.0\"/>
-<PackageDependency Name=\"Microsoft.VCLibs.140.00\" MinVersion=\"14.0.0.0\" Publisher=\"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US\"/>
-</Dependencies>
-<Resources>
-<Resource Language=\"en\"/>
-</Resources>
-<Applications>
-<Application Id=\"App\" Executable=\"qdomyos-zwift.exe\" EntryPoint=\"qdomyos-zwift.App\">
-<uap:VisualElements DisplayName=\"qdomyos-zwift\" Description=\"Default package description\" BackgroundColor=\"green\" Square150x150Logo=\"150.png\" Square44x44Logo=\"44.png\">
-</uap:VisualElements>
-</Application>
-</Applications>
-<Capabilities>
-<Capability Name=\"internetClient\"/>
-<Capability Name=\"internetClientServer\"/>
-<Capability Name=\"privateNetworkClientServer\"/>
-<DeviceCapability Name=\"bluetooth.genericAttributeProfile\"/>
-<DeviceCapability Name=\"bluetooth.rfcomm\"/>
-<DeviceCapability Name=\"location\"/>
-</Capabilities>
-</Package>

src/ChartJsTest.qml

@@ -19,19 +19,11 @@ ColumnLayout {
         url: "http://localhost:" + settings.value("template_inner_QZWS_port") + "/chartjs/chart.htm"
         visible: true
         onLoadingChanged: {
-            if (loadRequest.errorString) {
+            if (loadRequest.errorString)
                 console.error(loadRequest.errorString);
-                console.error("port " + settings.value("template_inner_QZWS_port"));
-            }
         }
     }
 
-    Timer {
-        id: chartJscheckStartFromWeb
-        interval: 200; running: true; repeat: true
-        onTriggered: {if(rootItem.startRequested) {rootItem.startRequested = false; rootItem.stopRequested = false; stackView.pop(); }}
-    }
-
     Button {
         id: closeButton
         height: 50

src/Computrainer.h

@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2009 Mark Liversedge (liversedge@gmail.com)
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-// I have consciously avoided putting things like data logging, lap marking,
-// intervals or any load management functions in this class. It is restricted
-// to controlling an reading telemetry from the device
-//
-// I expect higher order classes to implement such functions whilst
-// other devices (e.g. ANT+ devices) may be implemented with the same basic
-// interface
-//
-// I have avoided a base abstract class at this stage since I am uncertain
-// what core methods would be required by say, ANT+ or Tacx devices
-
-#ifndef _Computrainer_h
-#define _Computrainer_h 1
-
-#include <QDebug>
-#include <QFile>
-#include <QMutex>
-#include <QString>
-#include <QThread>
-
-#ifdef WIN32
-#include <windef.h>
-#endif
-
-#ifdef WIN32
-#include <winbase.h>
-#include <windows.h>
-#else
-#include <sys/ioctl.h>
-#include <termios.h> // unix!!
-#include <unistd.h>  // unix!!
-#ifndef N_TTY        // for OpenBSD, this is a hack XXX
-#define N_TTY 0
-#endif
-#endif
-
-#ifdef Q_OS_ANDROID
-#include "keepawakehelper.h"
-#include <QAndroidJniObject>
-#endif
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-/* Some CT Microcontroller / Protocol Constants */
-
-/* read timeouts in microseconds */
-#define CT_READTIMEOUT 1000
-#define CT_WRITETIMEOUT 2000
-
-// message type
-#define CT_SPEED 0x01
-#define CT_POWER 0x02
-#define CT_HEARTRATE 0x03
-#define CT_CADENCE 0x06
-#define CT_RRC 0x09
-#define CT_SENSOR 0x0b
-
-// buttons
-#define CT_RESET 0x01
-#define CT_F1 0x02
-#define CT_F3 0x04
-#define CT_PLUS 0x08
-#define CT_F2 0x10
-#define CT_MINUS 0x20
-#define CT_SSS 0x40 // spinscan sync is not a button!
-#define CT_NONE 0x80
-
-/* Device operation mode */
-#define CT_ERGOMODE 0x01
-#define CT_SSMODE 0x02
-#define CT_CALIBRATE 0x04
-
-/* UI operation mode */
-#define UI_MANUAL 0x01 // using +/- keys to adjust
-#define UI_ERG 0x02    // running an erg file!
-
-/* Control status */
-#define CT_RUNNING 0x01
-#define CT_PAUSED 0x02
-
-/* default operation mode */
-#define DEFAULT_MODE CT_ERGOMODE
-#define DEFAULT_LOAD 100.00
-#define DEFAULT_GRADIENT 2.00
-
-class Computrainer : public QThread {
-
-  public:
-    Computrainer(QObject *parent = 0, QString deviceFilename = 0); // pass device
-    ~Computrainer();
-
-    QObject *parent;
-
-    // HIGH-LEVEL FUNCTIONS
-    int start();                           // Calls QThread to start
-    int restart();                         // restart after paused
-    int pause();                           // pauses data collection, inbound telemetry is discarded
-    int stop();                            // stops data collection thread
-    int quit(int error);                   // called by thread before exiting
-    bool discover(QString deviceFilename); // confirm CT is attached to device
-
-    // SET
-    void setDevice(QString deviceFilename); // setup the device filename
-    void setLoad(double load);              // set the load to generate in ERGOMODE
-    void setGradient(double gradient);      // set the load to generate in SSMODE
-    void setMode(int mode,
-                 double load = DEFAULT_LOAD, // set mode to CT_ERGOMODE or CT_SSMODE
-                 double gradient = DEFAULT_GRADIENT);
-
-    // GET TELEMETRY AND STATUS
-    // direct access to class variables is not allowed because we need to use wait conditions
-    // to sync data read/writes between the run() thread and the main gui thread
-    bool isCalibrated();
-    bool isHRConnected();
-    bool isCADConnected();
-    void getTelemetry(double &Power, double &HeartRate, double &Cadence, double &Speed, double &RRC, bool &calibration,
-                      int &Buttons, uint8_t *ss, int &Status);
-    void getSpinScan(double spinData[]);
-    int getMode();
-    double getGradient();
-    double getLoad();
-
-  private:
-    void run() override; // called by start to kick off the CT comtrol thread
-
-    // 56 bytes comprise of 8 7byte command messages, where
-    // the last is the set load / gradient respectively
-    uint8_t ERGO_Command[56], SS_Command[56];
-
-    // Utility and BG Thread functions
-    int openPort();
-    int closePort();
-
-    // Protocol encoding
-    void prepareCommand(int mode, double value); // sets up the command packet according to current settings
-    int sendCommand(int mode);                   // writes a command to the device
-    int calcCRC(int value);                      // calculates the checksum for the current command
-
-    // Protocol decoding
-    int readMessage();
-    void unpackTelemetry(int &b1, int &b2, int &b3, int &buttons, int &type, int &value8, int &value12);
-
-    // Mutex for controlling accessing private data
-    QMutex pvars;
-
-    // INBOUND TELEMETRY - all volatile since it is updated by the run() thread
-    volatile double devicePower;      // current output power in Watts
-    volatile double deviceHeartRate;  // current heartrate in BPM
-    volatile double deviceCadence;    // current cadence in RPM
-    volatile double deviceSpeed;      // current speed in KPH
-    volatile double deviceRRC;        // calibrated Rolling Resistance
-    volatile bool deviceCalibrated;   // is it calibrated?
-    volatile uint8_t spinScan[24];    // SS values only in SS_MODE
-    volatile int deviceButtons;       // Button status
-    volatile bool deviceHRConnected;  // HR jack is connected
-    volatile bool deviceCADConnected; // Cadence jack is connected
-    volatile int deviceStatus;        // Device status running, paused, disconnected
-
-    // OUTBOUND COMMANDS - all volatile since it is updated by the GUI thread
-    volatile int mode;
-    volatile double load;
-    volatile double gradient;
-
-    // i/o message holder
-    uint8_t buf[7];
-
-    // device port
-    QString deviceFilename;
-#ifdef WIN32
-    HANDLE devicePort;  // file descriptor for reading from com3
-    DCB deviceSettings; // serial port settings baud rate et al
-#else
-    int devicePort;                // unix!!
-    struct termios deviceSettings; // unix!!
-#endif
-    // raw device utils
-    int rawWrite(uint8_t *bytes, int size); // unix!!
-    int rawRead(uint8_t *bytes, int size);  // unix!!
-
-#ifdef Q_OS_ANDROID
-    QList<jbyte> bufRX;
-    bool cleanFrame = false;
-#endif
-};
-
-class CTsleeper : public QThread {
-  public:
-    static void msleep(unsigned long msecs); // inherited from QThread
-};
-
-#endif // _GC_Computrainer_h

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

@@ -1,41 +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>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<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>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>ConnectIQ.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>i386</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

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

@@ -1,237 +0,0 @@
-//
-//  ConnectIQ.h
-//  ConnectIQ
-//
-//  Copyright (c) 2014 Garmin. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "IQConstants.h"
-#import "IQDevice.h"
-#import "IQApp.h"
-
-// --------------------------------------------------------------------------------
-#pragma mark - PUBLIC TYPES
-// --------------------------------------------------------------------------------
-
-/// @brief  SendMessage progress callback block
-///
-/// @param  sentBytes  The number of bytes that have been successfully transferred
-///                    to the device so far for this connection.
-/// @param  totalBytes The total number of bytes to transfer for this connection.
-typedef void (^IQSendMessageProgress)(uint32_t sentBytes, uint32_t totalBytes);
-
-/// @brief  SendMessage completion callback block
-///
-/// @param  result The result of the SendMessage operation.
-typedef void (^IQSendMessageCompletion)(IQSendMessageResult result);
-
-/// @brief  Conforming to the IQUIOverrideDelegate protocol indicates that an
-///         object handles one or more events triggered by the ConnectIQ SDK that
-///         require user input.
-@protocol IQUIOverrideDelegate <NSObject>
-@optional
-/// @brief  Called by the ConnectIQ SDK when an action has been requested that
-///         requires Garmin Connect Mobile to be installed.
-///
-///         The receiver should choose whether or not to launch the Apple App
-///         Store page for GCM, ideally by presenting the user with a choice.
-///
-///         If the receiver of this message decides to install GCM, it must call
-///         showAppStoreForConnectMobile.
-- (void)needsToInstallConnectMobile;
-@end
-
-/// @brief  Conforming to the IQDeviceEventDelegate protocol indicates that an
-///         object handles ConnectIQ device status events.
-@protocol IQDeviceEventDelegate <NSObject>
-@optional
-/// @brief  Called by the ConnectIQ SDK when an IQDevice's connection status has
-///         changed.
-///
-/// @param  device The IQDevice whose status changed.
-/// @param  status The new status of the device.
-- (void)deviceStatusChanged:(IQDevice *)device status:(IQDeviceStatus)status;
-@end
-
-/// @brief  Conforming to the IQAppMessageDelegate protocol indicates that an
-///         object handles messages from ConnectIQ apps on compatible devices.
-@protocol IQAppMessageDelegate <NSObject>
-@optional
-/// @brief  Called by the ConnectIQ SDK when a message is received from a device.
-///
-/// @param  message The message that was received.
-/// @param  app     The device app that sent the message.
-- (void)receivedMessage:(id)message fromApp:(IQApp *)app;
-@end
-
-// --------------------------------------------------------------------------------
-#pragma mark - CLASS DEFINITION
-// --------------------------------------------------------------------------------
-
-/// @brief  The root of the ConnectIQ SDK API.
-@interface ConnectIQ : NSObject
-
-+ (instancetype)new NS_UNAVAILABLE;
-- (instancetype)init NS_UNAVAILABLE;
-
-// --------------------------------------------------------------------------------
-#pragma mark - SINGLETON ACCESS
-// --------------------------------------------------------------------------------
-
-/// @brief  Exposes the single static instance of the ConnectIQ class.
-///
-/// @return The single status instance of the ConnectIQ class.
-+ (ConnectIQ *)sharedInstance;
-
-// --------------------------------------------------------------------------------
-#pragma mark - INITIALIZATION
-// --------------------------------------------------------------------------------
-
-/// @brief  Initializes the ConnectIQ SDK with startup parameters necessary for
-///         its operation.
-///
-/// @param  urlScheme The URL scheme for this companion app. When Garmin Connect
-///                   Mobile is launched, it will return to the companion app by
-///                   launching a URL with this scheme.
-/// @param  delegate  The delegate that the SDK will use for notifying the
-///                   companion app about events that require user input. If this
-///                   is nil, the SDK's default UI will be used.
-- (void)initializeWithUrlScheme:(NSString *)urlScheme uiOverrideDelegate:(id<IQUIOverrideDelegate>)delegate;
-
-// --------------------------------------------------------------------------------
-#pragma mark - EXTERNAL LAUNCHING
-// --------------------------------------------------------------------------------
-
-/// @brief  Launches the Apple App Store page for the Garmin Connect Mobile app.
-///         The companion app should only call this in response to a
-///         needsToInstallConnectMobile event that gets triggered on the
-///         IQUIOverrideDelegate.
-- (void)showAppStoreForConnectMobile;
-
-/// @brief  Launches Garmin Connect Mobile for the purpose of retrieving a list of
-///         ConnectIQ-compatible devices.
-///
-///         Once the user has chosen which ConnectIQ devices to share with the
-///         companion app, GCM will return those devices to the companion app by
-///         opening a URL with the scheme registered in
-///         initializeWithUrlScheme:uiOverrideDelegate:.
-///
-///         The companion app should handle this URL by passing it in to the
-///         parseDeviceSelectionResponseFromURL: method to get the list of devices
-///         that the user permitted the companion app to communicate with.
-- (void)showConnectIQDeviceSelection;
-
-/// @brief  Parses a URL opened from Garmin Connect Mobile into a list of devices.
-///
-/// @param  url The URL to parse.
-///
-/// @return An array of IQDevice objects representing the ConnectIQ-compatible
-///         devices that the user allowed GCM to share with the companion app.
-///
-/// @seealso showConnectIQDeviceSelection
-- (NSArray *)parseDeviceSelectionResponseFromURL:(NSURL *)url;
-
-/// @brief  Launches Garmin Connect Mobile and shows the ConnectIQ app store page
-///         for the given app.
-///
-///         The companion app should call this if the user would like to manage
-///         the app on the device, such as to install, upgrade, uninstall, or
-///         modify settings.
-///
-/// @param  app The app to show the ConnectIQ app store page for.
-- (void)showConnectIQStoreForApp:(IQApp *)app;
-
-// --------------------------------------------------------------------------------
-#pragma mark - DEVICE MANAGEMENT
-// --------------------------------------------------------------------------------
-
-/// @brief  Registers an object as a listener for ConnectIQ device status events.
-///
-///         A device may have multiple device event listeners if this method is
-///         called more than once.
-///
-/// @param  device   A device to listen for status events from.
-/// @param  delegate The listener which will receive status events for this device.
-- (void)registerForDeviceEvents:(IQDevice *)device delegate:(id<IQDeviceEventDelegate>)delegate;
-
-/// @brief  Unregisters a listener for a specific device.
-///
-/// @param  device The device to unregister the listener for.
-/// @param  delegate The listener to remove from the device.
-- (void)unregisterForDeviceEvents:(IQDevice *)device delegate:(id<IQDeviceEventDelegate>)delegate;
-
-/// @brief  Unregisters the specified listener from all devices for which it had
-///         previously been registered.
-///
-/// @param  delegate The listener to unregister.
-- (void)unregisterForAllDeviceEvents:(id<IQDeviceEventDelegate>)delegate;
-
-/// @brief  Gets the current connection status of a device.
-///
-///         The device must have been registered for event notifications by
-///         calling registerForDeviceEvents:delegate: or this method will return
-///         IQDeviceStatus_InvalidDevice.
-///
-/// @param  device The device to get the status for.
-///
-/// @return The device's current connection status.
-- (IQDeviceStatus)getDeviceStatus:(IQDevice *)device;
-
-// --------------------------------------------------------------------------------
-#pragma mark - APP MANAGEMENT
-// --------------------------------------------------------------------------------
-
-/// @brief  Begins getting the status of an app on a device. This method returns
-///         immediately.
-///
-/// @param  app        The IQApp to get the status for.
-/// @param  completion The completion block that will be triggered when the device
-///                    status operation is complete.
-- (void)getAppStatus:(IQApp *)app completion:(void(^)(IQAppStatus *appStatus))completion;
-
-/// @brief  Registers an object as a listener for ConnectIQ messages from an app
-///         on a device.
-///
-///         An app may have multiple message listeners if this method is called
-///         more than once.
-///
-/// @param  app      The app to listen for messages from.
-/// @param  delegate The listener which will receive messages for this app.
-- (void)registerForAppMessages:(IQApp *)app delegate:(id<IQAppMessageDelegate>)delegate;
-
-/// @brief  Unregisters a listener for a specific app.
-///
-/// @param  app      The app to unregister a listener for.
-/// @param  delegate The listener to remove from the app.
-- (void)unregisterForAppMessages:(IQApp *)app delegate:(id<IQAppMessageDelegate>)delegate;
-
-/// @brief  Unregisters all previously registered apps for a specific listener.
-///
-/// @param  delegate The listener to unregister.
-- (void)unregisterForAllAppMessages:(id<IQAppMessageDelegate>)delegate;
-
-/// @brief  Begins sending a message to an app. This method returns immediately.
-///
-/// @param  message    The message to send to the app. This message must be one of
-///                    the following types: NSString, NSNumber, NSNull, NSArray,
-///                    or NSDictionary. Arrays and dictionaries may be nested.
-/// @param  app        The app to send the message to.
-/// @param  progress   A progress block that will be triggered periodically
-///                    throughout the transfer. This is guaranteed to be triggered
-///                    at least once.
-/// @param  completion A completion block that will be triggered when the send
-///                    message operation is complete.
-- (void)sendMessage:(id)message toApp:(IQApp *)app progress:(IQSendMessageProgress)progress completion:(IQSendMessageCompletion)completion;
-
-/// @brief  Sends an open app request message request to the device. This method returns immediately.
-///
-/// @param  app        The app to open.
-/// @param  completion A completion block that will be triggered when the send
-///                    message operation is complete.
-- (void)openAppRequest:(IQApp *)app completion:(IQSendMessageCompletion)completion;
-
-// TODO *** Holding off on documenting this until this method actually works.
-- (void)sendImage:(NSData *)bitmap toApp:(IQApp *)app progress:(IQSendMessageProgress)progress completion:(IQSendMessageCompletion)completion;
-
-@end

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

@@ -1,34 +0,0 @@
-//
-//  IQApp.h
-//  ConnectIQ
-//
-//  Copyright (c) 2014 Garmin. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "IQDevice.h"
-#import "IQAppStatus.h"
-
-/// @brief  Represents an instance of a ConnectIQ app that is installed on a
-///         Garmin device.
-@interface IQApp : NSObject <NSSecureCoding>
-
-/// @brief  The unique identifier for this app.
-@property (nonatomic, readonly) NSUUID *uuid;
-
-/// @brief  The unique identifier for this app in the store.
-@property (nonatomic, readonly) NSUUID *storeUuid;
-
-/// @brief  The device that this app is installed on.
-@property (nonatomic, readonly) IQDevice *device;
-
-/// @brief  Creates a new app instance.
-///
-/// @param  uuid        The UUID of the app to create.
-/// @param  storeUuid   The store UUID of the app to create.
-/// @param  device      The device the app to create is installed on.
-///
-/// @return A new IQApp instance with the appropriate values set.
-+ (IQApp *)appWithUUID:(NSUUID *)uuid storeUuid:(NSUUID *)storeUuid device:(IQDevice *)device;
-
-@end

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

@@ -1,20 +0,0 @@
-//
-//  IQAppStatus.h
-//  ConnectIQ
-//
-//  Copyright (c) 2014 Garmin. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-/// @brief  Represents the current status of an app on a Garmin device.
-@interface IQAppStatus : NSObject
-
-/// @brief  YES if the app is installed on the device, NO if it isn't.
-@property (nonatomic, readonly) BOOL isInstalled;
-
-/// @brief  The version of the app that is currently installed on the device. If
-///         the app is not installed, this value is unused.
-@property (nonatomic, readonly) uint16_t version;
-
-@end

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

@@ -1,63 +0,0 @@
-//
-//  IQConstants.h
-//  ConnectIQ
-//
-//  Copyright (c) 2014 Garmin. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-/// @brief  The current version of the ConnectIQ SDK.
-extern int const IQSDKVersion;
-
-/// @brief  The bundle identifier for the Garmin Connect Mobile app.
-extern NSString * const IQGCMBundle;
-
-/// @brief  The result of a SendMessage operation
-typedef NS_ENUM(NSInteger, IQSendMessageResult){
-    ///! @brief  The message was sent successfully.
-    IQSendMessageResult_Success,
-
-    /// @brief  The message failed to send due to an unknown error.
-    IQSendMessageResult_Failure_Unknown,
-
-    /// @brief  The message failed to send. There was an error within the SDK or
-    ///         on the device.
-    IQSendMessageResult_Failure_InternalError,
-
-    /// @brief  The message failed to send. The device is not available right now.
-    IQSendMessageResult_Failure_DeviceNotAvailable,
-
-    /// @brief  The message failed to send. The app is not installed on the
-    ///         device.
-    IQSendMessageResult_Failure_AppNotFound,
-
-    /// @brief  The message failed to send. The device is busy and cannot receive
-    ///         the message right now.
-    IQSendMessageResult_Failure_DeviceIsBusy,
-
-    /// @brief  The message failed to send. The message contained an unsupported
-    ///         type.
-    IQSendMessageResult_Failure_UnsupportedType,
-
-    /// @brief  The message failed to send. The device does not have enough memory
-    ///         to receive the message.
-    IQSendMessageResult_Failure_InsufficientMemory,
-
-    /// @brief  The message failed to send. The connection timed out while sending
-    ///         the message.
-    IQSendMessageResult_Failure_Timeout,
-
-    /// @brief  The message failed to send and was retried, but could not complete
-    ///         after a number of tries.
-    IQSendMessageResult_Failure_MaxRetries,
-
-    /// @brief  The message was received by the device but it chose not to display
-    ///         a message prompt, ignoring the message.
-    IQSendMessageResult_Failure_PromptNotDisplayed,
-
-    /// @brief  The message was received by the device but the app to open
-    ///         was already running on the device.
-    IQSendMessageResult_Failure_AppAlreadyRunning,
-};
-NSString *NSStringFromSendMessageResult(IQSendMessageResult value);

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

@@ -1,61 +0,0 @@
-//
-//  IQDevice.h
-//  ConnectIQ
-//
-//  Copyright (c) 2014 Garmin. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreBluetooth/CoreBluetooth.h>
-
-/// @brief  The current status of an IQDevice.
-typedef NS_ENUM(NSInteger, IQDeviceStatus){
-    /// @brief  No device with this UUID has been registered for status events
-    ///         the SDK.
-    IQDeviceStatus_InvalidDevice,
-
-    /// @brief  Bluetooth is either powered off or resetting.
-    IQDeviceStatus_BluetoothNotReady,
-
-    /// @brief  This device could not be found by iOS. Perhaps the user removed
-    ///         the device?
-    IQDeviceStatus_NotFound,
-
-    /// @brief  The device is recognized by iOS, but it is not currently
-    ///         connected.
-    IQDeviceStatus_NotConnected,
-
-    /// @brief  The device is connected and ready to communicate.
-    IQDeviceStatus_Connected,
-};
-
-/// @brief  Represents a ConnectIQ-compatible Garmin device.
-@interface IQDevice : NSObject <NSSecureCoding>
-
-/// @brief  The unique identifier for this device.
-@property (nonatomic, readonly) NSUUID *uuid;
-
-/// @brief  The model name of the device provided by Garmin Connect Mobile.
-@property (nonatomic, readonly) NSString *modelName;
-
-/// @brief  The friendly name of the device, set by the user and provided by
-///         Garmin Connect Mobile.
-@property (nonatomic, readonly) NSString *friendlyName;
-
-/// @brief  Creates a new device instance.
-///
-/// @param  uuid         The UUID of the device to create.
-/// @param  modelName    The model name of the device to create.
-/// @param  friendlyName The friendly name of the device to create.
-///
-/// @return A new IQDevice instance with the appropriate values set.
-+ (IQDevice *)deviceWithId:(NSUUID *)uuid modelName:(NSString *)modelName friendlyName:(NSString *)friendlyName;
-
-/// @brief  Creates a new device instance by copying another device's values.
-///
-/// @param  device The device to copy values from.
-///
-/// @return A new IQDevice instance with all values copied.
-- (instancetype)initWithDevice:(IQDevice *)device;
-
-@end

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

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