From 4ca2f69e9903a42924c4916974f6a63bc0b458b4 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Thu, 12 Oct 2023 14:22:43 +0200 Subject: [PATCH] [] sixths: Implemented compass / navigating back to waypoints. These are summary changes from devel_clock branch. --- apps/sixths/README.md | 8 +- apps/sixths/app.js | 450 +++++++++++++++++++++++++++----------- apps/sixths/metadata.json | 3 +- 3 files changed, 335 insertions(+), 126 deletions(-) diff --git a/apps/sixths/README.md b/apps/sixths/README.md index e5d76d5ad..18f6bdf99 100644 --- a/apps/sixths/README.md +++ b/apps/sixths/README.md @@ -48,4 +48,10 @@ night. I'd like to make display nicer, and likely more dynamic, displaying whatever application believes is most important at the time (and -possibly allowing scrolling). \ No newline at end of file +possibly allowing scrolling). + +Todo: + +*) only turn on compass when needed + +*) adjust draw timeouts to save power \ No newline at end of file diff --git a/apps/sixths/app.js b/apps/sixths/app.js index ce036f79d..40a35590d 100644 --- a/apps/sixths/app.js +++ b/apps/sixths/app.js @@ -1,20 +1,45 @@ +// Sixth sense + +// Options you'll want to edit +const rest_altitude = 354; +const geoid_to_sea_level = 0; // Maybe BangleJS2 already compensates? + const W = g.getWidth(); const H = g.getHeight(); var cx = 100; cy = 105; sc = 70; -var buzz = "", msg = ""; temp = 0; alt = 0; bpm = 0; -var buzz = "", msg = "", inm = "", l = "", note = "(NOTEHERE)"; -var mode = 0, mode_time = 0; // 0 .. normal, 1 .. note +var buzz = "", /* Set this to transmit morse via vibrations */ + inm = "", l = "", /* For incoming morse handling */ + in_str = "", + note = "(NOTEHERE)", + debug = "v930", debug2 = "(otherdb)", debug3 = "(short)"; +var mode = 0, mode_time = 0; // 0 .. normal, 1 .. note, 2.. mark name +var disp_mode = 0; // 0 .. normal, 1 .. small time -var gps_on = 0, last_fix = 0, last_restart = 0, last_pause = 0, last_fstart = 0; // utime -var gps_needed = 0, gps_limit = 0; // seconds +// GPS handling +var gps_on = 0, // time GPS was turned on + last_fix = 0, // time of last fix + last_restart = 0, last_pause = 0, last_fstart = 0; // utime +var gps_needed = 0, // how long to wait for a fix + gps_limit = 0, // timeout -- when to stop recording + gps_speed_limit = 0; var prev_fix = null; var gps_dist = 0; -var is_active = false; -var cur_altitude = 0, cur_temperature = 0, alt_adjust = 0; -const rest_altitude = 354; +var mark_heading = -1; + +// Is the human present? +var is_active = false, last_active = getTime(); +var is_level = false; + +// For altitude handling. +var cur_altitude = 0; +var cur_temperature = 0, alt_adjust = 0; +var alt_adjust_mode = ""; + +// Marks +var cur_mark = null; function toMorse(x) { r = ""; @@ -28,12 +53,10 @@ function toMorse(x) { } return r; } - function aload(s) { buzz += toMorse(' E'); load(s); } - function gpsRestart() { print("gpsRestart"); Bangle.setGPSPower(1, "sixths"); @@ -41,33 +64,154 @@ function gpsRestart() { last_pause = 0; last_fstart = 0; } - function gpsPause() { print("gpsPause"); Bangle.setGPSPower(0, "sixths"); last_restart = 0; last_pause = getTime(); } - function gpsOn() { gps_on = getTime(); gps_needed = 1000; - gps_limit = 60*60*4; last_fix = 0; prev_fix = null; gps_dist = 0; gpsRestart(); } - function gpsOff() { Bangle.setGPSPower(0, "sixths"); gps_on = 0; } +function fmtDist(km) { return km.toFixed(1) + "km"; } +function fmtSteps(n) { return fmtDist(0.001 * 0.719 * n); } +function fmtTimeDiff(d) { + if (d < 180) + return ""+d.toFixed(0); + d = d/60; + return ""+d.toFixed(0)+"m"; +} +function gpsHandleFix(fix) { + if (!prev_fix) { + show("GPS acquired", 10); + buzz += " ."; + prev_fix = fix; + } + if (0) { + /* GPS altitude fluctuates a lot, not really usable */ + alt_adjust = cur_altitude - (fix.alt + geoid_to_sea_level); + alt_adjust_mode = "g"; + } + if (1) { + debug = ""+fix.alt+"m "+alt_adjust; + } + if (1) { + let now1 = Date(); + let now2 = fix.time; + n1 = now1.getMinutes() * 60 + now1.getSeconds(); + n2 = now2.getMinutes() * 60 + now2.getSeconds(); + debug2 = "te "+(n2-n1)+"s"; + } + loggps(fix); + d = calcDistance(fix, prev_fix); + if (d > 30) { + prev_fix = fix; + gps_dist += d/1000; + } +} +function gpsHandle() { + let msg = ""; + if (!last_restart) { + d = (getTime()-last_pause); + if (last_fix) + msg = "PL"+ fmtTimeDiff(getTime()-last_fix); + else + msg = "PN"+ fmtTimeDiff(getTime()-gps_on); + print("gps on, paused ", d, gps_needed); + if (d > gps_needed * 2) { + gpsRestart(); + } + } else { + fix = Bangle.getGPSFix(); + if (fix && fix.fix && fix.lat) { + gpsHandleFix(fix); + msg = fix.speed.toFixed(1) + " km/h"; + print("GPS FIX", msg); + + if (!last_fstart) + last_fstart = getTime(); + last_fix = getTime(); + gps_needed = 60; + } else { + if (last_fix) + msg = "L"+ fmtTimeDiff(getTime()-last_fix); + else { + msg = "N"+ fmtTimeDiff(getTime()-gps_on); + if (fix) { + msg += " " + fix.satellites + "sats"; + } + } + } + + d = (getTime()-last_restart); + d2 = (getTime()-last_fstart); + print("gps on, restarted ", d, gps_needed, d2, fix.lat); + if (getTime() > gps_speed_limit && + (d > gps_needed || (last_fstart && d2 > 10))) { + gpsPause(); + gps_needed = gps_needed * 1.5; + print("Pausing, next try", gps_needed); + } + } + msg += " "+gps_dist.toFixed(1)+"km"; + return msg; +} +function markNew() { + let r = {}; + r.time = getTime(); + r.fix = prev_fix; + r.steps = Bangle.getHealthStatus("day").steps; + r.gps_dist = gps_dist; + r.altitude = cur_altitude; + r.name = "auto"; + return r; +} +function markHandle() { + let m = cur_mark; + msg = m.name + ">" + fmtTimeDiff(getTime()- m.time); + if (m.fix && m.fix.fix) { + let s = fmtDist(calcDistance(m.fix, prev_fix)/1000) + "km"; + msg += " " + s; + debug = "wp>" + s; + mark_heading = 180 + calcBearing(m.fix, prev_fix); + debug2 = "wp>" + mark_heading; + } else { + msg += " w" + fmtDist(gps_dist - m.gps_dist); + } + return msg; +} +function entryDone() { + show(":" + in_str); + buzz += " ."; + switch (mode) { + case 1: logstamp(">" + in_str); break; + case 2: cur_mark.name = in_str; break; + } + in_str = 0; + mode = 0; +} function inputHandler(s) { - print("Ascii: ", s); - if (mode == 1) { - note = note + s; + print("Ascii: ", s, s[0], s[1]); + if (s[0] == '^') { + switch (s[1]) { + case 'E': mode = 0; break; + case 'T': entryDone(); break; + } + return; + } + if ((mode == 1) || (mode == 2)){ + in_str = in_str + s; + show(">"+in_str, 10); mode_time = getTime(); return; } @@ -80,12 +224,21 @@ function inputHandler(s) { else s = s+(bat/5); buzz += toMorse(s); + show("Bat "+bat+"%", 60); + break; + case 'F': gpsOff(); show("GPS off", 3); break; + case 'G': gpsOn(); gps_limit = getTime() + 60*60*4; show("GPS on", 3); break; + case 'I': + disp_mode += 1; + if (disp_mode == 2) { + disp_mode = 0; + } break; - case 'F': gpsOff(); break; - case 'G': gpsOn(); break; case 'L': aload("altimeter.app.js"); break; - case 'N': mode = 1; note = ">"; mode_time = getTime(); break; + case 'M': mode = 2; show("M>", 10); cur_mark = markNew(); mode_time = getTime(); break; + case 'N': mode = 1; show(">", 10); mode_time = getTime(); break; case 'O': aload("orloj.app.js"); break; + case 'S': gpsOn(); gps_limit = getTime() + 60*30; gps_speed_limit = gps_limit; show("GPS on", 3); break; case 'T': s = ' T'; d = new Date(); @@ -94,9 +247,9 @@ function inputHandler(s) { buzz += toMorse(s); break; case 'R': aload("run.app.js"); break; + case 'Y': buzz += " ."; Bangle.resetCompass(); break; } } - const morseDict = { '.-': 'A', '-...': 'B', @@ -135,37 +288,46 @@ const morseDict = { '-....': '6', '-----': '0', }; - let asciiDict = {}; - for (let k in morseDict) { print(k, morseDict[k]); asciiDict[morseDict[k]] = k; } - - function morseToAscii(morse) { return morseDict[morse]; } - function asciiToMorse(char) { return asciiDict[char]; } - function morseHandler() { - inputHandler(morseToAscii(inm)); + if (inm[0] == "^") { + inputHandler("^"+morseToAscii(inm.substr(1))); + } else { + inputHandler(morseToAscii(inm)); + } + inm = ""; l = ""; } - function touchHandler(d) { let x = Math.floor(d.x); let y = Math.floor(d.y); - g.setColor(0.25, 0, 0); - g.fillCircle(W-x, W-y, 5); - - if (d.b) { + if (1) { /* Just a debugging feature */ + g.setColor(0.25, 0, 0); + if (0) + g.fillCircle(W-x, W-y, 5); + else + g.fillCircle(x, y, 5); + } + if (!d.b) { + morseHandler(); + l = ""; + return; + } + if (y > H/2 && l == "") { + inm = "^"; + } if (x < W/2 && y < H/2 && l != ".u") { inm = inm + "."; l = ".u"; @@ -181,14 +343,10 @@ function touchHandler(d) { if (x > W/2 && y > H/2 && l != "-d") { inm = inm + "-"; l = "-d"; - } + } - } else - morseHandler(); - - print(inm, "drag:", d); + //print(inm, "drag:", d); } - function add0(i) { if (i > 9) { return ""+i; @@ -196,18 +354,14 @@ function add0(i) { return "0"+i; } } - var lastHour = -1, lastMin = -1; - function logstamp(s) { logfile.write("utime=" + getTime() + " " + s + "\n"); } - function loggps(fix) { logfile.write(fix.lat + " " + fix.lon + " "); logstamp(""); } - function hourly() { print("hourly"); s = ' T'; @@ -215,31 +369,35 @@ function hourly() { buzz += toMorse(s); logstamp(""); } - +function show(msg, timeout) { + note = msg; +} function fivemin() { print("fivemin"); s = ' B'; bat = E.getBattery(); - if (bat < 45) { - s = s+(bat/5); + if (bat < 25) { if (is_active) buzz += toMorse(s); + show("Bat "+bat+"%", 60); } - if (0) + try { Bangle.getPressure().then((x) => { cur_altitude = x.altitude; cur_temperature = x.temperature; }, - print) - .catch(print); + print); + } catch (e) { + print("Altimeter error", e); + } + } - function every(now) { - if ((mode > 0) && (mode_time - getTime() > 60)) { + if ((mode > 0) && (getTime() - mode_time > 10)) { if (mode == 1) { - logstamp(">" + note); + entryDone(); } mode = 0; } - if (gps_on && getTime() - gps_on > gps_limit) { + if (gps_on && getTime() > gps_limit && getTime() > gps_speed_limit) { Bangle.setGPSPower(0, "sixths"); gps_on = 0; } @@ -255,96 +413,136 @@ function every(now) { } +function radians(a) { return a*Math.PI/180; } +function degrees(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) function calcDistance(a,b) { - function radians(a) { return a*Math.PI/180; } var x = radians(b.lon-a.lon) * Math.cos(radians((a.lat+b.lat)/2)); var y = radians(b.lat-a.lat); return Math.sqrt(x*x + y*y) * 6371000; } +// thanks to waypointer +function calcBearing(a,b){ + var delta = radians(b.lon-a.lon); + var alat = radians(a.lat); + var blat = 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(degrees(Math.atan2(y, x))); +} +function testBearing() { + let p1 = {}, p2 = {}; + p1.lat = 40; p2.lat = 50; + p1.lon = 14; p2.lon = 14; + print("bearing = ", calcBearing(p1, p2)); +} +function radA(p) { return p*(Math.PI*2); } +function radD(d) { return d*(H/2); } +function radX(p, d) { + let a = radA(p); + return H/2 + Math.sin(a)*radD(d); +} +function radY(p, d) { + let a = radA(p); + return W/2 - Math.cos(a)*radD(d); +} +function drawDot(h, d, s) { + let x = radX(h/360, d); + let y = radY(h/360, d); + g.fillCircle(x,y, 10); +} +function drawBackground() { + acc = Bangle.getAccel(); + is_level = (acc.z < -0.95); + if (is_level) { + let obj = Bangle.getCompass(); + if (obj) { + let h = 360-obj.heading; + print("Compass", h); + g.setColor(0.5, 0.5, 1); + drawDot(h, 0.7, 10); + } + } + if (prev_fix && prev_fix.fix) { + g.setColor(0.5, 1, 0.5); + drawDot(prev_fix.course, 0.5, 6); + } + if (mark_heading != -1) { + g.setColor(1, 0.5, 0.5); + drawDot(mark_heading, 0.6, 8); + } +} +function drawTime(now) { + if (disp_mode == 0) + g.setFont('Vector', 60); + else + g.setFont('Vector', 26); + g.setFontAlign(1, 1); + g.drawString(now.getHours() + ":" + add0(now.getMinutes()), W, 90); +} function draw() { + if (disp_mode == 2) { + draw_all(); + return; + } g.setColor(1, 1, 1); - g.fillRect(0, 25, W, H); - g.setFont('Vector', 60); + g.fillRect(0, 24, W, H); + + if (0) { + g.setColor(0.25, 1, 1); + g.fillPoly([ W/2, 24, W, 80, 0, 80 ]); + } + let msg = ""; + if (gps_on) { + msg = gpsHandle(); + } else { + msg = note; + } + drawBackground(); - g.setColor(0, 0, 0); - g.setFontAlign(-1, 1); let now = new Date(); - g.drawString(now.getHours() + ":" + add0(now.getMinutes()), 10, 90); + g.setColor(0, 0, 0); + drawTime(now); every(now); let km = 0.001 * 0.719 * Bangle.getHealthStatus("day").steps; + g.setFontAlign(-1, 1); g.setFont('Vector', 26); const weekday = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]; - g.drawString(weekday[now.getDay()] + "" + now.getDate() + ". " + km.toFixed(1) + "km", 10, 115); + g.drawString(weekday[now.getDay()] + "" + now.getDate() + ". " + + fmtSteps(Bangle.getHealthStatus("day").steps), 10, 115); - if (gps_on) { - if (!last_restart) { - d = (getTime()-last_pause); - if (last_fix) - msg = "PL"+ (getTime()-last_fix).toFixed(0); - else - msg = "PN"+ (getTime()-gps_on).toFixed(0); - - print("gps on, paused ", d, gps_needed); - if (d > gps_needed * 2) { - gpsRestart(); - } - } else { - fix = Bangle.getGPSFix(); - if (fix.fix && fix.lat) { - if (!prev_fix) { - prev_fix = fix; - } - msg = fix.speed.toFixed(1) + " km/h"; - if (!last_fstart) - last_fstart = getTime(); - last_fix = getTime(); - gps_needed = 60; - loggps(fix); - print("GPS FIX", msg); - d = calcDistance(fix, prev_fix); - if (d > 30) { - prev_fix = fix; - gps_dist += d/1000; - } - } else { - if (last_fix) - msg = "L"+ (getTime()-last_fix).toFixed(0); - else - msg = "N"+ (getTime()-gps_on).toFixed(0); - } - - d = (getTime()-last_restart); - d2 = (getTime()-last_fstart); - print("gps on, restarted ", d, gps_needed, d2, fix.lat); - if (d > gps_needed || (last_fstart && d2 > 10)) { - gpsPause(); - gps_needed = gps_needed * 1.5; - print("Pausing, next try", gps_needed); - } - } - msg += " "+gps_dist.toFixed(1)+"km"; - } else { - msg = note; - } g.drawString(msg, 10, 145); - if (is_active) { - g.drawString("act " + (cur_altitude - alt_adjust).toFixed(0), 10, 175); - } else { + + if (getTime() - last_active > 15*60) { alt_adjust = cur_altitude - rest_altitude; - g.drawString(alt_adjust.toFixed(0) + "m " + cur_temperature.toFixed(1)+"C", 10, 175); + alt_adjust_mode = "h"; + msg = "H)" + alt_adjust.toFixed(0) + "m"; + } else { + msg = alt_adjust_mode+")"+(cur_altitude - alt_adjust).toFixed(0) + "m"; } + msg = msg + " " + cur_temperature.toFixed(1)+"C"; + if (cur_mark) { + msg = markHandle(); + } + g.drawString(msg, 10, 175); + + if (disp_mode == 1) { + g.drawString(debug, 10, 45); + g.drawString(debug2, 10, 65); + g.drawString(debug3, 10, 85); + } + queueDraw(); } - function draw_all() { g.setColor(0, 0, 0); g.fillRect(0, 0, W, H); @@ -394,14 +592,13 @@ function draw_all() { g.setFont('Vector', 22); g.drawString(now.getDate()+"."+(now.getMonth()+1)+" "+now.getDay(), 3, 60); - g.drawString(msg, 3, 80); + g.drawString("(message here)", 3, 80); g.drawString("S" + step + " B" + Math.round(bat/10) + (Bangle.isCharging()?"c":""), 3, 100); g.drawString("A" + Math.round(alt) + " T" + Math.round(temp), 3, 120); g.drawString("C" + Math.round(co.heading) + " B" + bpm, 3, 140); queueDraw(); } - function accelTask() { tm = 100; acc = Bangle.getAccel(); @@ -424,7 +621,6 @@ function accelTask() { setTimeout(accelTask, tm); } - function buzzTask() { if (buzz != "") { now = buzz[0]; @@ -442,9 +638,8 @@ function buzzTask() { setTimeout(buzzTask, 6*dot); } else print("Unknown character -- ", now, buzz); } else - setTimeout(buzzTask, 60000); + setTimeout(buzzTask, 1000); } - function aliveTask() { function cmp(s) { let d = acc[s] - last_acc[s]; @@ -456,6 +651,7 @@ function aliveTask() { if (cmp("x") || cmp("y") || cmp("z")) { print("active"); is_active = true; + last_active = getTime(); } last_acc = acc; @@ -476,14 +672,15 @@ function queueDraw() { }, next - (Date.now() % next)); } - function start() { Bangle.on("drag", touchHandler); if (0) Bangle.on("accel", accelHandler); - if (0) { + if (1) { Bangle.setCompassPower(1, "sixths"); Bangle.setBarometerPower(1, "sixths"); + } + if (0) { Bangle.setHRMPower(1, "sixths"); Bangle.setGPSPower(1, "sixths"); Bangle.on("HRM", (hrm) => { bpm = hrm.bpm; } ); @@ -500,9 +697,14 @@ function start() { } g.reset(); -Bangle.setUI(); +Bangle.setUI({ + mode : "clock" +}); Bangle.loadWidgets(); Bangle.drawWidgets(); let logfile = require("Storage").open("sixths.egt", "a"); -start(); +if (0) { + testBearing(); +} else + start(); diff --git a/apps/sixths/metadata.json b/apps/sixths/metadata.json index ece88348d..7580623dc 100644 --- a/apps/sixths/metadata.json +++ b/apps/sixths/metadata.json @@ -5,7 +5,8 @@ "icon": "app.png", "readme": "README.md", "supports" : ["BANGLEJS2"], - "tags": "", + "type": "clock", + "tags": "clock", "storage": [ {"name":"sixths.app.js","url":"app.js"}, {"name":"sixths.img","url":"app-icon.js","evaluate":true}