Merge pull request #3657 from pavelmachek/m_38_widadj

widadjust: Add application to automatically determine PPM fixup from GPS data

apps/widadjust/ChangeLog

@@ -1,3 +1,4 @@
 0.01: New widget
 0.02: Use default Bangle formatter for booleans
 0.03: Add option to hide widget
+0.04: Add auto-adjust app

apps/widadjust/app-icon.js

@@ -0,0 +1,2 @@
+require("heatshrink").decompress(atob("mEwhHXAH4A/AH4AegADDAAYLGF8QuEGAYvlFwwwCF/4vUABZf/F/4vEGA4LEF8YwFBYwA/AHB8uWIoxtGH4w/FB5fpRWQxwEE5YvXmJixKn4v/F/4v/F/4v/F8gAFK1AvGB4RpmL8oA/AH4A/AH4A/AH4AIgAlkA"))
+

apps/widadjust/metadata.json

@@ -2,15 +2,16 @@
   "id": "widadjust",
   "name": "Adjust Clock",
   "icon": "icon.png",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Adjusts clock continually in the background to counter clock drift",
-  "type": "widget",
   "tags": "widget",
   "supports": [ "BANGLEJS", "BANGLEJS2" ],
   "readme": "README.md",
   "storage": [
     { "name": "widadjust.wid.js", "url": "widget.js" },
-    { "name": "widadjust.settings.js", "url": "settings.js" }
+    { "name": "widadjust.settings.js", "url": "settings.js" },
+    { "name": "widadjust.app.js","url":"widadjust.app.js"},
+    { "name": "widadjust.img","url":"app-icon.js","evaluate":true}
   ],
   "data": [
     { "name": "widadjust.json" },

apps/widadjust/widadjust.app.js

@@ -0,0 +1,249 @@
+/* Widadjust auto adjuster */
+/* fmt library v0.2.2 */
+let fmt = {
+  icon_alt : "\0\x08\x1a\1\x00\x00\x00\x20\x30\x78\x7C\xFE\xFF\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00",
+  icon_m : "\0\x08\x1a\1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00",
+  icon_km : "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00",
+  icon_kph : "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\xFF\x00\xC3\xC3\xFF\xC3\xC3",
+  icon_c : "\0\x08\x1a\1\x00\x00\x60\x90\x90\x60\x00\x7F\xFF\xC0\xC0\xC0\xC0\xC0\xFF\x7F\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+  icon_hpa : "\x00\x08\x16\x01\x00\x80\xb0\xc8\x88\x88\x88\x00\xf0\x88\x84\x84\x88\xf0\x80\x8c\x92\x22\x25\x19\x00\x00",
+  icon_9 : "\x00\x08\x16\x01\x00\x00\x00\x00\x38\x44\x44\x4c\x34\x04\x04\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+  icon_10 : "\x00\x08\x16\x01\x00\x08\x18\x28\x08\x08\x08\x00\x00\x18\x24\x24\x24\x24\x18\x00\x00\x00\x00\x00\x00\x00",
+
+  /* 0 .. DD.ddddd
+     1 .. DD MM.mmm'
+     2 .. DD MM'ss"
+  */
+  geo_mode : 1,
+
+  init: function() {},
+  fmtDist: function(km) {
+    if (km >= 1.0) return km.toFixed(1) + this.icon_km;
+    return (km*1000).toFixed(0) + this.icon_m;
+  },
+  fmtSteps: function(n) { return this.fmtDist(0.001 * 0.719 * n); },
+  fmtAlt: function(m) { return m.toFixed(0) + this.icon_alt; },
+  fmtTemp: function(c) { return c.toFixed(1) + this.icon_c; },
+  fmtPress: function(p) { 
+    if (p < 900 || p > 1100)
+      return p.toFixed(0) + this.icon_hpa; 
+    if (p < 1000) {
+      p -= 900;
+      return this.icon_9 + this.add0(p.toFixed(0)) + this.icon_hpa;
+    }
+    p -= 1000;
+    return this.icon_10 + this.add0(p.toFixed(0)) + this.icon_hpa;
+  },
+  draw_dot : 1,
+  add0: function(i) {
+    if (i > 9) {
+      return ""+i;
+    } else {
+      return "0"+i;
+    }
+  },
+  fmtTOD: function(now) {
+    this.draw_dot = !this.draw_dot;
+    let dot = ":";
+    if (!this.draw_dot)
+      dot = ".";
+    return now.getHours() + dot + this.add0(now.getMinutes());
+  },
+  fmtNow: function() { return this.fmtTOD(new Date()); },
+  fmtTimeDiff: function(d) {
+    if (d < 180)
+      return ""+d.toFixed(0);
+    d = d/60;
+    return ""+d.toFixed(0)+"m";
+  },
+  fmtAngle: function(x) {
+    switch (this.geo_mode) {
+    case 0:
+      return "" + x;
+    case 1: {
+      let d = Math.floor(x);
+      let m = x - d;
+      m = m*60;
+      return "" + d + " " + m.toFixed(3) + "'";
+    }
+    case 2: {
+      let d = Math.floor(x);
+      let m = x - d;
+      m = m*60;
+      let mf = Math.floor(m);
+      let s = m - mf;
+      s = s*60;
+      return "" + d + " " + mf + "'" + s.toFixed(0) + '"';
+    }
+    }
+    return "bad mode?";
+  },
+  fmtPos: function(pos) {
+    let x = pos.lat;
+    let c = "N";
+    if (x<0) {
+      c = "S";
+      x = -x;
+    }
+    let s = c+this.fmtAngle(x) + "\n";
+    c = "E";
+    if (x<0) {
+      c = "W";
+      x = -x;
+    }
+    return s + c + this.fmtAngle(x);
+  },
+  fmtFix: function(fix, t) {
+    if (fix && fix.fix && fix.lat) {
+      return this.fmtSpeed(fix.speed) + " " +
+        this.fmtAlt(fix.alt);
+    } else {
+      return "N/FIX " + this.fmtTimeDiff(t);
+    }
+  },
+  fmtSpeed: function(kph) {
+    return kph.toFixed(1) + this.icon_kph;
+  },
+  radians: function(a) { return a*Math.PI/180; },
+  degrees: function(a) { return a*180/Math.PI; },
+  // distance between 2 lat and lons, in meters, Mean Earth Radius = 6371km
+  // https://www.movable-type.co.uk/scripts/latlong.html
+  // (Equirectangular approximation)
+  // returns value in meters
+  distance: function(a,b) {
+    var x = this.radians(b.lon-a.lon) * Math.cos(this.radians((a.lat+b.lat)/2));
+    var y = this.radians(b.lat-a.lat);
+    return Math.sqrt(x*x + y*y) * 6371000;
+  },
+  // thanks to waypointer
+  bearing: function(a,b) {
+    var delta = this.radians(b.lon-a.lon);
+    var alat = this.radians(a.lat);
+    var blat = this.radians(b.lat);
+    var y = Math.sin(delta) * Math.cos(blat);
+    var x = Math.cos(alat) * Math.sin(blat) -
+        Math.sin(alat)*Math.cos(blat)*Math.cos(delta);
+    return Math.round(this.degrees(Math.atan2(y, x)));
+  },
+};
+
+/* gps library v0.1.4 */
+let gps = {
+  emulator: -1,
+  init: function(x) {
+    this.emulator = (process.env.BOARD=="EMSCRIPTEN" 
+                     || process.env.BOARD=="EMSCRIPTEN2")?1:0;
+  },
+  state: {},
+  on_gps: function(f) {
+    let fix = this.getGPSFix();
+    f(fix);
+
+    /*
+      "lat": number,      // Latitude in degrees
+      "lon": number,      // Longitude in degrees
+      "alt": number,      // altitude in M
+      "speed": number,    // Speed in kph
+      "course": number,   // Course in degrees
+      "time": Date,       // Current Time (or undefined if not known)
+      "satellites": 7,    // Number of satellites
+      "fix": 1            // NMEA Fix state - 0 is no fix
+      "hdop": number,     // Horizontal Dilution of Precision
+    */
+    this.state.timeout = setTimeout(this.on_gps, 1000, f);
+  },
+  off_gps: function() {
+    clearTimeout(this.state.timeout);
+  },
+  getGPSFix: function() {
+    if (!this.emulator)
+      return Bangle.getGPSFix();
+    let fix = {};
+    fix.fix = 1;
+    fix.lat = 50;
+    fix.lon = 14-(getTime()-this.gps_start) / 1000; /* Go West! */
+    fix.alt = 200;
+    fix.speed = 5;
+    fix.course = 30;
+    fix.time = Date();
+    fix.satellites = 5;
+    fix.hdop = 12;
+    return fix;
+  },
+  gps_start : -1,
+  start_gps: function() {
+    Bangle.setGPSPower(1, "libgps");
+    this.gps_start = getTime();
+  },
+  stop_gps: function() {
+    Bangle.setGPSPower(0, "libgps");
+  },
+};
+
+
+var start_time = -5, start_delta;
+
+function updateTime(fix, now) {
+  let s = fmt.fmtNow() + "\n";
+  if (!fix.time)
+    return s + "???";
+
+  let delta = (now - fix.time.getTime()/1000);
+  let tdelta = "" + delta.toFixed(4);
+
+  let is_fix = 1;
+  // = fix.fix
+
+  if (start_time < -1) {
+    start_time ++;
+  }
+
+  if (is_fix && start_time == -1) {
+    start_time = now;
+    start_delta = delta;
+  }
+
+  if (!is_fix)
+    return s + "e " + tdelta + "s";	
+
+  let ppm = (delta - start_delta) / (now - start_time);
+  let pd = ppm * (3600*24);
+  ppm *= 1000000;
+  return s + "ppm " + ppm.toFixed(1)
+    + "\n" + pd.toFixed(1) + "s/day"
+    + "\ne " + tdelta + "s";
+}
+
+var cancel_gps = 0;
+
+function on_gps(fix) {
+  // Do this first so that we don't get extra jitter
+  let now = getTime();
+
+  if (cancel_gps)
+    return;
+
+  let msg = "";
+  if (fix && fix.fix && fix.lat) {
+    msg = "" + fix.speed.toFixed(1) + "km/h " +
+      fix.alt.toFixed(0) + "m";
+  } else {
+    msg = "N/FIX "
+      + (getTime() - gps.gps_start).toFixed(0) + "s";
+  }
+
+  msg += "\n" + updateTime(fix, now);
+
+  g.reset().clear().setFont("Vector", 31)
+    .setColor(1,1,1)
+    .fillRect(0, 24, 176, 100)
+    .setColor(0,0,0)
+    .drawString(msg, 3, 25);
+}
+
+fmt.init();
+gps.init();
+gps.start_gps();
+Bangle.on('GPS', on_gps);
+
+g.reset();