bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trail: fix end-of-track in demo, cleanups

master
Pavel Machek 2024-09-13 18:41:13 +02:00
parent 594a7e446a
commit 50cf977f79
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apps/trail/trail.app.js
View File

@ -128,12 +128,13 @@ let fmt = {
}, },
}; };
/* gps library v0.1.2 */ /* gps library v0.1.3 */
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;
this.emulator = 1; // FIXME
}, },
state: {}, state: {},
on_gps: function(f) { on_gps: function(f) {
@ -161,8 +162,8 @@ let gps = {
return Bangle.getGPSFix(); return Bangle.getGPSFix();
let fix = {}; let fix = {};
fix.fix = 1; fix.fix = 1;
fix.lat = 50; fix.lat = 50.010507;
fix.lon = 14-(getTime()-this.gps_start) / 1000; /* Go West! */ fix.lon = 14.765840-(getTime()-this.gps_start) / 10000; /* Go West! */
fix.alt = 200; fix.alt = 200;
fix.speed = 5; fix.speed = 5;
fix.course = 30; fix.course = 30;
@ -604,6 +605,11 @@ function paint_all(pp) {
return { quiet: quiet, offtrack: mDist }; return { quiet: quiet, offtrack: mDist };
} }
function drop_last() {
print("Dropping ", track[0].point_num);
track.shift();
}
function step_to(pp, pass_all) { function step_to(pp, pass_all) {
if (0) { if (0) {
g.setColor(0.5, 0.5, 1); g.setColor(0.5, 0.5, 1);
@ -615,15 +621,14 @@ function step_to(pp, pass_all) {
let quiet = paint_all(pp); let quiet = paint_all(pp);
if (distSegment(track[0], track[1], pp) > 150 while (distSegment(track[0], track[1], pp) > 150 &&
&& track.length > 10) { track.length > 10) {
print("Dropping ", track[0].point_num); drop_last();
track.shift();
} }
return quiet; return quiet;
} }
var demo_mode = 1; //fixme var demo_mode = 0; //fixme
function step() { function step() {
const fast = 0; const fast = 0;
@ -684,7 +689,7 @@ function step() {
Bangle.setLCDPower(1); Bangle.setLCDPower(1);
if (demo_mode) if (demo_mode)
track.shift(); drop_last();
let v2 = getTime(); let v2 = getTime();
print("Step took", (v2-v1), "seconds"); print("Step took", (v2-v1), "seconds");
setTimeout(step, 10); /* FIXME! */ setTimeout(step, 10); /* FIXME! */
@ -698,11 +703,10 @@ function recover() {
pp.ppm = 0.08 * 3; /* Pixels per meter */ pp.ppm = 0.08 * 3; /* Pixels per meter */
if (!fix.fix) { if (!fix.fix) {
print("Can't recover with no fix\n"); print("Can't recover with no fix\n");
fix.lat = 50.0122; fix.lat = 50.010507;
fix.lon = 14.7780; fix.lon = 14.765840;
} }
load_next(); load_next();
load_next();
while(1) { while(1) {
let d = distSegment(track[0], track[1], pp); let d = distSegment(track[0], track[1], pp);
print("Recover, d", d); print("Recover, d", d);
@ -711,7 +715,8 @@ function recover() {
track.shift(); track.shift();
if (0) if (0)
step_to(pp, 1); step_to(pp, 1);
load_next(); if (!load_next())
break;
ui.drawMsg("Recover\n" + fmt.fmtDist(d / 1000)); ui.drawMsg("Recover\n" + fmt.fmtDist(d / 1000));
} }
} }