diff --git a/apps/waypoints/waypoints.app.js b/apps/waypoints/waypoints.app.js index 45a10d0dd..b77526ce9 100644 --- a/apps/waypoints/waypoints.app.js +++ b/apps/waypoints/waypoints.app.js @@ -3,14 +3,117 @@ var Layout = require("Layout"); const BANGLEJS2 = process.env.HWVERSION == 2; // check for bangle 2 +/* 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 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(gps_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 wp = require('Storage').readJSON("waypoints.json", true) || []; // Use this with corrupted waypoints //var wp = []; -/* 0 .. DD.ddddd - 1 .. DD MM.mmm' - 2 .. DD MM'ss" -*/ -var mode = 1; var key; /* Shared between functions, typically wp name */ var fix; /* GPS fix */ var cancel_gps; @@ -47,30 +150,33 @@ function mainMenu() { } function updateGps() { - let pos = "lat/lon", alt = "alt", speed = "speed"; - - if (cancel_gps) - return; - fix = Bangle.getGPSFix(); - - speed = "no fix (" + (getTime() - gps_start).toFixed(0) + "s)"; - - if (fix && fix.fix && fix.lat) { - pos = "" + lat(fix.lat) + " " + lon(fix.lon); - alt = "alt " + fix.alt.toFixed(0) + "m"; - speed = "speed " + fix.speed.toFixed(1) + "kt"; - } - - g.reset().setFont("Vector", 20) - .setColor(1,1,1) - .fillRect(0, 0, 176, 120) - .setColor(0,0,0) - .drawString(key, 0, 0) - .drawString(pos, 0, 20) - .drawString(alt, 0, 60) - .drawString(speed, 0, 80); + let have = false, lat = "lat ", alt = "?", + speed = "speed ", hdop = "?", adelta = "adelta ", + tdelta = "tdelta "; - setTimeout(updateGps, 100); + if (cancel_gps) + return; + fix = gps.getGPSFix(); + + if (fix && fix.fix && fix.lat) { + lat = "" + fmt.fmtPos(fix); + alt = "" + fix.alt.toFixed(0); + speed = "" + fix.speed.toFixed(1); + hdop = "" + fix.hdop.toFixed(0); + have = true; + } else { + lat = "NO FIX\n" + + "" + (getTime() - gps_start).toFixed(0) + "s "; + } + + let msg = ""; + msg = lat + "\n"+ alt + "m"; + g.reset().setFont("Vector", 31) + .setColor(1,1,1) + .fillRect(0, 24, 176, 100) + .setColor(0,0,0) + .drawString(msg, 3, 25); + setTimeout(updateGps, 1000); } function stopGps() { @@ -110,16 +216,16 @@ function setFormat() { var la = new Layout ( {type:"v", c: [ {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Format"}, - {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD.dddd", cb:l=>{ mode = 0; mainMenu(); }}, - {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD MM.mmm'", cb:l=>{ mode = 1; mainMenu(); }}, - {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD MM'ss"+'"', cb:l=>{ mode = 2; mainMenu(); }}, + {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD.dddd", cb:l=>{ fmt.geo_mode = 0; mainMenu(); }}, + {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD MM.mmm'", cb:l=>{ fmt.geo_mode = 1; mainMenu(); }}, + {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "DD MM'ss"+'"', cb:l=>{ fmt.geo_mode = 2; mainMenu(); }}, ], lazy:true}); g.clear(); la.render(); } function format(x) { - switch (mode) { + switch (fmt.geo_mode) { case 0: return "" + x; case 1: @@ -262,13 +368,13 @@ function ask01(t, cb) { function askCoordinate(t1, t2, callback) { //let sign = 1; ask01(t1, function(sign) { - switch (mode) { + switch (fmt.geo_mode) { case 0: s = "DDD.dddd"; break; case 1: s = "DDD MM.mmm"; break; case 2: s = "DDD MM'ss"+'"'; break; } showNumpad(s, t2, function() { - switch (mode) { + switch (fmt.geo_mode) { case 0: res = parseFloat(key); break; @@ -338,5 +444,8 @@ function addCard() { }); } +fmt.init(); +gps.init(); + g.reset(); mainMenu();