yesoul bike doesn't send bluetooth name on android 13

#895 introduced "typedef int16_t resistance_t;" and used throughout code

.github/ISSUE_TEMPLATE/bug_report.md

@@ -32,5 +32,10 @@ If applicable, add screenshots to help explain your problem.
  - OS: [e.g. iOS8.1]
  - Version [e.g. 22]
 
+**Append a debug log**
+
+ Follow this guide https://github.com/cagnulein/qdomyos-zwift/wiki/How-do-i-get-the-debug-log-in-case-something-doesn't-work%3F
+  
+  
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[REQ]"
+labels: enhancement
+assignees: cagnulein
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/stale.yml

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

@@ -2,16 +2,102 @@
 
 name: CI
 
+env:
+  DISPLAY: ':99'
+
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
+  workflow_dispatch:
   push:
-    branches: [ master ]
+    branches: [ master,  github-workflow-playground ]
   pull_request:
     branches: [ master ]
+  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
+
+    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: microsoft/MSIX-Toolkit
+          path: "src/MSIX-Toolkit/"
+          ref: b82af826d29e93e4c85d34fad8a405b6c49905e7
+
+      - 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: |         
+            cd src
+            qmake
+            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 
+            make -j8
+            cd 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" .     
+            cp ../../../icons/iOS/iTunesArtwork@2x.png .     
+            cp ../../AppxManifest.xml .
+            cd ..
+            cd appx
+            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz
+        
+      - name: Archive windows binary
+        uses: actions/upload-artifact@v2
+        with:
+          name: windows-binary
+          path: src/debug/output
+          
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
@@ -33,28 +119,55 @@ jobs:
 #          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          
 
-      # Runs a set of commands using the runners shell
-      - name: Install Qt Linux Desktop
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: cagnulein/qmdnsengine
+          path: "src/qmdnsengine/"
+          ref: "zwift"
+
+      - name: Install packages required to run QZ inside workflow
+        run: sudo apt update -y && sudo apt-get install -y qt5-default qtquickcontrols2-5-dev 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: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: '5.12.9'
+          version: '5.15.2'
           host: 'linux'
-          target: 'desktop'
-          modules: 'qtcharts debug_info qtnetworkauth'
-          dir: '${{ github.workspace }}/output/linux-desktop/'
-#          cached: ${{ steps.cache-qt-linux-desktop.outputs.cache-hit }}
+          modules: 'qtnetworkauth qtcharts'
       
       - name: Compile Linux Desktop
-        run: cd src; qmake; make -j4
+        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
+          path: src/qdomyos-zwift              
+
+#      - 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:

.gitignore

@@ -13,7 +13,35 @@ src/qdomyos-zwift
 src/ui_charts.h
 src/ui_mainwindow.h
 
