Merge pull request #3507 from pavelmachek/m_26_skyspy3

SkySpy v0.03
2024-08-02 18:37:27 +01:00 · 2024-08-02 18:37:27 +01:00 · 974d8f49a0
parent 8c5eceb7c3 5160c2eeda
commit 974d8f49a0
3 changed files with 247 additions and 80 deletions
--- a/apps/skyspy/ChangeLog
+++ b/apps/skyspy/ChangeLog
@ -1,2 +1,3 @@
 0.01: attempt to import
 0.02: Minor code improvements
+0.03: big rewrite, adding time-adjust and altitude-adjust functionality
--- a/apps/skyspy/metadata.json
+++ b/apps/skyspy/metadata.json
@ -1,6 +1,6 @@
 { "id": "skyspy",
  "name": "Sky Spy",
-  "version": "0.02",
+  "version": "0.03",
  "description": "Application for debugging GPS problems",
  "icon": "app.png",
  "readme": "README.md",
--- a/apps/skyspy/skyspy.app.js
+++ b/apps/skyspy/skyspy.app.js
@ -1,20 +1,121 @@
 /* Sky spy */
-/* 0 .. DD.ddddd
-   1 .. DD MM.mmm'
-   2 .. DD MM'ss"
-*/
-var mode = 1;
+
+/* fmt library v0.1 */
+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",
+
+  /* 0 .. DD.ddddd
+     1 .. DD MM.mmm'
+     2 .. DD MM'ss"
+   */
+    geo_mode : 1,
+    
+    init: function() {},
+    fmtDist: function(km) { return km.toFixed(1) + this.icon_km; },
+    fmtSteps: function(n) { return this.fmtDist(0.001 * 0.719 * n); },
+    fmtAlt: function(m) { return m.toFixed(0) + this.icon_alt; },
+    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(pos.lat) + "\n";
+        c = "E";
+        if (x<0) {
+            c = "W";
+            x = -x;
+        }
+        return s + c + this.fmtAngle(pos.lon);
+    },
+};
+
+/* gps library v0.1 */
+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;
+        fix.alt = 200;
+        fix.speed = 5;
+        fix.course = 30;
+        fix.time = Date();
+        fix.satellites = 5;
+        fix.hdop = 12;
+        return fix;
+    }
+};
+
 var display = 0;
-
 var debug = 0;
-
-var cancel_gps, gps_start;
+var gps_start;
 var cur_altitude;
-
 var wi = 24;
 var h = 176-wi, w = 176;
-
 var fix;
+var adj_time = 0, adj_alt = 0;

 function radA(p) { return p*(Math.PI*2); }
 function radD(d) { return d*(h/2); }
@ -27,26 +128,7 @@ function radY(p, d) {
  return h/2 - Math.cos(a)*radD(d) + wi;
 }

-function format(x) {
-  switch (mode) {
-    case 0:
-      return "" + x;
-    case 1:
-      d = Math.floor(x);
-      m = x - d;
-      m = m*60;
-      return "" + d + " " + m.toFixed(3) + "'";
-    case 2:
-      d = Math.floor(x);
-      m = x - d;
-      m = m*60;
-      mf = Math.floor(m);
-      s = m - mf;
-      s = s*60;
-      return "" + d + " " + mf + "'" + s.toFixed(0) + '"';
-  }
-}
-var qalt = -1;
+var qalt = -1, min_dalt, max_dalt, step;
 function resetAlt() {
  min_dalt = 9999; max_dalt = -9999; step = 0;
 }
