FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

waypoints: update to newer libraries

pull/3659/head
Pavel Machek 2024-11-12 13:29:04 +01:00
parent 85afccc182
commit 2b7062939e
1 changed files with 282 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

378
apps/waypoints/waypoints.app.js
View File

@ -3,112 +3,298 @@
var Layout = require("Layout"); var Layout = require("Layout");
const BANGLEJS2 = process.env.HWVERSION == 2; // check for bangle 2 const BANGLEJS2 = process.env.HWVERSION == 2; // check for bangle 2
/* fmt library v0.1.1 */ /* fmt library v0.2.2 */
let fmt = { 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_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_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_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_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_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 /* 0 .. DD.ddddd
1 .. DD MM.mmm' 1 .. DD MM.mmm'
2 .. DD MM'ss" 2 .. DD MM'ss"
*/ */
geo_mode : 1, geo_mode : 1,
init: function() {}, init: function() {},
fmtDist: function(km) { return km.toFixed(1) + this.icon_km; }, fmtDist: function(km) {
fmtSteps: function(n) { return fmtDist(0.001 * 0.719 * n); }, if (km >= 1.0) return km.toFixed(1) + this.icon_km;
fmtAlt: function(m) { return m.toFixed(0) + this.icon_alt; }, return (km*1000).toFixed(0) + this.icon_m;
fmtTimeDiff: function(d) { },
if (d < 180) fmtSteps: function(n) { return this.fmtDist(0.001 * 0.719 * n); },
return ""+d.toFixed(0); fmtAlt: function(m) { return m.toFixed(0) + this.icon_alt; },
d = d/60; fmtTemp: function(c) { return c.toFixed(1) + this.icon_c; },
return ""+d.toFixed(0)+"m"; fmtPress: function(p) {
}, if (p < 900 || p > 1100)
fmtAngle: function(x) { return p.toFixed(0) + this.icon_hpa;
switch (this.geo_mode) { if (p < 1000) {
case 0: p -= 900;
return "" + x; return this.icon_9 + this.add0(p.toFixed(0)) + this.icon_hpa;
case 1: { }
let d = Math.floor(x); p -= 1000;
let m = x - d; return this.icon_10 + this.add0(p.toFixed(0)) + this.icon_hpa;
m = m*60; },
return "" + d + " " + m.toFixed(3) + "'"; draw_dot : 1,
} add0: function(i) {
case 2: { if (i > 9) {
let d = Math.floor(x); return ""+i;
let m = x - d; } else {
m = m*60; return "0"+i;
let mf = Math.floor(m); }
let s = m - mf; },
s = s*60; fmtTOD: function(now) {
return "" + d + " " + mf + "'" + s.toFixed(0) + '"'; this.draw_dot = !this.draw_dot;
} let dot = ":";
} if (!this.draw_dot)
return "bad mode?"; dot = ".";
}, return now.getHours() + dot + this.add0(now.getMinutes());
fmtPos: function(pos) { },
let x = pos.lat; fmtNow: function() { return this.fmtTOD(new Date()); },
let c = "N"; fmtTimeDiff: function(d) {
if (x<0) { if (d < 180)
c = "S"; return ""+d.toFixed(0);
x = -x; d = d/60;
} return ""+d.toFixed(0)+"m";
let s = c+this.fmtAngle(x) + "\n"; },
c = "E"; fmtAngle: function(x) {
if (x<0) { switch (this.geo_mode) {
c = "W"; case 0:
x = -x; return "" + x;
} case 1: {
return s + c + this.fmtAngle(x); 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 */ /* gps library v0.1.4 */
let gps = { let gps = {
emulator: -1, emulator: -1,
init: function(x) { init: function(x) {
this.emulator = (process.env.BOARD=="EMSCRIPTEN" this.emulator = (process.env.BOARD=="EMSCRIPTEN"
|| process.env.BOARD=="EMSCRIPTEN2")?1:0; || process.env.BOARD=="EMSCRIPTEN2")?1:0;
}, },
state: {}, state: {},
on_gps: function(f) { on_gps: function(f) {
let fix = this.getGPSFix(); let fix = this.getGPSFix();
f(fix); f(fix);
/* /*
"lat": number, // Latitude in degrees "lat": number, // Latitude in degrees
"lon": number, // Longitude in degrees "lon": number, // Longitude in degrees
"alt": number, // altitude in M "alt": number, // altitude in M
"speed": number, // Speed in kph "speed": number, // Speed in kph
"course": number, // Course in degrees "course": number, // Course in degrees
"time": Date, // Current Time (or undefined if not known) "time": Date, // Current Time (or undefined if not known)
"satellites": 7, // Number of satellites "satellites": 7, // Number of satellites
"fix": 1 // NMEA Fix state - 0 is no fix "fix": 1 // NMEA Fix state - 0 is no fix
"hdop": number, // Horizontal Dilution of Precision "hdop": number, // Horizontal Dilution of Precision
*/ */
this.state.timeout = setTimeout(this.on_gps, 1000, f); this.state.timeout = setTimeout(this.on_gps, 1000, f);
}, },
off_gps: function() { off_gps: function() {
clearTimeout(gps_state.timeout); clearTimeout(this.state.timeout);
}, },
getGPSFix: function() { getGPSFix: function() {
if (!this.emulator) if (!this.emulator)
return Bangle.getGPSFix(); return Bangle.getGPSFix();
let fix = {}; let fix = {};
fix.fix = 1; fix.fix = 1;
fix.lat = 50; fix.lat = 50;
fix.lon = 14; fix.lon = 14-(getTime()-this.gps_start) / 1000; /* Go West! */
fix.alt = 200; fix.alt = 200;
fix.speed = 5; fix.speed = 5;
fix.course = 30; fix.course = 30;
fix.time = Date(); fix.time = Date();
fix.satellites = 5; fix.satellites = 5;
fix.hdop = 12; fix.hdop = 12;
return fix; return fix;
},
gps_start : -1,
start_gps: function() {
Bangle.setGPSPower(1, "libgps");
this.gps_start = getTime();
},
stop_gps: function() {
Bangle.setGPSPower(0, "libgps");
},
};
/* arrow library v0.0.1 */
let arrow = {
waypoint: { lat: 0, lon: 0 },
updateWaypoint: function(lat, lon) {
this.waypoint.lat = lat;
this.waypoint.lon = lon;
},
// Calculate the bearing to the waypoint
bearingToWaypoint: function(currentPos) {
return fmt.bearing(currentPos, this.waypoint);
},
// Calculate distance to the waypoint
distanceToWaypoint: function(currentPos) {
return fmt.distance(currentPos, this.waypoint);
},
// Calculate compass heading from current GPS data
compassHeading: function(currentHeading) {
return currentHeading || Bangle.getCompass().heading;
},
// Display function to show arrows for waypoint, north, and sun
displayNavigation: function(currentPos, currentHeading) {
g.clear().setFont("Vector", 22).setFontAlign(0, 0);
// Calculate bearings
let waypointBearing = this.bearingToWaypoint(currentPos);
let distance = this.distanceToWaypoint(currentPos);
let northHeading = this.compassHeading(currentHeading);
// Format distance
let distStr = fmt.fmtDist(distance/1000);
northHeading = 45;
// Draw compass arrow for north
this.drawArrow(northHeading, "N", 1);
// Draw arrow towards waypoint
if (1)
this.drawArrow(waypointBearing, `${distStr}`, 3);
let s;
s = sun.sunPos();
// Draw sun arrow if sun is visible
if (s.altitude > 0) {
this.drawArrow(s.azimuth, "Sun", 1);
} }
s = sun.moonPos();
// Draw sun arrow if sun is visible
if (s.altitude > 0) {
this.drawArrow(s.azimuth, "Moon", 1);
}
},
drawArrow: function(angle, label, width) {
// Convert angle to radians
let rad = angle * Math.PI / 180;
// Arrow parameters
let centerX = 88;
let centerY = 88;
let length = 60; // Arrow length
g.drawCircle(centerX, centerY, length);
// Calculate the rectangle's corner points for the rotated arrow
let dx = Math.sin(rad) * length;
let dy = -Math.cos(rad) * length;
let px = Math.sin(rad + Math.PI / 2) * (width / 2);
let py = -Math.cos(rad + Math.PI / 2) * (width / 2);
// Calculate each corner of the rectangle (arrow body)
let x1 = centerX + px;
let y1 = centerY + py;
let x2 = centerX - px;
let y2 = centerY - py;
let x3 = x2 + dx * 0.9;
let y3 = y2 + dy * 0.9;
let x4 = x1 + dx * 0.9;
let y4 = y1 + dy * 0.9;
// Draw the filled rectangle for the arrow body
g.fillPoly([x1, y1, x2, y2, x3, y3, x4, y4]);
// Draw the label at the arrow's endpoint
g.setFontAlign(0, 0);
g.drawString(label, x3 + dx * 0.4, y3 + dy * 0.4);
// Draw arrowhead
this.drawArrowHead(rad, centerX + dx, centerY + dy);
},
drawArrowHead: function(rad, x, y) {
// Arrowhead parameters
let headLength = 16; // Length of each arrowhead side
let headAngle = Math.PI / 6; // Arrowhead angle
let angle = rad - Math.PI/2;
// Calculate positions for arrowhead points
let xHead1 = x - headLength * Math.cos(angle - headAngle);
let yHead1 = y - headLength * Math.sin(angle - headAngle);
let xHead2 = x - headLength * Math.cos(angle + headAngle);
let yHead2 = y - headLength * Math.sin(angle + headAngle);
// Draw the arrowhead as a filled triangle
g.fillPoly([x, y, xHead1, yHead1, xHead2, yHead2]);
}
}; };
var wp = require('Storage').readJSON("waypoints.json", true) || []; var wp = require('Storage').readJSON("waypoints.json", true) || [];