+src/build/*
+src/build/*
+
 src/debug-*
 
+src/secret.h
+
 *.swo
 *.swp
+
+build-qdomyos-zwift-Android_Qt_5_15_2_Clang_Multi_Abi-Debug/*
+**/node_modules/*
+*.pro.user
+
+template-examples/youtube-viewer/node_modules/*
+template-examples/youtube-viewer/*.json
+template-examples/youtube-viewer/.eslintrc.js
+template-examples/youtube-viewer/.jshintrc
+template-examples/youtube-viewer/debug.js
+
+
+template-examples/train-program-saver/node_modules/*
+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
+
+# Qt-es
+*.pro.user
+*build-*
+!build-qdomyos-zwift-Qt_*_for_iOS-Debug # Needed for Apple Watch
+src/inner_templates/googlemaps/cesium-key.js

.gitmodules

@@ -1,3 +1,11 @@
 [submodule "android_openssl"]
 	path = android_openssl
 	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

README.md

@@ -1,6 +1,8 @@
 # qdomyos-zwift
 Zwift bridge for Treadmills and Bike!
 
+## QZ is not affiliated with or endorsed by any subscription service or maker of exercise equipment.
+
 [<img src="docs/img/google_play.png">](https://play.google.com/store/apps/details?id=org.cagnulen.qdomyoszwift&fbclid=IwAR3CVoYb0scvGf7gb0Y20VFh5Na5fDWwe7VACk-2c45Tm0x5s8sXpIGhGyw)
 [<img src="docs/img/app_store.png">](https://apps.apple.com/app/id1543684531?fbclid=IwAR10H6y3mEgwkTlGJON3e8voYOh2wt3kLFOpFzoIXaYZ_N0y0pDvKxHMUaM)
 <a href="https://www.buymeacoffee.com/cagnulein" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>

amazon-store/src/android/AndroidManifest.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<manifest package="org.cagnulen.qdomyoszwift" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.6.18" android:versionCode="128" android:installLocation="auto">
+         <uses-feature android:name="android.hardware.bluetooth" android:required="true" />
+			<uses-feature android:name="android.hardware.location" android:required="false" />
+			<uses-feature android:name="android.hardware.location.gps" android:required="false" />
+			<uses-feature android:name="android.hardware.location" android:required="false" />
+			<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+	 <application android:hardwareAccelerated="true" android:debuggable="false" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="qdomyos-zwift" android:extractNativeLibs="true" android:icon="@drawable/icon">
+	     <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="qdomyos-zwift" android:launchMode="singleTop">
+		      <intent-filter>
+				    <action android:name="android.intent.action.MAIN"/>
+					 <category android:name="android.intent.category.LAUNCHER"/>
+					</intent-filter>
+					<!-- Application arguments -->
+				<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
+				<!-- Application arguments -->
+				<meta-data android:name="android.app.lib_name" android:value="qdomyos-zwift"/>
+				<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+				<meta-data android:name="android.app.repository" android:value="default"/>
+				<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+				<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+				<!-- Deploy Qt libs as part of package -->
+				<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+				<!-- Run with local libs -->
+				<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
+				<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+				<meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
+				<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
+				<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+				<!-- Used to specify custom system library path to run with local system libs -->
+				<!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
+				<!--  Messages maps -->
+				<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+				<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+				<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+				<meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
+				<!--  Messages maps -->
+				<!-- Splash screen -->
+				<!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
+				     then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
+					  use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
+					  are done populating your window with content. -->
+					<!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
+				<!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
+				<!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
+				<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
+				<!-- Splash screen -->
+				<!-- Background running -->
+				<!-- Warning: changing this value to true may cause unexpected crashes if the
+				              application still try to draw after
+								  "applicationStateChanged(Qt::ApplicationSuspended)"
+								  signal is sent! -->
+								<meta-data android:name="android.app.background_running" android:value="true"/>
+				<!-- Background running -->
+				<!-- auto screen scale factor -->
+				<meta-data android:name="android.app.auto_screen_scale_factor" android:value="full"/>
+				<!-- auto screen scale factor -->
+				<!-- extract android style -->
+				<!-- available android:values :
+				    * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
+					 * full - useful QWidget & Quick Controls 1 apps
+					 * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
+					 * none - useful for apps that don't use any of the above Qt modules
+					 -->
+					<meta-data android:name="android.app.extract_android_style" android:value="default"/>
+				<!-- extract android style -->
+				<meta-data android:name="com.amazon.input.cursor" android:value="pointer"/>
+				</activity>
+				<service android:name=".ChannelService"></service>
+				<activity android:name="org.cagnulen.qdomyoszwift.MyActivity" />
+		  <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+		</application>
+
+<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+<uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+</manifest>

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift.xcodeproj/LaunchScreen.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <device id="ipad12_9rounded" orientation="landscape" layout="splitview2_3" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
@@ -13,32 +13,32 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="981" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
-                                <rect key="frame" x="0.0" y="876" width="414" height="0.0"/>
+                                <rect key="frame" x="0.0" y="1004" width="981" height="0.0"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="launcher" translatesAutoresizingMaskIntoConstraints="NO" id="VVq-0c-S8O">
-                                <rect key="frame" x="20" y="348" width="374" height="201"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <rect key="frame" x="20" y="114" width="941" height="776"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" red="0.10980264100000001" green="0.11007446799999999" blue="0.1176523939" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
-                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
                             <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
                         </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="52.173913043478265" y="375"/>
+            <point key="canvasLocation" x="50.625" y="373.75"/>
         </scene>
     </scenes>
     <resources>

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

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

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

@@ -193,6 +193,38 @@
             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
@@ -335,7 +367,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "38"
             endingLineNumber = "38"
-            landmarkName = "lockscreen::virtualbike_setHeartRate(heartRate)"
+            landmarkName = "lockscreen::stepCadence()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -343,7 +375,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "FE5697FF-F44C-43C2-A98D-C400EE56F047"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../src/ios/lockscreen.mm"
@@ -351,8 +383,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "44"
             endingLineNumber = "44"
-            landmarkName = "lockscreen::virtualbike_setCadence(crankRevolutions, lastCrankEventTime)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -367,7 +399,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "37"
             endingLineNumber = "37"
-            landmarkName = "lockscreen::virtualbike_setHeartRate(heartRate)"
+            landmarkName = "lockscreen::stepCadence()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -375,7 +407,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "3DBE0495-050A-4979-85D4-28B78676F212"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../src/ios/lockscreen.mm"
@@ -383,7 +415,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "43"
             endingLineNumber = "43"
-            landmarkName = "lockscreen::virtualbike_setCadence(crankRevolutions, lastCrankEventTime)"
+            landmarkName = "lockscreen::setKcal(kcal)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -399,7 +431,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "32"
             endingLineNumber = "32"
-            landmarkName = "lockscreen::virtualbike_ios()"
+            landmarkName = "lockscreen::heartRate()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -431,7 +463,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "35"
                   endingLineNumber = "35"
-                  offsetFromSymbolStart = "22">
+                  offsetFromSymbolStart = "32">
                </Location>
                <Location
                   uuid = "18F27065-9FB2-44A2-99D0-7D41061141A3 - 4daffae51fb2d733"
@@ -446,7 +478,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "35"
                   endingLineNumber = "35"
-                  offsetFromSymbolStart = "28">
+                  offsetFromSymbolStart = "36">
                </Location>
             </Locations>
          </BreakpointContent>

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

@@ -0,0 +1,62 @@
+{
+  "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,21 +1,25 @@
 {
   "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,21 +1,25 @@
 {
   "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,11 +1,13 @@
 {
   "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,11 +1,13 @@
 {
   "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,11 +1,13 @@
 {
   "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,21 +1,25 @@
 {
   "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,11 +1,13 @@
 {
   "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,21 +1,25 @@
 {
   "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,21 +1,25 @@
 {
   "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,6 +13,59 @@ 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])
     }
@@ -33,7 +86,9 @@ class ComplicationController: NSObject, CLKComplicationDataSource {
     
     func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimelineEntry?) -> Void) {
         // Call the handler with the current timeline entry
-        handler(nil)
+        let template = templateForComplication(complication: complication)
+                let timelineEntry = CLKComplicationTimelineEntry(date: Date(), complicationTemplate: template!)
+                handler(timelineEntry)
     }
     
     func getTimelineEntries(for complication: CLKComplication, before date: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) {
@@ -46,11 +101,15 @@ 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(nil)
+        handler(templateForComplication(complication: complication))
     }
     
 }

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

@@ -8,6 +8,8 @@
 	<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>
@@ -22,6 +24,21 @@
 	<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,13 +8,17 @@
 
 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!
     static var start: Bool! = false
+    let pedometer = CMPedometer()
     
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
@@ -28,6 +32,15 @@ class MainController: WKInterfaceController {
         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() {
@@ -59,14 +72,31 @@ extension MainController {
 }
 
 extension MainController: WorkoutTrackingDelegate {
+    
+    func didReceiveHealthKitDistanceCycling(_ distanceCycling: Double) {
+        
+    }
+    func didReceiveHealthKitActiveEnergyBurned(_ activeEnergyBurned: Double) {
+        
+    }
+    
     func didReceiveHealthKitHeartRate(_ heartRate: Double) {
         heartRateLabel.setText("\(heartRate) BPM")
         WatchKitConnection.shared.sendMessage(message: ["heartRate":
             "\(heartRate)" as AnyObject])
+        WorkoutTracking.distance = WatchKitConnection.distance
+        WorkoutTracking.kcal = WatchKitConnection.kcal
+        
+        self.distanceLabel.setText("Distance \(Double(WorkoutTracking.distance))")
+        self.caloriesLabel.setText("KCal \(Int(WorkoutTracking.kcal))")
+        //WorkoutTracking.cadenceSteps = pedometer.
     }
     
     func didReceiveHealthKitStepCounts(_ stepCounts: Double) {
-        stepCountsLabel.setText("\(stepCounts) STEPS")
+        //stepCountsLabel.setText("\(stepCounts) STEPS")
+    }
+    func didReceiveHealthKitStepCadence(_ stepCadence: Double) {
+        
     }
 }
 

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

@@ -21,6 +21,9 @@ protocol WatchKitConnectionProtocol {
 
 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() {
@@ -59,6 +62,10 @@ extension WatchKitConnection: WatchKitConnectionProtocol {
     {
         validReachableSession?.sendMessage(message, replyHandler: { (result) in
             print(result)
+            let dDistance = Double(result["distance"] as! Double)
+            WatchKitConnection.distance = dDistance
+            let dKcal = Double(result["kcal"] as! Double)
+            WatchKitConnection.kcal = dKcal
         }, errorHandler: { (error) in
             print(error)
         })

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

@@ -1,199 +1,266 @@
-//
-//  WatchWorkoutTracking.swift
-//  ElecDemo WatchKit Extension
-//
-//  Created by NhatHM on 8/12/19.
-//  Copyright © 2019 GST.PID. All rights reserved.
-//
-
-import Foundation
-import HealthKit
-
-protocol WorkoutTrackingDelegate: class {
-    func didReceiveHealthKitHeartRate(_ heartRate: Double)
-    func didReceiveHealthKitStepCounts(_ stepCounts: Double)
-}
-
-protocol WorkoutTrackingProtocol {
-    static func authorizeHealthKit()
-    func startWorkOut()
-    func stopWorkOut()
-    func fetchStepCounts()
-}
-
-class WorkoutTracking: NSObject {
-    static let shared = WorkoutTracking()
-    let healthStore = HKHealthStore()
-    let configuration = HKWorkoutConfiguration()
-    var workoutSession: HKWorkoutSession!
-    var workoutBuilder: HKLiveWorkoutBuilder!
-    
-    weak var delegate: WorkoutTrackingDelegate?
-    
-    override init() {
-        super.init()
-    }        
-}
-
-extension WorkoutTracking {
-    private func handleSendStatisticsData(_ statistics: HKStatistics) {
-        switch statistics.quantityType {
-        case HKQuantityType.quantityType(forIdentifier: .heartRate):
-            let heartRateUnit = HKUnit.count().unitDivided(by: HKUnit.minute())
-            let value = statistics.mostRecentQuantity()?.doubleValue(for: heartRateUnit)
-            let roundedValue = Double( round( 1 * value! ) / 1 )
-            delegate?.didReceiveHealthKitHeartRate(roundedValue)
-            
-        case HKQuantityType.quantityType(forIdentifier: .stepCount):
-            guard let stepCounts = HKQuantityType.quantityType(forIdentifier: .stepCount) else {
-                return
-            }
-            let startOfDay = Calendar.current.startOfDay(for: Date())
-            let predicate = HKQuery.predicateForSamples(withStart: startOfDay, end: Date(), options: .strictStartDate)
-            
-            let query = HKStatisticsQuery(quantityType: stepCounts, quantitySamplePredicate: predicate, options: .cumulativeSum) { [weak self] (_, result, error) in
-                guard let weakSelf = self else {
-                    return
-                }
-                var resultCount = 0.0
-                guard let result = result else {
-                    print("Failed to fetch steps rate")
-                    return
-                }
-                
-                if let sum = result.sumQuantity() {
-                    resultCount = sum.doubleValue(for: HKUnit.count())
-                    weakSelf.delegate?.didReceiveHealthKitStepCounts(resultCount)
-                } else {
-                    print("Failed to fetch steps rate 2")
-                }
-            }
-            healthStore.execute(query)
-            return
-        default:
-            return
-        }
-    }
-    
-    private func configWorkout() {
-        configuration.activityType = .cycling
-        configuration.locationType = .indoor
-        
-        do {
-            workoutSession = try HKWorkoutSession(healthStore: healthStore, configuration: configuration)
-            workoutBuilder = workoutSession?.associatedWorkoutBuilder()
-        } catch {
-            return
-        }
-        
-        workoutSession.delegate = self
-        workoutBuilder.delegate = self
-        
-        workoutBuilder.dataSource = HKLiveWorkoutDataSource(healthStore: healthStore, workoutConfiguration: configuration)
-    }
-}
-
-extension WorkoutTracking: WorkoutTrackingProtocol {
-    static func authorizeHealthKit() {
-        if HKHealthStore.isHealthDataAvailable() {
-            let infoToRead = Set([
-                HKSampleType.quantityType(forIdentifier: .stepCount)!,
-                HKSampleType.quantityType(forIdentifier: .heartRate)!,
-                HKSampleType.workoutType()
-                ])
-            
-            let infoToShare = Set([
-                HKSampleType.quantityType(forIdentifier: .stepCount)!,
-                HKSampleType.quantityType(forIdentifier: .heartRate)!,
-                HKSampleType.workoutType()
-                ])
-            
-            HKHealthStore().requestAuthorization(toShare: infoToShare, read: infoToRead) { (success, error) in
-                if success {
-                    print("Authorization healthkit success")
-                } else if let error = error {
-                    print(error)
-                }
-            }
-        } else {
-            print("HealthKit not avaiable")
-        }
-    }
-    
-    func startWorkOut() {
-        print("Start workout")
-        configWorkout()
-        workoutSession.startActivity(with: Date())
-        workoutBuilder.beginCollection(withStart: Date()) { (success, error) in
-            print(success)
-            if let error = error {
-                print(error)
-            }
-        }
-    }
-    
-    func stopWorkOut() {
-        print("Stop workout")
-        workoutSession.stopActivity(with: Date())
-        workoutSession.end()
-        workoutBuilder.endCollection(withEnd: Date()) { (success, error) in
-            
-        }
-    }
-    
-    func fetchStepCounts() {
-        guard let stepCounts = HKQuantityType.quantityType(forIdentifier: .stepCount) else {
-            return
-        }
-        let startOfDay = Calendar.current.startOfDay(for: Date())
-        let predicate = HKQuery.predicateForSamples(withStart: startOfDay, end: Date(), options: .strictStartDate)
-        
-        let query = HKStatisticsQuery(quantityType: stepCounts, quantitySamplePredicate: predicate, options: .cumulativeSum) { [weak self] (_, result, error) in
-            guard let weakSelf = self else {
-                return
-            }
-            var resultCount = 0.0
-            guard let result = result else {
-                print("Failed to fetch steps rate")
-                return
-            }
-            
-            if let sum = result.sumQuantity() {
-                resultCount = sum.doubleValue(for: HKUnit.count())
-                weakSelf.delegate?.didReceiveHealthKitStepCounts(resultCount)
-            } else {
-                print("Failed to fetch steps rate 2")
-            }
-        }
-        healthStore.execute(query)
-    }
-}
-
-extension WorkoutTracking: HKLiveWorkoutBuilderDelegate {
-    func workoutBuilder(_ workoutBuilder: HKLiveWorkoutBuilder, didCollectDataOf collectedTypes: Set<HKSampleType>) {
-        print("GET DATA: \(Date())")
-        for type in collectedTypes {
-            guard let quantityType = type as? HKQuantityType else {
-                return
-            }
-            
-            if let statistics = workoutBuilder.statistics(for: quantityType) {
-                handleSendStatisticsData(statistics)
-            }
-        }
-    }
-    
-    func workoutBuilderDidCollectEvent(_ workoutBuilder: HKLiveWorkoutBuilder) {
-        
-    }
-}
-
-extension WorkoutTracking: HKWorkoutSessionDelegate {
-    func workoutSession(_ workoutSession: HKWorkoutSession, didChangeTo toState: HKWorkoutSessionState, from fromState: HKWorkoutSessionState, date: Date) {
-        
-    }
-    
-    func workoutSession(_ workoutSession: HKWorkoutSession, didFailWithError error: Error) {
-        
-    }
-}
+//
+//  WatchWorkoutTracking.swift
+//  ElecDemo WatchKit Extension
+//
+//  Created by NhatHM on 8/12/19.
+//  Copyright © 2019 GST.PID. All rights reserved.
+//
+
+import Foundation
+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)
+}
+
+protocol WorkoutTrackingProtocol {
+    static func authorizeHealthKit()
+    func startWorkOut()
+    func stopWorkOut()
+    func fetchStepCounts()
+}
+
+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
+    let healthStore = HKHealthStore()
+    let configuration = HKWorkoutConfiguration()
+    var workoutSession: HKWorkoutSession!
+    var workoutBuilder: HKLiveWorkoutBuilder!
+    
+    weak var delegate: WorkoutTrackingDelegate?
+    
+    override init() {
+        super.init()
+    }        
+}
+
+extension WorkoutTracking {
+    private func handleSendStatisticsData(_ statistics: HKStatistics) {
+        switch statistics.quantityType {
+        case HKQuantityType.quantityType(forIdentifier: .distanceCycling):
+            let distanceUnit = HKUnit.mile()
+            let value = statistics.mostRecentQuantity()?.doubleValue(for: distanceUnit)
+            let roundedValue = Double( round( 1 * value! ) / 1 )
+            delegate?.didReceiveHealthKitDistanceCycling(roundedValue)
+            
+        case HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned):
+            let energyUnit = HKUnit.kilocalorie()
+            let value = statistics.mostRecentQuantity()?.doubleValue(for: energyUnit)
+            let roundedValue = Double( round( 1 * value! ) / 1 )
+            delegate?.didReceiveHealthKitActiveEnergyBurned(roundedValue)
+        
+        case HKQuantityType.quantityType(forIdentifier: .heartRate):
+            let heartRateUnit = HKUnit.count().unitDivided(by: HKUnit.minute())
+            let value = statistics.mostRecentQuantity()?.doubleValue(for: heartRateUnit)
+            let roundedValue = Double( round( 1 * value! ) / 1 )
+            delegate?.didReceiveHealthKitHeartRate(roundedValue)
+            
+        case HKQuantityType.quantityType(forIdentifier: .stepCount):
+            guard let stepCounts = HKQuantityType.quantityType(forIdentifier: .stepCount) else {
+                return
+            }
+            let startOfDay = Calendar.current.startOfDay(for: Date())
+            let predicate = HKQuery.predicateForSamples(withStart: startOfDay, end: Date(), options: .strictStartDate)
+            
+            let query = HKStatisticsQuery(quantityType: stepCounts, quantitySamplePredicate: predicate, options: .cumulativeSum) { [weak self] (_, result, error) in
+                guard let weakSelf = self else {
+                    return
+                }
+                var resultCount = 0.0
+                guard let result = result else {
+                    print("Failed to fetch steps rate")
+                    return
+                }
+                
+                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")
+                }
+            }
+            healthStore.execute(query)
+            return
+        default:
+            return
+        }
+    }
+    
+    private func configWorkout() {
+        configuration.activityType = .cycling
+        configuration.locationType = .indoor
+        
+        do {
+            workoutSession = try HKWorkoutSession(healthStore: healthStore, configuration: configuration)
+            workoutBuilder = workoutSession?.associatedWorkoutBuilder()
+        } catch {
+            return
+        }
+        
+        workoutSession.delegate = self
+        workoutBuilder.delegate = self
+        
+        workoutBuilder.dataSource = HKLiveWorkoutDataSource(healthStore: healthStore, workoutConfiguration: configuration)
+    }
+}
+
+extension WorkoutTracking: WorkoutTrackingProtocol {
+    static func authorizeHealthKit() {
+        if HKHealthStore.isHealthDataAvailable() {
+            let infoToRead = Set([
+                HKSampleType.quantityType(forIdentifier: .stepCount)!,
+                HKSampleType.quantityType(forIdentifier: .heartRate)!,
+                /*HKSampleType.quantityType(forIdentifier: .distanceCycling)!,
+                HKSampleType.quantityType(forIdentifier: .activeEnergyBurned)!,*/
+                HKSampleType.workoutType()
+                ])
+            
+            let infoToShare = Set([
+                HKSampleType.quantityType(forIdentifier: .stepCount)!,
+                HKSampleType.quantityType(forIdentifier: .heartRate)!,
+                HKSampleType.quantityType(forIdentifier: .distanceCycling)!,
+                HKSampleType.quantityType(forIdentifier: .activeEnergyBurned)!,				
+                HKSampleType.workoutType()
+                ])
+            
+            HKHealthStore().requestAuthorization(toShare: infoToShare, read: infoToRead) { (success, error) in
+                if success {
+                    print("Authorization healthkit success")
+                } else if let error = error {
+                    print(error)
+                }
+            }
+        } else {
+            print("HealthKit not avaiable")
+        }
+    }
+    
+    func startWorkOut() {
+        print("Start workout")
+        configWorkout()
+        workoutSession.startActivity(with: Date())
+        workoutBuilder.beginCollection(withStart: Date()) { (success, error) in
+            print(success)
+            if let error = error {
+                print(error)
+            }
+        }
+    }
+    
+    func stopWorkOut() {
+        print("Stop workout")
+        workoutSession.stopActivity(with: Date())
+        workoutSession.end()
+        
+        guard let quantityType = HKQuantityType.quantityType(
+          forIdentifier: .activeEnergyBurned) else {
+          return
+        }
+            
+        let unit = HKUnit.kilocalorie()
+        let totalEnergyBurned = WorkoutTracking.kcal
+        let quantity = HKQuantity(unit: unit,
+                                  doubleValue: totalEnergyBurned)
+        
+        let sample = HKCumulativeQuantitySeriesSample(type: quantityType,
+                                                      quantity: quantity,
+                                                      start: workoutSession.startDate!,
+                                                      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)
+        
+        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() {
+        guard let stepCounts = HKQuantityType.quantityType(forIdentifier: .stepCount) else {
+            return
+        }
+        let startOfDay = Calendar.current.startOfDay(for: Date())
+        let predicate = HKQuery.predicateForSamples(withStart: startOfDay, end: Date(), options: .strictStartDate)
+        
+        let query = HKStatisticsQuery(quantityType: stepCounts, quantitySamplePredicate: predicate, options: .cumulativeSum) { [weak self] (_, result, error) in
+            guard let weakSelf = self else {
+                return
+            }
+            var resultCount = 0.0
+            guard let result = result else {
+                print("Failed to fetch steps rate")
+                return
+            }
+            
+            if let sum = result.sumQuantity() {
+                resultCount = sum.doubleValue(for: HKUnit.count())
+                weakSelf.delegate?.didReceiveHealthKitStepCounts(resultCount)
+            } else {
+                print("Failed to fetch steps rate 2")
+            }
+        }
+        healthStore.execute(query)
+    }
+}
+
+extension WorkoutTracking: HKLiveWorkoutBuilderDelegate {
+    func workoutBuilder(_ workoutBuilder: HKLiveWorkoutBuilder, didCollectDataOf collectedTypes: Set<HKSampleType>) {
+        print("GET DATA: \(Date())")
+        for type in collectedTypes {
+            guard let quantityType = type as? HKQuantityType else {
+                return
+            }
+            
+            if let statistics = workoutBuilder.statistics(for: quantityType) {
+                handleSendStatisticsData(statistics)
+            }
+        }
+    }
+    
+    func workoutBuilderDidCollectEvent(_ workoutBuilder: HKLiveWorkoutBuilder) {
+        
+    }
+}
+
+extension WorkoutTracking: HKWorkoutSessionDelegate {
+    func workoutSession(_ workoutSession: HKWorkoutSession, didChangeTo toState: HKWorkoutSessionState, from fromState: HKWorkoutSessionState, date: Date) {
+        
+    }
+    
+    func workoutSession(_ workoutSession: HKWorkoutSession, didFailWithError error: Error) {
+        
+    }
+}

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -26,6 +26,13 @@
       "scale" : "3x",
       "size" : "29x29"
     },
