From f1ea2a054078ea9b65b891695c0d24c2745d52a4 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Mon, 17 Jan 2022 21:43:51 +0000
Subject: [PATCH] Run: added settings menu, set pace and time format to mm:ss,
 h:mm:ss

---
 apps.json          |  8 +++++---
 apps/run/ChangeLog |  2 ++
 apps/run/app.js    | 29 ++++++++++++++++++++---------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/apps.json b/apps.json
index 2e11e37f6..2fafaef9f 100644
--- a/apps.json
+++ b/apps.json
@@ -2298,7 +2298,7 @@
   },
   { "id": "run",
     "name": "Run",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Displays distance, time, steps, cadence, pace and more for runners.",
     "icon": "app.png",
     "tags": "run,running,fitness,outdoors,gps",
@@ -2307,8 +2307,10 @@
     "readme": "README.md",
     "storage": [
       {"name":"run.app.js","url":"app.js"},
-      {"name":"run.img","url":"app-icon.js","evaluate":true}
-    ]
+      {"name":"run.img","url":"app-icon.js","evaluate":true},
+      {"name":"run.settings.js","url":"settings.js"}
+    ],
+    "data": [{"name":"run.json"}]
   },
   {
     "id": "banglerun",
diff --git a/apps/run/ChangeLog b/apps/run/ChangeLog
index 5560f00bc..e6f00d8f2 100644
--- a/apps/run/ChangeLog
+++ b/apps/run/ChangeLog
@@ -1 +1,3 @@
 0.01: New App!
+0.02: Set pace format to mm:ss, time format to h:mm:ss,
+      added settings to opt out of GPS and HRM
diff --git a/apps/run/app.js b/apps/run/app.js
index 44c42711c..277d1b323 100644
--- a/apps/run/app.js
+++ b/apps/run/app.js
@@ -1,6 +1,6 @@
 var B2 = process.env.HWVERSION==2;
 var Layout = require("Layout");
-var locale = require("locale")
+var locale = require("locale");
 var fontHeading = "6x8:2";
 var fontValue = B2 ? "6x15:2" : "6x8:3";
 var headingCol = "#888";
@@ -21,21 +21,25 @@ Bangle.drawWidgets();
 // ---------------------------
 
 function formatTime(ms) {
-  var s = Math.round(ms/1000);
-  var min = Math.floor(s/60).toString();
-  s = (s%60).toString();
-  return min.padStart(2,0)+":"+s.padStart(2,0);
+  let hrs = Math.floor(ms/3600000);
+  let mins = Math.floor(ms/60000)%60;
+  let secs = Math.floor(ms/1000)%60;
+
+  if (hrs === 0)
+    return mins.padStart(2,0)+":"+secs.padStart(2,0);
+  else
+    return hrs+":"+mins.padStart(2,0)+":"+secs.padStart(2,0); // dont pad hours
 }
 
 // Format speed in meters/second
 function formatPace(speed) {
   if (speed < 0.1667) {
-    return `__'__"`;
+    return `__:__`;
   }
   const pace = Math.round(1000 / speed); // seconds for 1km
   const min = Math.floor(pace / 60); // minutes for 1km
   const sec = pace % 60;
-  return ('0' + min).substr(-2) + `'` + ('0' + sec).substr(-2) + `"`;
+  return ('0' + min).substr(-2) + `:` + ('0' + sec).substr(-2);
 }
 
 // ---------------------------
@@ -149,10 +153,17 @@ Bangle.on("step", function(steps) {
   lastStepCount = steps;
 });
 
+function loadSettings() {
+  settings = require("Storage").readJSON('run.json',1)||{};
+  settings.use_gps = settings.use_gps||true;
+  settings.use_hrm = settings.use_hrm||true;
+}
+
 // We always call ourselves once a second, if only to update the time
 setInterval(onTimer, 1000);
+loadSettings();
 
 /* Turn GPS and HRM on right at the start to ensure
 we get the highest chance of a lock. */
-Bangle.setHRMPower(true,"app");
-Bangle.setGPSPower(true,"app");
+if (settings.use_hrm) Bangle.setHRMPower(true,"app");
+if (settings.use_gps) Bangle.setGPSPower(true,"app");