health 0.37: Reduce movement limit for HRM off from 400 to 100

+      Fix daily summary for movement (was not scaling down correctly)

Author: gfwilliams

apps/health/ChangeLog

@@ -39,4 +39,6 @@
       Speed improvements (put temporary functions in RAM where possible)
 0.34: Fix readFullDatabase (was skipping first month of data)
 0.35: Update boot/lib.min.js
-0.36: Fix Distance graphs that used '1*' to remove the suffix
+0.36: Fix Distance graphs that used '1*' to remove the suffix
+0.37: Reduce movement limit for HRM off from 400 to 100
+      Fix daily summary for movement (was not scaling down correctly)

apps/health/boot.js

@@ -6,7 +6,7 @@
       function startMeasurement() {
         // if is charging, or hardly moved and face up/down, don't start HRM
         if (Bangle.isCharging() ||
-            (Bangle.getHealthStatus("last").movement<400 && Math.abs(Bangle.getAccel().z)>0.99)) return;
+            (Bangle.getHealthStatus("last").movement<100 && Math.abs(Bangle.getAccel().z)>0.99)) return;
         // otherwise turn HRM on
         Bangle.setHRMPower(1, "health");
         setTimeout(() => {
@@ -81,12 +81,6 @@ Bangle.on("health", health => {
     require("Storage").write(fn, "HEALTH2\0", 0, DB_HEADER_LEN + DB_RECORDS_PER_MONTH*inf.r); // header (and allocate full new file)
   }
   var recordPos = DB_HEADER_LEN+(rec*inf.r);
-
-  // scale down reported movement value in order to fit it within a
-  // uint8 DB field
-  health = Object.assign({}, health);
-  health.movement /= 8;
-
   require("Storage").write(fn, inf.encode(health), recordPos);
   if (rec%DB_RECORDS_PER_DAY != DB_RECORDS_PER_DAY-2) return;
   // we're at the end of the day. Read in all of the data for the day and sum it up

apps/health/boot.min.js

@@ -61,7 +61,7 @@ exports.getDecoder = function(fileContents) {
         health.steps>>8,health.steps&255, // 16 bit steps
         health.bpmMin || health.bpm, // 8 bit bpm
         health.bpmMax || health.bpm, // 8 bit bpm
-        Math.min(health.movement, 255),
+        Math.min(health.movement >> 3, 255),
         E.getBattery()|(Bangle.isCharging()&&128),
         0|Math.round(health.temperature*2),
         (alt>>8)|(Math.max(0,exports.ACTIVITY.indexOf(health.activity))<<5),alt&255,
@@ -82,7 +82,7 @@ exports.getDecoder = function(fileContents) {
       encode : health => { "ram"; return String.fromCharCode(
         health.steps>>8,health.steps&255, // 16 bit steps
         health.bpm, // 8 bit bpm
-        Math.min(health.movement, 255));
+        Math.min(health.movement >> 3, 255));
       }
     };
   }

apps/health/lib.js

@@ -2,7 +2,7 @@
   "id": "health",
   "name": "Health Tracking",
   "shortName": "Health",
-  "version": "0.36",
+  "version": "0.37",
   "description": "Logs health data and provides an app to view it",
   "icon": "app.png",
   "screenshots" : [ { "url":"screenshot.png" } ],