+    {
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "33x33",
+      "subtype" : "45mm"
+    },
     {
       "idiom" : "watch",
       "role" : "appLauncher",
@@ -40,6 +47,13 @@
       "size" : "44x44",
       "subtype" : "40mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "46x46",
+      "subtype" : "41mm"
+    },
     {
       "idiom" : "watch",
       "role" : "appLauncher",
@@ -47,6 +61,13 @@
       "size" : "50x50",
       "subtype" : "44mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "51x51",
+      "subtype" : "45mm"
+    },
     {
       "idiom" : "watch",
       "role" : "quickLook",
@@ -68,6 +89,13 @@
       "size" : "108x108",
       "subtype" : "44mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "117x117",
+      "subtype" : "45mm"
+    },
     {
       "idiom" : "watch-marketing",
       "scale" : "1x",

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/watchkit/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -103,7 +103,7 @@
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "iTunesArtwork@2x.png",
+      "filename" : "ItunesArtwork-1.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
@@ -138,6 +138,13 @@
       "scale" : "3x",
       "size" : "29x29"
     },
+    {
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "33x33",
+      "subtype" : "45mm"
+    },
     {
       "filename" : "80x80-1.png",
       "idiom" : "watch",
@@ -154,6 +161,13 @@
       "size" : "44x44",
       "subtype" : "40mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "46x46",
+      "subtype" : "41mm"
+    },
     {
       "filename" : "50@2x-1.png",
       "idiom" : "watch",
@@ -162,6 +176,13 @@
       "size" : "50x50",
       "subtype" : "44mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "51x51",
+      "subtype" : "45mm"
+    },
     {
       "filename" : "86@2x-1.png",
       "idiom" : "watch",
@@ -186,6 +207,13 @@
       "size" : "108x108",
       "subtype" : "44mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "117x117",
+      "subtype" : "45mm"
+    },
     {
       "filename" : "1024@1x.png",
       "idiom" : "watch-marketing",

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="17506" 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="19529" 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="17505"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="17500"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="19514"/>
     </dependencies>
     <scenes>
         <!--Main-->
@@ -12,16 +12,20 @@
             <objects>
                 <controller identifier="Main" hidesWhenLoading="NO" id="Tpn-rd-UUX" customClass="MainController" customModule="watchkit_Extension">
                     <items>
-                        <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"/>
+                        <label width="136" alignment="left" text="QZ Fitness" textAlignment="center" id="SlU-M7-WGB"/>
                         <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"/>
                     </items>
                     <connections>
+                        <outlet property="caloriesLabel" destination="Szi-Jp-J3S" id="trd-YS-bJy"/>
+                        <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"/>

docker/linux/Dockerfile

@@ -1,10 +1,24 @@
-FROM debian:stable
+FROM ubuntu:latest
 MAINTAINER cagnulein
 
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Europe/Moscow
 ENV MAKEFLAGS -j8
 WORKDIR /usr/local/src
 
-# utils
+RUN apt-get update && apt-get install -y tzdata
 RUN apt -y update
 RUN apt -y upgrade
-RUN apt -y install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-default
+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"]

docs/10_Installation.md

@@ -8,9 +8,11 @@ Once you've installed QDomyos-Zwift, you can access the [operation guide](30_usa
 
 ```buildoutcfg
 $ sudo apt update && sudo apt upgrade # this is very important on raspberry pi: you need the bluetooth firmware updated!
-$ sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-default libqt5networkauth5-dev
+$ 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
 $ 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 -j4
@@ -100,12 +102,14 @@ This operation takes a moment to complete.
 
 #### Install qdomyos-zwift from sources
 
-`sudo apt install git libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 qt5-default libqt5networkauth5-dev`
+`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`
 
 `git clone https://github.com/cagnulein/qdomyos-zwift.git`  
 `cd qdomyos-zwift`  
-`cd src`  
-`qmake`  
+`git submodule update --init src/smtpclient/`  
+`git submodule update --init src/qmdnsengine/`  
+`cd src`    
+`qmake`    
 `make`  
 
 Please note :

docs/20_supported_devices_and_applications.md

@@ -11,26 +11,12 @@ 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.

docs/30_usage.md

@@ -1,14 +1,53 @@
 # QDomyos-Zwift operation guide
 
-The operation guide is under construction, however you can access this [detailled blog article](https://robertoviola.cloud/qdomyos-zwift-guide/) with several useful information.
+
+# Usage
+
+The QDomyos-Zwift can be started in two modes : QML or NativeQT.  
+The main difference is the configuration management : you can change settings within the application with QML, where you need to specify settings at startup in NativeQT.
+
+**Note:** Android and IOS are always running in QML mode.
+
+On MacOS and Linux, you start QDomyos-Zwift in NativeQT mode (where settings are defined in commandline switches).
+
+You can start the application in QML mode with the command-line switch -qml.
+
+## Configuration in QML mode 
+Please refer to this article for more information under [QML Operations](https://robertoviola.cloud/qdomyos-zwift-guide/) with several useful information.
 
 
-## No gui version
+## Configuration in NativeQT mode
 
-Run the program with `sudo ./qdomyos-zwift -no-gui -no-log`
+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  | 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       |                                                                              |
+| -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 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                                    |
 
-Attention !  
-The configuration file `settings.qml` is not yet read in CLI mode.  
-Available configuration switches can be retreived within `main.cpp`.
 
 

docs/40_web_socket_api.md

@@ -0,0 +1,365 @@
+# 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.rower_data.xml

@@ -0,0 +1,220 @@
+<?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="Rower Data" type="org.bluetooth.characteristic.rower_data"
+uuid="2AD1" last-modified="2017-02-14" approved="No">
+  <InformativeText>
+    <Summary>The Rower Data characteristic is used to send
+    training-related data to the Client from a rower
+    (Server).</Summary>
+  </InformativeText>
+  <Value>
+    <Field name="Flags">
+      <Requirement>Mandatory</Requirement>
+      <Format>16bit</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 Stroke 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="Instantaneous Pace present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C4" />
+          </Enumerations>
+        </Bit>
+        <Bit index="4" size="1" name="Average Pace Present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C5" />
+          </Enumerations>
+        </Bit>
+        <Bit index="5" size="1" name="Instantaneous Power present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C6" />
+          </Enumerations>
+        </Bit>
+        <Bit index="6" size="1" name="Average Power 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="Expended Energy present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C9" />
+          </Enumerations>
+        </Bit>
+        <Bit index="9" size="1" name="Heart Rate present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C10" />
+          </Enumerations>
+        </Bit>
+        <Bit index="10" size="1"
+        name="Metabolic Equivalent present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C11" />
+          </Enumerations>
+        </Bit>
+        <Bit index="11" size="1" name="Elapsed Time present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C12" />
+          </Enumerations>
+        </Bit>
+        <Bit index="12" size="1" name="Remaining Time present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C13" />
+          </Enumerations>
+        </Bit>
+        <ReservedForFutureUse index="13" size="3" />
+      </BitField>
+    </Field>
+    <Field name="Stroke Rate">
+      <InformativeText>stroke/minute with a resolution of
+      0.5</InformativeText>
+      <Requirement>C1</Requirement>
+      <Format>uint8</Format>
+      <BinaryExponent>-1</BinaryExponent>
+      <Unit>org.bluetooth.unit.stroke_per_minute</Unit>
+    </Field>
+    <Field name="Stroke Count">
+      <InformativeText>Unitless with a resolution of
+      1</InformativeText>
+      <Requirement>C1</Requirement>
+      <Format>uint16</Format>
+      <Unit>org.bluetooth.unit.unitless</Unit>
+    </Field>
+    <Field name="Average Stroke Rate">
+      <InformativeText>1/minute with a resolution of
+      0.5</InformativeText>
+      <Requirement>C2</Requirement>
+      <Format>uint8</Format>
+      <BinaryExponent>-1</BinaryExponent>
+      <Unit>org.bluetooth.unit.stroke_per_minute</Unit>
+    </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="Instantaneous Pace">
+      <InformativeText>Second with a resolution of
+      1</InformativeText>
+      <Requirement>C4</Requirement>
+      <Format>uint16</Format>
+      <Unit>org.bluetooth.unit.time.second</Unit>
+    </Field>
+    <Field name="Average Pace">
+      <InformativeText>Second with a resolution of
+      1</InformativeText>
+      <Requirement>C5</Requirement>
+      <Format>uint16</Format>
+      <Unit>org.bluetooth.unit.time.second</Unit>
+    </Field>
+    <Field name="Instantaneous Power">
+      <InformativeText>Watts with a resolution of
+      1</InformativeText>
+      <Requirement>C6</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>C7</Requirement>
+      <Format>sint16</Format>
+      <Unit>org.bluetooth.unit.power.watt</Unit>
+    </Field>
+    <Field name="Resistance Level">
+      <InformativeText>Unitless with a resolution of
+      1</InformativeText>
+      <Requirement>C8</Requirement>
+      <Format>sint16</Format>
+      <Unit>org.bluetooth.unit.unitless</Unit>
+    </Field>
+    <Field name="Total Energy">
+      <InformativeText>Kilo Calorie with a resolution of
+      1</InformativeText>
+      <Requirement>C9</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>C9</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>C9</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>C10</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>C11</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>C12</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>C13</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>

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Copyright 2011 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="RSC Measurement"
+type="org.bluetooth.characteristic.rsc_measurement" uuid="2A53"
+last-modified="2012-09-29" approved="Yes">
+  <InformativeText>
+    <Summary>The RSC Measurement characteristic (RSC refers to
+    Running Speed and Cadence) is a variable length structure
+    containing a Flags field, an Instantaneous Speed field and an
+    Instantaneous Cadence field and, based on the contents of the
+    Flags field, may contain a Stride Length field and a Total
+    Distance field.</Summary>
+  </InformativeText>
+  <Value>
+    <Field name="Flags">
+      <InformativeText>These flags define which data fields are
+      present in the Characteristic value.</InformativeText>
+      <Requirement>Mandatory</Requirement>
+      <Format>8bit</Format>
+      <BitField>
+        <Bit index="0" size="1"
+        name="Instantaneous Stride Length Present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C1" />
+          </Enumerations>
+        </Bit>
+        <Bit index="1" size="1" name="Total Distance Present">
+          <Enumerations>
+            <Enumeration key="0" value="False" />
+            <Enumeration key="1" value="True" requires="C2" />
+          </Enumerations>
+        </Bit>
+        <Bit index="2" size="1"
+        name="Walking or Running Status bits">
+          <Enumerations>
+            <Enumeration key="0" value="Walking" />
+            <Enumeration key="1" value="Running" />
+          </Enumerations>
+        </Bit>
+        <ReservedForFutureUse index="3" size="5" />
+      </BitField>
+    </Field>
+    <Field name="Instantaneous Speed">
+      <InformativeText>Unit is in m/s with a resolution of 1/256
+      s</InformativeText>
+      <Requirement>Mandatory</Requirement>
+      <Format>uint16</Format>
+      <Unit>org.bluetooth.unit.velocity.metres_per_second</Unit>
+    </Field>
+    <Field name="Instantaneous Cadence">
+      <InformativeText>Unit is in 1/minute (or RPM) with a
+      resolutions of 1 1/min (or 1 RPM)</InformativeText>
+      <Requirement>Mandatory</Requirement>
+      <Format>uint8</Format>
+      <Unit>
+      org.bluetooth.unit.angular_velocity.revolution_per_minute</Unit>
+    </Field>
+    <Field name="Instantaneous Stride Length">
+      <InformativeText>
+        <p>C1: Field exists if the key of bit 0 of the Flags field
+        is set to 1.</p>
+        <p>- Unit is in meter with a resolution of 1/100 m (or
+        centimeter).</p>
+      </InformativeText>
+      <Requirement>C1</Requirement>
+      <Format>uint16</Format>
+      <Unit>org.bluetooth.unit.length.meter</Unit>
+    </Field>
+    <Field name="Total Distance">
+      <InformativeText>
+        <p>C2: Field exists if the key of bit 1 of the Flags field
+        is set to 1.</p>
+        <p>- Unit is in meter with a resolution of 1/10 m (or
+        decimeter).</p>
+      </InformativeText>
+      <Requirement>C2</Requirement>
+      <Format>uint32</Format>
+      <Unit>org.bluetooth.unit.length.meter</Unit>
+    </Field>
+  </Value>
+  <Note>The fields in the above table are in the order of LSO to
+  MSO. Where LSO = Least Significant Octet and MSO = Most
+  Significant Octet.</Note>
+</Characteristic>

docs/specs/org.bluetooth.service.running_speed_and_cadence.xml

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2011 Bluetooth SIG, Inc. All rights reserved. -->
+<Service xsi:noNamespaceSchemaLocation="http://schemas.bluetooth.org/Documents/service.xsd"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+name="Running Speed and Cadence"
+type="org.bluetooth.service.running_speed_and_cadence" uuid="1814"
+last-modified="2012-3-26" approved="Yes">
+  <InformativeText>
+    <Abstract>This service exposes speed, cadence and other data
+    from a Running Speed and Cadence Sensor intended for fitness
+    applications.</Abstract>
+    <Summary>The Running Speed and Cadence (RSC) Service exposes
+    speed, cadence and other data related to fitness applications
+    such as the stride length and the total distance the user has
+    traveled while using the Speed and Cadence Sensor
+    (Server).</Summary>
+  </InformativeText>
+  <Dependencies>
+    <Dependency>This service has no dependencies on other
+    GATT-based services.</Dependency>
+  </Dependencies>
+  <GATTRequirements>
+    <Requirement subProcedure="Write Characteristic Values">
+    C1</Requirement>
+    <Requirement subProcedure="Notifications">
+    Mandatory</Requirement>
+    <Requirement subProcedure="Indications">C1</Requirement>
+    <Requirement subProcedure="Read Characteristic Descriptors">
+    Mandatory</Requirement>
+    <Requirement subProcedure="Write Characteristic Descriptors">
+    Mandatory</Requirement>
+  </GATTRequirements>
+  <Note>C1: Mandatory if the SC Control Point characteristic is
+  supported, otherwise excluded for this service.</Note>
+  <Transports>
+    <Classic>true</Classic>
+    <LowEnergy>true</LowEnergy>
+  </Transports>
+  <ErrorCodes>
+    <ErrorCode name="Procedure Already in Progress" code="0x80">A
+    SC Control Point request cannot be serviced because a
+    previously triggered SC Control Point operation is still in
+    progress.</ErrorCode>
+    <ErrorCode name="Client Characteristic Configuration descriptor improperly configured"
+    code="0x81">The Client Characteristic Configuration descriptor
+    is not configured according to the requirements of the
+    service.</ErrorCode>
+  </ErrorCodes>
+  <Characteristics>
+    <Characteristic name="RSC Measurement"
+    type="org.bluetooth.characteristic.rsc_measurement">
+      <InformativeText>The RSC Measurement characteristic is used
+      to send speed and cadence measurements.</InformativeText>
+      <Requirement>Mandatory</Requirement>
+      <Properties>
+        <Read>Excluded</Read>
+        <Write>Excluded</Write>
+        <WriteWithoutResponse>Excluded</WriteWithoutResponse>
+        <SignedWrite>Excluded</SignedWrite>
+        <ReliableWrite>Excluded</ReliableWrite>
+        <Notify>Mandatory</Notify>
+        <Indicate>Excluded</Indicate>
+        <WritableAuxiliaries>Excluded</WritableAuxiliaries>
+        <Broadcast>Excluded</Broadcast>
+      </Properties>
+      <Descriptors>
+        <Descriptor name="Client Characteristic Configuration"
+        type="org.bluetooth.descriptor.gatt.client_characteristic_configuration">
+
+          <Requirement>Mandatory</Requirement>
+          <Properties>
+            <Read>Mandatory</Read>
+            <Write>Mandatory</Write>
+          </Properties>
+        </Descriptor>
+      </Descriptors>
+    </Characteristic>
+    <Characteristic name="RSC Feature"
+    type="org.bluetooth.characteristic.rsc_feature">
+      <InformativeText>The RSC Feature characteristic is used to
+      describe the supported features of the Server. Reserved for
+      Future Use (RFU) bits in the SC Feature characteristic value
+      are set to 0.</InformativeText>
+      <Requirement>Mandatory</Requirement>
+      <Properties>
+        <Read>Mandatory</Read>
+        <Write>Excluded</Write>
+        <WriteWithoutResponse>Excluded</WriteWithoutResponse>
+        <SignedWrite>Excluded</SignedWrite>
+        <ReliableWrite>Excluded</ReliableWrite>
+        <Notify>Excluded</Notify>
+        <Indicate>Excluded</Indicate>
+        <WritableAuxiliaries>Excluded</WritableAuxiliaries>
+        <Broadcast>Excluded</Broadcast>
+      </Properties>
+    </Characteristic>
+    <Characteristic name="Sensor Location"
+    type="org.bluetooth.characteristic.sensor_location">
+      <InformativeText>
+        <p>The Sensor Location characteristic of the device is used
+        to describe the physical location of the Server when
+        correctly fitted.</p>
+        <p>
+        <b>C1:</b>Mandatory if the Multiple Sensor Location feature
+        is supported, otherwise optional.</p>
+      </InformativeText>
+      <Requirement>C1</Requirement>
+      <Properties>
+        <Read>Mandatory</Read>
+        <Write>Excluded</Write>
+        <WriteWithoutResponse>Excluded</WriteWithoutResponse>
+        <SignedWrite>Excluded</SignedWrite>
+        <ReliableWrite>Excluded</ReliableWrite>
+        <Notify>Excluded</Notify>
+        <Indicate>Excluded</Indicate>
+        <WritableAuxiliaries>Excluded</WritableAuxiliaries>
+        <Broadcast>Excluded</Broadcast>
+      </Properties>
+    </Characteristic>
+    <Characteristic name="SC Control Point"
+    type="org.bluetooth.characteristic.sc_control_point">
+      <InformativeText>
+        <p>If the SC Control Point is supported, profiles utilizing
+        this service are required to ensure that the Client
+        configures the SC Control Point characteristic for
+        indications (i.e. via the Client Characteristic
+        Configuration descriptor) at the first connection.</p>
+        <p>Support for this characteristic is mandatory if the
+        Server supports Calibration Procedure, Total Distance or
+        Multiple Sensor Locations features, otherwise it is
+        excluded.</p>
+        <p>
+        <b>C2:</b>Mandatory if at least one SC Control Point
+        procedure is supported, otherwise excluded.</p>
+      </InformativeText>
+      <Requirement>C2</Requirement>
+      <Properties>
+        <Read>Excluded</Read>
+        <Write>Mandatory</Write>
+        <WriteWithoutResponse>Excluded</WriteWithoutResponse>
+        <SignedWrite>Excluded</SignedWrite>
+        <ReliableWrite>Excluded</ReliableWrite>
+        <Notify>Excluded</Notify>
+        <Indicate>Mandatory</Indicate>
+        <WritableAuxiliaries>Excluded</WritableAuxiliaries>
+        <Broadcast>Excluded</Broadcast>
+      </Properties>
+      <Descriptors>
+        <Descriptor name="Client Characteristic Configuration"
+        type="org.bluetooth.descriptor.gatt.client_characteristic_configuration">
+
+          <Requirement>if_characteristic_supported</Requirement>
+          <Properties>
+            <Read>Mandatory</Read>
+            <Write>Mandatory</Write>
+          </Properties>
+        </Descriptor>
+      </Descriptors>
+    </Characteristic>
+  </Characteristics>
+</Service>