Merge branch 'espruino:master' into master

Author: stweedo

apps/agenda/ChangeLog

@@ -18,3 +18,4 @@
 0.16: Correct date for all day events in negative timezones, improve locale display
 0.17: Fixed "Today" and "Tomorrow" labels displaying in non-current weeks
 0.18: Correct date in clockinfo for all-day events in negative timezones
+0.19: Change clockinfo title truncation to preserve images

apps/agenda/agenda.clkinfo.js

@@ -64,7 +64,7 @@
 
   agenda.forEach((entry, i) => {
 
-    var title = entry.title.slice(0,12);
+    var title = g.setFont("6x8").wrapString(entry.title,100)[0];
     // All day events are always in UTC and always start at 00:00:00, so we
     // need to "undo" the timezone offsetting to make sure that the day is
     // correct.

apps/agenda/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "0.18",
+  "version": "0.19",
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],

apps/altimeter/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Actually upload correct code
 0.03: Display sea-level pressure, too, and allow calibration
 0.04: Switch to using system code for pressure calibration
+0.05: Prompt before resetting calibration (stops long-press of button resetting calibration)

apps/altimeter/app.js

@@ -7,6 +7,7 @@ var R = Bangle.appRect;
 var y = R.y + R.h/2;
 var MEDIANLENGTH = 20;
 var avr = [];
+var updateDisplay = true;
 
 function fmt(t) {
   if ((t > -100) && (t < 1000))
@@ -19,48 +20,57 @@ function fmt(t) {
 Bangle.on('pressure', function(e) {
   while (avr.length>MEDIANLENGTH) avr.pop();
   avr.unshift(e.altitude);
-  let median = avr.slice().sort();
+  if (!updateDisplay) return;
+  let median = avr.slice().sort(), value;
   g.reset().clearRect(0,y-30,g.getWidth()-10,R.h);
   if (median.length>10) {
     var mid = median.length>>1;
-    var value = E.sum(median.slice(mid-4,mid+5)) / 9;
+    value = E.sum(median.slice(mid-4,mid+5)) / 9;
   } else {
-    var value = median[median.length>>1];
+    value = median[median.length>>1];
   }
-  t = fmt(value);
+  var t = fmt(value);
 
   g.setFont("Vector",50).setFontAlign(0,0).drawString(t, g.getWidth()/2, y);
 
   let o = Bangle.getOptions();
   let sea = o.seaLevelPressure;
   t = sea.toFixed(1) + " " + e.temperature.toFixed(1);
-  if (0) {
+  /*if (0) {
       print("alt raw:", value.toFixed(1));
       print("temperature:", e.temperature);
       print("pressure:", e.pressure);
       print("sea pressure:", sea);
-  }
+  }*/
     g.setFont("Vector",25).setFontAlign(-1,0).drawString(t, 10, R.y+R.h - 35);
 });
 
 function setPressure(m, a) {
-  o = Bangle.getOptions();
-  print(o);
+  var o = Bangle.getOptions();
+  //print(o);
   o.seaLevelPressure = o.seaLevelPressure * m + a;
   Bangle.setOptions(o);
   avr = [];
 }
 
-print(g.getFonts());
-g.reset();
-g.setFont("Vector:15");
-g.setFontAlign(0,0);
-g.drawString(/*LANG*/"ALTITUDE (m)", g.getWidth()/2, y-40);
-g.drawString(/*LANG*/"SEA L (hPa) TEMP (C)", g.getWidth()/2, y+62);
-g.flip();
-g.setFont("6x8").setFontAlign(0,0,3).drawString(/*LANG*/"STD", g.getWidth()-5, g.getHeight()/2);
-Bangle.setUI("updown", btn=> {
-  if (!btn) setPressure(0, 1013.25);
-  if (btn<0) setPressure(1, 1);
-  if (btn>0) setPressure(1, -1);
-});
+function start() {
+  g.reset();
+  g.setFont("Vector:15");
+  g.setFontAlign(0,0);
+  g.drawString(/*LANG*/"ALTITUDE (m)", g.getWidth()/2, y-40);
+  g.drawString(/*LANG*/"SEA L (hPa) TEMP (C)", g.getWidth()/2, y+62);
+  g.setFont("6x8").setFontAlign(0,0,3).drawString(/*LANG*/"STD", g.getWidth()-5, g.getHeight()/2);
+  updateDisplay = true;
+  Bangle.setUI("updown", btn => {
+    if (!btn) {
+      updateDisplay = false;
+      E.showPrompt(/*LANG*/"Set calibration to default?",{title:/*LANG*/"Altitude"}).then(function(reset) {
+        start();
+        if (reset) setPressure(0, 1013.25);
+      });
+    }
+    if (btn<0) setPressure(1, 1);
+    if (btn>0) setPressure(1, -1);
+  });
+}
+start();

apps/altimeter/metadata.json

@@ -1,6 +1,6 @@
 { "id": "altimeter",
   "name": "Altimeter",
-  "version":"0.04",
+  "version":"0.05",
   "description": "Simple altimeter that can display height changed using Bangle.js 2's built in pressure sensor.",
   "icon": "app.png",
   "tags": "tool,outdoors",

apps/boot/ChangeLog

@@ -75,4 +75,5 @@
 0.64: Automatically create .widcache and .clkinfocache to speed up loads
       Bangle.loadWidgets overwritten with fast version on success
       Refuse to work on firmware  <2v16 and remove old polyfills
-0.65: Only display interpreter errors if log is nonzero
+0.65: Only display interpreter errors if log is nonzero
+0.66: Ensure __FILE__ is set even after a fresh boot (fix #3857)

apps/boot/bootloader.js

@@ -23,7 +23,8 @@ if (!_clkApp) {
     require("Storage").writeJSON("setting.json", s);
   }
 }
+if (s.clock) __FILE__=s.clock;
 delete s;
 if (!_clkApp) _clkApp=`E.showMessage("No Clock Found");setWatch(()=>{Bangle.showLauncher();}, global.BTN2||BTN, {repeat:false,edge:"falling"});`;
 eval(_clkApp);
-delete _clkApp;
+delete _clkApp;

apps/boot/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "boot",
   "name": "Bootloader",
-  "version": "0.65",
+  "version": "0.66",
   "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
   "icon": "bootloader.png",
   "type": "bootloader",

apps/chargeanim/ChangeLog

@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Bangle.js 2 compatibility
+0.03: Add settings menu for showing time and battery percent with animation.