Bangle.js2: Added Bangle.setOptions({hrmSportMode})

Author: gfwilliams

ChangeLog

@@ -19,6 +19,7 @@
             JIT: Implemented do { a } while (b)
             Ensure that for(in), Object.keys and Object.getOwnPropertyNames return array indices as strings (not numbers)
             Fix memory leak when an error happens while parsing function arguments - eg `print(1,2,3,JSON.parse("!%^$^"),123)`
+            Bangle.js2: Added Bangle.setOptions({hrmSportMode})
 
      2v17 : Bangle.js: When reading file info from a filename table, do it in blocks of 8 (20% faster file search)
             Bangle.js2: Increase flash buffer size from 16->32 bytes (5% performance increase)

libs/banglejs/jswrap_bangle.c

@@ -2337,6 +2337,9 @@ for before the clock is reloaded? 1500ms default, or 0 means never.
   and polling rate may not be exact. The algorithm's filtering is tuned for
   20-40ms poll intervals, so higher/lower intervals may effect the reliability
   of the BPM reading.
+* `hrmSportMode` - on the newest Bangle.js 2 builds with with the proprietary
+  heart rate algorithm, this is the sport mode passed to the algorithm. See `libs/misc/vc31_binary/algo.h`
+  for more info. 0 = normal (default), 1 = running, 2 = ...
 * `seaLevelPressure` (Bangle.js 2) Normally 1013.25 millibars - this is used for
   calculating altitude with the pressure sensor
 
@@ -2357,6 +2360,9 @@ JsVar * _jswrap_banglejs_setOptions(JsVar *options, bool createObject) {
 #ifdef HEARTRATE
   int _hrmPollInterval = hrmPollInterval;
 #endif
+#ifdef HEARTRATE_VC31_BINARY  
+  int _hrmSportMode = hrmInfo.sportMode;
+#endif
 #ifdef TOUCH_DEVICE
   int touchX1 = touchMinX;
   int touchY1 = touchMinY;
@@ -2366,6 +2372,9 @@ JsVar * _jswrap_banglejs_setOptions(JsVar *options, bool createObject) {
   jsvConfigObject configs[] = {
 #ifdef HEARTRATE
       {"hrmPollInterval", JSV_INTEGER, &_hrmPollInterval},
+#endif      
+#ifdef HEARTRATE_VC31_BINARY      
+      {"hrmSportMode", JSV_INTEGER, &_hrmSportMode},
 #endif
 #ifdef PRESSURE_DEVICE
       {"seaLevelPressure", JSV_FLOAT, &barometerSeaLevelPressure},
@@ -2416,6 +2425,9 @@ JsVar * _jswrap_banglejs_setOptions(JsVar *options, bool createObject) {
 #ifdef HEARTRATE
     hrmPollInterval = (uint16_t)_hrmPollInterval;
 #endif
+#ifdef HEARTRATE_VC31_BINARY
+    hrmInfo.sportMode = _hrmSportMode;
+#endif    
 #ifdef TOUCH_DEVICE
     touchMinX = touchX1;
     touchMinY = touchY1;

libs/misc/heartrate.h

@@ -53,6 +53,7 @@ typedef struct {
   value so we have to guess based on when it changes */
   int lastHRM, lastConfidence; 
   int msSinceLastHRM; // how long was it since the last HRM reading? 
+  uint8_t sportMode; // The sport mode passed to the algorithm
 #endif
 } HrmInfo;
 

libs/misc/heartrate_vc31_binary.c

@@ -30,6 +30,7 @@ void hrm_init() {
   memset(&hrmInfo, 0, sizeof(hrmInfo));
   hrmInfo.isWorn = false;
   hrmInfo.lastPPGTime = jshGetSystemTime();  
+  hrmInfo.sportMode = SPORT_TYPE_NORMAL;
 }
 
 /// Add new heart rate value
@@ -64,7 +65,7 @@ bool hrm_new(int ppgValue, Vector3 *acc) {
   inputData.ppgSample = vcInfo.ppgValue | (vcInfo.wasAdjusted ? 0x1000 : 0);
   inputData.envSample = vcInfo.envValue;
   hrmInfo.msSinceLastHRM += timeDiff;
-  Algo_Input(&inputData, timeDiff, SPORT_TYPE_NORMAL,0/*surfaceRecogMode*/,0/*opticalAidMode*/);
+  Algo_Input(&inputData, timeDiff, hrmInfo.sportMode, 0/*surfaceRecogMode*/,0/*opticalAidMode*/);
   AlgoOutputData_t outputData;
   Algo_Output(&outputData);
   //jsiConsolePrintf("HRM %d %d %d\n", outputData.hrData, outputData.reliability, hrmInfo.msSinceLastHRM);