@ -64,65 +146,96 @@ function calcAlt(alt, cur_altitude) {
    return ddalt;
 }
 function updateGps() {
-  let /*have = false,*/ lat = "lat", lon = "lon", alt = "alt",
-      speed = "speed", hdop = "hdop"; // balt = "balt";
+  let lat = "lat ", alt = "?",
+      speed = "speed ", hdop = "?", adelta = "adelta ",
+      tdelta = "tdelta ";

-  if (cancel_gps)
-    return;
-  fix = Bangle.getGPSFix();
+  fix = gps.getGPSFix();
+  if (adj_time) {
+    print("Adjusting time");
+    setTime(fix.time.getTime()/1000);
+    adj_time = 0;
+  }
+  if (adj_alt) {
+      print("Adjust altitude");
+      if (qalt < 5) {
+          let rest_altitude = fix.alt;
+          let alt_adjust = cur_altitude - rest_altitude;
+          let abs = Math.abs(alt_adjust);
+          print("adj", alt_adjust);
+          let o = Bangle.getOptions();
+          if (abs > 10 && abs < 150) {
+              let a = 0.01;
+              // FIXME: draw is called often compared to alt reading
+              if (cur_altitude > rest_altitude)
+                  a = -a;
+              o.seaLevelPressure = o.seaLevelPressure + a;
+              Bangle.setOptions(o);
+          }
+          msg = o.seaLevelPressure.toFixed(1) + "hPa";
+          print(msg);
+      }
+  }

  try {
    Bangle.getPressure().then((x) => {
      cur_altitude = x.altitude;
    }, print);
  } catch (e) {
-    print("Altimeter error", e);
+    //print("Altimeter error", e);
  }

-  speed = getTime() - gps_start;

+  //print(fix);
+  if (fix && fix.time) {
+    tdelta = "" + (getTime() - fix.time.getTime()/1000).toFixed(0);
+  }
  if (fix && fix.fix && fix.lat) {
-    lat = "" + format(fix.lat);
-    lon = "" + format(fix.lon);
-    alt = "" + fix.alt.toFixed(1);
+    lat = "" + fmt.fmtPos(fix);
+    alt = "" + fix.alt.toFixed(0);
+    adelta = "" + (cur_altitude - fix.alt).toFixed(0);
    speed = "" + fix.speed.toFixed(1);
-    hdop = "" + fix.hdop.toFixed(1);
-    //have = true;
+    hdop = "" + fix.hdop.toFixed(0);
+  } else {
+    lat = "NO FIX\n"
+       + "" + (getTime() - gps_start).toFixed(0) + "s " 
+          + sats_used + "/" + snum;
+    if (cur_altitude)
+      adelta = "" + cur_altitude.toFixed(0);
  }

  let ddalt = calcAlt(alt, cur_altitude);
-  if (display == 1)
-    g.reset().setFont("Vector", 20)
-    .setColor(1,1,1)
-    .fillRect(0, wi, 176, 176)
-    .setColor(0,0,0)
-    .drawString("Acquiring GPS", 0, 30)
-    .drawString(lat, 0, 50)
-    .drawString(lon, 0, 70)
-    .drawString("alt "+alt, 0, 90)
-    .drawString("speed "+speed, 0, 110)
-    .drawString("hdop "+hdop, 0, 130)
-    .drawString("balt" + cur_altitude, 0, 150);
-
+  let msg = "";
+  if (display == 1) {
+    msg = lat +
+         "\ne" + hdop + "m "+tdelta+"s\n" + 
+         speed + "km/h\n"+ alt + "m+" + adelta + "\nmsghere";
+  }
  if (display == 2) {
-    g.reset().setFont("Vector", 20)
-    .setColor(1,1,1)
-    .fillRect(0, wi, 176, 176)
-    .setColor(0,0,0)
-    .drawString("GPS status", 0, 30)
-    .drawString("speed "+speed, 0, 50)
-    .drawString("hdop "+hdop, 0, 70)
-    .drawString("dd "+qalt.toFixed(0) + " (" + ddalt.toFixed(0) + ")", 0, 90)
-    .drawString("alt "+alt, 0, 110)
-    .drawString("balt " + cur_altitude, 0, 130)
-    .drawString(step, 0, 150);
+    /* qalt is altitude quality estimate -- over ten seconds,
+       computes differences between GPS and barometric altitude.
+       The lower the better.
+       
+       ddalt is just a debugging -- same estimate, but without
+       waiting 10 seconds, so will be always optimistic at start
+       of the cycle */
+    msg = speed + "km/h\n" +
+      "e"+hdop + "m"
+      +"\ndd "+qalt.toFixed(0) + "\n(" + step + "/" + ddalt.toFixed(0) + ")" +
+      "\n"+alt + "m+" + adelta;
+  }
    step++;
    if (step == 10) {
      qalt = max_dalt - min_dalt;
      resetAlt();
    }
+  if (display > 0) {
+    g.reset().setFont("Vector", 31)
+    .setColor(1,1,1)
+    .fillRect(0, wi, 176, 176)
+    .setColor(0,0,0)
+    .drawString(msg, 3, 25);
  }
-
  if (debug > 0)
    print(fix);
  setTimeout(updateGps, 1000);
@ -184,7 +297,7 @@ function drawSats(sats) {

 var sats = [];
 var snum = 0;
-//var sats_receiving = 0;
+var sats_used = 0;

 function parseRaw(msg, lost) {
  if (lost)
@ -199,6 +312,7 @@ function parseRaw(msg, lost) {
  if (s[2] == "1") {
    snum = 0;
    sats = [];
+    sats_used = 0;
  }

  let view = 1 * s[3];
@ -217,6 +331,8 @@ function parseRaw(msg, lost) {
    sat.ele = 1*s[i++];
    sat.azi = 1*s[i++];
    sat.snr = s[i++];
+    if (sat.snr != "")
+      sats_used++;
    if (debug > 0)
      print("  ", sat);
    sats[snum++] = sat;
@ -231,30 +347,80 @@ function parseRaw(msg, lost) {
  }
 }

-function stopGps() {
-  cancel_gps=true;
-  Bangle.setGPSPower(0, "skyspy");
-}
-
 function markGps() {
-  cancel_gps = false;
  Bangle.setGPSPower(1, "skyspy");
  Bangle.on('GPS-raw', parseRaw);
  gps_start = getTime();
  updateGps();
 }
-
-function onSwipe(dir) {
-  display = display + 1;
-  if (display == 3)
-    display = 0;
+function drawMsg(msg) {
+  g.reset().setFont("Vector", 35)
+    .setColor(1,1,1)
+    .fillRect(0, wi, 176, 176)
+    .setColor(0,0,0)
+    .drawString(msg, 5, 30);
+}
+function drawBusy() {
+  drawMsg("\n.oO busy");
 }

+var numScreens = 3;
+
+function nextScreen() {
+    display = display + 1;
+    if (display == numScreens)
+        display = 0;
+    drawBusy();
+}
+
+function prevScreen() {
+    display = display - 1;
+    if (display < 0)
+        display = numScreens - 1;
+    drawBusy();
+}
+
+function onSwipe(dir) {
+    nextScreen();
+}
+
+var last_b = 0;
+function touchHandler(d) {
+    let x = Math.floor(d.x);
+    let y = Math.floor(d.y);
+    
+    if (d.b != 1 || last_b != 0) {
+        last_b = d.b;
+        return;
+    }
+    last_b = d.b;
+
+    if ((x<h/2) && (y<w/2)) {
+        drawMsg("Clock\nadjust");
+        adj_time = 1;
+    }
+    if ((x>h/2) && (y<w/2)) {
+        drawMsg("Alt\nadjust");
+        adj_alt = 1;
+    }
+
+    if ((x<h/2) && (y>w/2))
+        prevScreen();
+    if ((x>h/2) && (y>w/2))
+        nextScreen();
+}
+
+gps.init();
+fmt.init();
+
+Bangle.on("drag", touchHandler);
 Bangle.setUI({
  mode : "custom",
  swipe : onSwipe,
  clock : 0
 });
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
+drawBusy();
 markGps();