Merge branch '0.9.7-(under-construction)' into 0.9.7d2---Probobalistic-drag-calculation

Author: JaapvanEkris

app/engine/Flywheel.js

@@ -1,7 +1,7 @@
 'use strict'
 /**
  * @copyright [OpenRowingMonitor]{@link https://github.com/JaapvanEkris/openrowingmonitor}
- *
+ * 
  * @file This models the flywheel with all of its attributes, which we can also test for being powered
  *
  * All times and distances are defined as being before the beginning of the flank, as RowingEngine's metrics

app/recorders/fitRecorder.js

@@ -160,7 +160,7 @@ export function createFITRecorder (config) {
       ...(!isNaN(heartRate) && heartRate > 0 ? { heartrate: heartRate } : { heartrate: undefined })
     })
     sessionData.totalMovingTime = metrics.workout.timeSpent.moving
-    VO2max.push(metrics)
+    VO2max.push(metrics, heartRate)
     fitfileContentIsCurrent = false
     allDataHasBeenWritten = false
   }

app/recorders/rowingDataRecorder.js

@@ -117,7 +117,7 @@ export function createRowingDataRecorder (config) {
     strokes[strokeNumber].driveHandleForceCurve = metrics.driveHandleForceCurve
     strokes[strokeNumber].driveHandleVelocityCurve = metrics.driveHandleVelocityCurve
     strokes[strokeNumber].driveHandlePowerCurve = metrics.driveHandlePowerCurve
-    VO2max.push(metrics)
+    VO2max.push(metrics, heartRate)
     if (!isNaN(metrics.dragFactor) && metrics.dragFactor > 0) { drag.push(metrics.dragFactor) }
     allDataHasBeenWritten = false
     rowingDataFileContentIsCurrent = false

app/recorders/tcxRecorder.js

@@ -111,7 +111,7 @@ export function createTCXRecorder (config) {
     } else {
       sessionData.lap[lapnumber].strokes[strokenumber].heartrate = undefined
     }
-    VO2max.push(metrics)
+    VO2max.push(metrics, heartRate)
     tcxfileContentIsCurrent = false
     allDataHasBeenWritten = false
   }

app/recorders/utils/VO2max.js

@@ -27,15 +27,15 @@ export function createVO2max (config) {
   /**
    * @param {Metrics} metrics
    */
-  function push (metrics) {
+  function push (metrics, HRData) {
     VO2MaxResultIsCurrent = false
-    if (metrics.totalMovingTime > offset && !!metrics.heartrate && !isNaN(metrics.heartrate) && metrics.heartrate >= config.userSettings.restingHR && metrics.heartrate < config.userSettings.maxHR && !isNaN(metrics.cyclePower) && metrics.cyclePower > 0 && metrics.cyclePower <= config.userSettings.maxPower) {
+    if (metrics.totalMovingTime > offset && !!HRData && !isNaN(HRData) && HRData >= config.userSettings.restingHR && HRData < config.userSettings.maxHR && !isNaN(metrics.cyclePower) && metrics.cyclePower > 0 && metrics.cyclePower <= config.userSettings.maxPower) {
       // We are outside the startup noise and have numeric fields
       metricsArray.push({
         totalMovingTime: metrics.totalMovingTime,
         totalLinearDistance: metrics.totalLinearDistance,
         cyclePower: metrics.cyclePower,
-        heartrate: metrics.heartrate
+        heartrate: HRData
       })
     }
   }