Merge branch 'espruino:master' into StoragwAnalyser

Author: RKBoss6

apps/clkinfoclk/metadata.json

@@ -5,7 +5,7 @@
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "clkinfo",
-  "tags": "clkinfo",
+  "tags": "clkinfo,clock",
   "supports" : ["BANGLEJS2"],
   "storage": [
     {"name":"clkinfoclk.clkinfo.js","url":"clkinfo.js"}

apps/clkinfodist/ChangeLog

@@ -0,0 +1 @@
+0.01: New App!

apps/clkinfodist/app.png

@@ -0,0 +1,22 @@
+(function() {
+  let strideLength = (require("Storage").readJSON("myprofile.json",1)||{}).strideLength ?? 0.79,
+      lastSteps = 0;
+  function stepUpdateHandler() { distance.emit("redraw"); }
+  var distance = {
+    name : "Distance",
+    get : () => { let v = (Bangle.getHealthStatus("day").steps - lastSteps)*strideLength; return {
+      text : require("locale").distance(v,1),
+      img : atob("GBiBAAMAAAeAAA/AAA/AAA/gAA/gwAfh4AfD4APD4AOH4AAH4ADj4AHjwAHhwADgAAACAAAHgAAPAAAHAAgCEBgAGD///BgAGAgAEA==")
+    };},
+    run : function() {
+      lastSteps = (lastSteps>=Bangle.getHealthStatus("day").steps) ? 0 : Bangle.getHealthStatus("day").steps;
+      this.emit("redraw");
+    },
+    show : function() { Bangle.on("step", stepUpdateHandler); stepUpdateHandler(); },
+    hide : function() { Bangle.removeListener("step", stepUpdateHandler); }
+  };
+  return {
+    name: "Bangle",
+    items: [ distance ]
+  };
+})

apps/clkinfodist/clkinfo.js

@@ -0,0 +1,14 @@
+{ "id": "clkinfodist",
+  "name": "Clockinfo Distance",
+  "version":"0.01",
+  "description": "Uses the 'My Profile' app's Stride Length to calculate distance travelled based on step count. Tap to reset for measuring distances.",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clkinfo",
+  "tags": "clkinfo,distance,steps,outdoors,tool",
+  "dependencies": {"myprofile":"app"},
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"clkinfodist.clkinfo.js","url":"clkinfo.js"}
+  ]
+}

apps/clkinfodist/icon.png

@@ -17,3 +17,5 @@
 0.16: Add BLE clkinfo entry
 0.17: Fix BLE icon alignment and border on some clocks
 0.18: Tweak BLE icon to add gap and ensure middle of B isn't filled
+0.19: Fix Altitude ClockInfo after BLE added
+      Tapping Altitude now updates the reading

apps/clkinfodist/metadata.json

@@ -39,22 +39,23 @@ exports.load = function() {
   var hrm = 0;
   var alt = "--";
   // callbacks (needed for easy removal of listeners)
-  function batteryUpdateHandler() { bangleItems[0].emit("redraw"); }
-  function stepUpdateHandler() { bangleItems[1].emit("redraw"); }
+  function batteryUpdateHandler() { bangleItems.find(i=>i.name=="Battery").emit("redraw"); }
+  function stepUpdateHandler() { bangleItems.find(i=>i.name=="Steps").emit("redraw"); }
   function hrmUpdateHandler(e) {
     if (e && e.confidence>60) hrm = Math.round(e.bpm);
-    bangleItems[2].emit("redraw");
+    bangleItems.find(i=>i.name=="HRM").emit("redraw");
   }
   function altUpdateHandler() {
     try {
       Bangle.getPressure().then(data=>{
         if (!data) return;
         alt = Math.round(data.altitude) + "m";
-        bangleItems[3].emit("redraw");
+        bangleItems.find(i=>i.name=="Altitude").emit("redraw");
       });
     } catch (e) {
       print("Caught "+e+"\n in function altUpdateHandler in module clock_info");
-      bangleItems[3].emit('redraw');}
+      bangleItems.find(i=>i.name=="Altitude").emit('redraw');
+    }
   }
   // actual menu
   var menu = [{
@@ -120,7 +121,6 @@ exports.load = function() {
       },
     },
     { name: "BLE",
-      hasRange: false,
       isOn: () => {
         const s = NRF.getSecurityStatus();
         return s.advertising || s.connected;
@@ -156,6 +156,7 @@ exports.load = function() {
         min : 0, max : settings.maxAltitude,
         img : atob("GBiBAAAAAAAAAAAAAAAAAAAAAAACAAAGAAAPAAEZgAOwwAPwQAZgYAwAMBgAGBAACDAADGAABv///////wAAAAAAAAAAAAAAAAAAAA==")
       }),
+      run : function() { alt = "--"; this.emit("redraw"); altUpdateHandler(); },
       show : function() { this.interval = setInterval(altUpdateHandler, 60000); alt = "--"; altUpdateHandler(); },
       hide : function() { clearInterval(this.interval); delete this.interval; },
     });

apps/clkinfodist/screenshot.png

@@ -1,7 +1,7 @@
 { "id": "clock_info",
   "name": "Clock Info Module",
   "shortName": "Clock Info",
-  "version":"0.18",
+  "version":"0.19",
   "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)",
   "icon": "app.png",
   "type": "module",