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

Merge pull request #3436 from pavelmachek/m_23_sixths4 (and tweak lints)

pull/3446/head
Rob Pilling 2024-05-30 22:21:57 +01:00
parent 456cf7f121 c222676501
commit 064d9ceb71
5 changed files with 115 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/lint_exemptions.js
View File

@ -197,9 +197,8 @@ module.exports = {
]
},
"apps/sixths/sixths.app.js": {
"hash": "b4572a529b31a5edcbd6ca5843b91c54abcbf75b2a28e90bd33751f7d6a3ebcd",
"hash": "2a4676828bdf78df052df402de34e6f1abd1c847ebe0d193fc789cd6e9dd0e5c",
"rules": [
"no-unused-vars",
"no-undef"
]
},
@ -1161,12 +1160,6 @@ module.exports = {
"no-undef"
]
},
"apps/contacts/contacts.app.js": {
"hash": "f105adae91ef5bb79266bd20b8f1f5aaebe9863853c714d1f2b22c97d9ff7773",
"rules": [
"no-undef"
]
},
"apps/calendar/settings.js": {
"hash": "9f05366b91d0293ed965d8de019bfd044f96683542b86ebabaa3c8d3cc3ad3a7",
"rules": [

3
apps/sixths/ChangeLog
View File

@ -1,3 +1,4 @@
0.01: attempt to import
0.02: better GPS support, adding altitude and temperature support
0.03: Minor code improvements
0.03: minor code improvements
0.04: make height auto-calibration useful and slow ticks to save power

2
apps/sixths/metadata.json
View File

@ -1,6 +1,6 @@
{ "id": "sixths",
"name": "Sixth sense",
"version": "0.03",
"version": "0.04",
"description": "Clock for outdoor use with GPS support",
"icon": "app.png",
"readme": "README.md",

193
apps/sixths/sixths.app.js
View File

@ -1,4 +1,5 @@
// Sixth sense
/* eslint-disable no-unused-vars */
// Options you'll want to edit
const rest_altitude = 354;
@ -7,13 +8,13 @@ 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;
temp = 0; alt = 0; bpm = 0;
var cx = 100, cy = 105, sc = 70,
temp = 0, alt = 0, bpm = 0;
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)";
debug = "v1119", 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
@ -30,29 +31,29 @@ var gps_dist = 0;
var mark_heading = -1;
// Is the human present?
var is_active = false, last_active = getTime();
var is_active = false, last_active = getTime() - 14*60, last_unlocked = getTime();
var draw_dot = false;
var is_level = false;
// For altitude handling.
var cur_altitude = 0;
var cur_temperature = 0, alt_adjust = 0;
var alt_adjust_mode = "";
var cur_temperature = 0;
// Marks
var cur_mark = null;
// Icons
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";
var 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";
var 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";
var 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";
var 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";
var 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";
function toMorse(x) {
r = "";
var r = "";
for (var i = 0; i < x.length; i++) {
c = x[i];
var c = x[i];
if (c == " ") {
r += " ";
continue;
@ -61,8 +62,15 @@ function toMorse(x) {
}
return r;
}
function doBuzz(s) {
if (buzz == "") {
buzz = s;
buzzTask();
} else
buzz += s;
}
function aload(s) {
buzz += toMorse(' E');
doBuzz(toMorse(' E'));
load(s);
}
function gpsRestart() {
@ -102,7 +110,7 @@ function fmtTimeDiff(d) {
function gpsHandleFix(fix) {
if (!prev_fix) {
show("GPS acquired", 10);
buzz += " .";
doBuzz(" .");
prev_fix = fix;
}
if (0) {
@ -110,18 +118,15 @@ function gpsHandleFix(fix) {
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();
var n1 = now1.getMinutes() * 60 + now1.getSeconds();
var n2 = now2.getMinutes() * 60 + now2.getSeconds();
debug2 = "te "+(n2-n1)+"s";
}
loggps(fix);
d = calcDistance(fix, prev_fix);
var d = calcDistance(fix, prev_fix);
if (d > 30) {
prev_fix = fix;
gps_dist += d/1000;
@ -130,7 +135,7 @@ function gpsHandleFix(fix) {
function gpsHandle() {
let msg = "";
if (!last_restart) {
d = (getTime()-last_pause);
var d = (getTime()-last_pause);
if (last_fix)
msg = "PL"+ fmtTimeDiff(getTime()-last_fix);
else
@ -141,12 +146,12 @@ function gpsHandle() {
gpsRestart();
}
} else {
fix = Bangle.getGPSFix();
var fix = Bangle.getGPSFix();
if (fix && fix.fix && fix.lat) {
gpsHandleFix(fix);
msg = fix.speed.toFixed(1) + icon_kph;
print("GPS FIX", msg);
if (!last_fstart)
last_fstart = getTime();
last_fix = getTime();
@ -162,10 +167,10 @@ function gpsHandle() {
}
}
d = (getTime()-last_restart);
d2 = (getTime()-last_fstart);
var d = (getTime()-last_restart);
var d2 = (getTime()-last_fstart);
print("gps on, restarted ", d, gps_needed, d2, fix.lat);
if (getTime() > gps_speed_limit &&
if (getTime() > gps_speed_limit &&
(d > gps_needed || (last_fstart && d2 > 10))) {
gpsPause();
gps_needed = gps_needed * 1.5;
@ -187,7 +192,7 @@ function markNew() {
}
function markHandle() {
let m = cur_mark;
msg = m.name + ">" + fmtTimeDiff(getTime()- m.time);
var msg = m.name + ">" + fmtTimeDiff(getTime()- m.time);
if (m.fix && m.fix.fix) {
let s = fmtDist(calcDistance(m.fix, prev_fix)/1000) + icon_km;
msg += " " + s;
@ -201,7 +206,7 @@ function markHandle() {
}
function entryDone() {
show(":" + in_str);
buzz += " .";
doBuzz(" .");
switch (mode) {
case 1: logstamp(">" + in_str); break;
case 2: cur_mark.name = in_str; break;
@ -227,18 +232,18 @@ function inputHandler(s) {
switch(s) {
case 'B':
s = ' B';
bat = E.getBattery();
var bat = E.getBattery();
if (bat > 45)
s += 'E';
else
s = s+(bat/5);
buzz += toMorse(s);
doBuzz(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;
disp_mode += 1;
if (disp_mode == 2) {
disp_mode = 0;
}
@ -250,13 +255,13 @@ function inputHandler(s) {
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();
var d = new Date();
s += d.getHours() % 10;
s += add0(d.getMinutes());
buzz += toMorse(s);
doBuzz(toMorse(s));
break;
case 'R': aload("run.app.js"); break;
case 'Y': buzz += " ."; Bangle.resetCompass(); break;
case 'Y': doBuzz(buzz); Bangle.resetCompass(); break;
}
}
const morseDict = {
@ -352,7 +357,7 @@ function touchHandler(d) {
if (x > W/2 && y > H/2 && l != "-d") {
inm = inm + "-";
l = "-d";
}
}
//print(inm, "drag:", d);
}
@ -373,9 +378,9 @@ function loggps(fix) {
}
function hourly() {
print("hourly");
s = ' T';
var s = ' T';
if (is_active)
buzz += toMorse(s);
doBuzz(toMorse(s));
logstamp("");
}
function show(msg, timeout) {
@ -383,11 +388,11 @@ function show(msg, timeout) {
}
function fivemin() {
print("fivemin");
s = ' B';
bat = E.getBattery();
var s = ' B';
var bat = E.getBattery();
if (bat < 25) {
if (is_active)
buzz += toMorse(s);
doBuzz(toMorse(s));
show("Bat "+bat+"%", 60);
}
try {
@ -397,7 +402,7 @@ function fivemin() {
} catch (e) {
print("Altimeter error", e);
}
}
function every(now) {
if ((mode > 0) && (getTime() - mode_time > 10)) {
@ -465,7 +470,7 @@ function drawDot(h, d, s) {
g.fillCircle(x,y, 10);
}
function drawBackground() {
acc = Bangle.getAccel();
var acc = Bangle.getAccel();
is_level = (acc.z < -0.95);
if (is_level) {
let obj = Bangle.getCompass();
@ -486,12 +491,23 @@ function drawBackground() {
}
}
function drawTime(now) {
if (disp_mode == 0)
if (disp_mode == 0)
g.setFont('Vector', 60);
else
g.setFont('Vector', 26);
g.setFont('Vector', 26);
g.setFontAlign(1, 1);
g.drawString(now.getHours() + ":" + add0(now.getMinutes()), W, 90);
draw_dot = !draw_dot;
let dot = ":";
if (!draw_dot)
dot = ".";
g.drawString(now.getHours() + dot + add0(now.getMinutes()), W, 90);
}
function adjPressure(a) {
var o = Bangle.getOptions();
print(o);
o.seaLevelPressure = o.seaLevelPressure * m + a;
Bangle.setOptions(o);
var avr = [];
}
function draw() {
if (disp_mode == 2) {
@ -530,26 +546,36 @@ function draw() {
+ fmtSteps(Bangle.getHealthStatus("day").steps), 10, 115);
g.drawString(msg, 10, 145);
if (getTime() - last_active > 15*60) {
alt_adjust = cur_altitude - rest_altitude;
alt_adjust_mode = "h";
msg = "H)" + fmtAlt(alt_adjust);
let alt_adjust = cur_altitude - rest_altitude;
let abs = Math.abs(alt_adjust);
print("adj", alt_adjust);
var 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";
} else {
msg = alt_adjust_mode+")"+fmtAlt(cur_altitude - alt_adjust);
msg = fmtAlt(cur_altitude);
}
msg = msg + " " + cur_temperature.toFixed(1)+icon_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() {
@ -562,16 +588,16 @@ function draw_all() {
let now = new Date();
g.drawString(now.getHours() + ":" + add0(now.getMinutes()) + ":" + add0(now.getSeconds()), 10, 40);
acc = Bangle.getAccel();
var acc = Bangle.getAccel();
let ax = 0 + acc.x, ay = 0.75 + acc.y, az = 0.75 + acc.y;
let diff = ax * ax + ay * ay + az * az;
diff = diff * 3;
if (diff > 1)
diff = 1;
co = Bangle.getCompass();
step = Bangle.getStepCount();
bat = E.getBattery();
var co = Bangle.getCompass();
var step = Bangle.getStepCount();
var bat = E.getBattery();
Bangle.getPressure().then((x) => { alt = x.altitude; temp = x.temperature; },
print);
@ -609,22 +635,23 @@ function draw_all() {
queueDraw();
}
function accelTask() {
tm = 100;
acc = Bangle.getAccel();
en = !Bangle.isLocked();
var tm = 100;
var acc = Bangle.getAccel();
var en = !Bangle.isLocked();
var msg;
if (en && acc.z < -0.95) {
msg = "Level";
buzz = ".-..";
doBuzz(".-..");
tm = 3000;
}
if (en && acc.x < -0.80) {
msg = "Down";
buzz = "-..";
doBuzz("-..");
tm = 3000;
}
if (en && acc.x > 0.95) {
msg = "Up";
buzz = "..-";
doBuzz("..-");
tm = 3000;
}
@ -632,9 +659,9 @@ function accelTask() {
}
function buzzTask() {
if (buzz != "") {
now = buzz[0];
var now = buzz[0];
buzz = buzz.substring(1);
dot = 100;
var dot = 100;
if (now == " ") {
setTimeout(buzzTask, 300);
} else if (now == ".") {
@ -646,8 +673,7 @@ function buzzTask() {
} else if (now == "/") {
setTimeout(buzzTask, 6*dot);
} else print("Unknown character -- ", now, buzz);
} else
setTimeout(buzzTask, 1000);
}
}
function aliveTask() {
function cmp(s) {
@ -666,26 +692,33 @@ function aliveTask() {
setTimeout(aliveTask, 60000);
}
var drawTimeout;
function lockHandler(locked) {
if (!locked) {
last_unlocked = getTime();
draw();
}
}
function queueDraw() {
if (drawTimeout) clearTimeout(drawTimeout);
if (0) // FIXME
if (getTime() - last_unlocked > 5*60)
next = 60000;
else
next = 1000;
drawTimeout = setTimeout(function() {
drawTimeout = undefined;
draw();
}, next - (Date.now() % next));
setTimeout(draw, next - (Date.now() % next));
}
function start() {
g.reset();
Bangle.setUI({
mode : "clock"
});
Bangle.loadWidgets();
Bangle.drawWidgets();
Bangle.on("drag", touchHandler);
Bangle.on("lock", lockHandler);
if (0)
Bangle.on("accel", accelHandler);
if (1) {
if (0) {
Bangle.setCompassPower(1, "sixths");
Bangle.setBarometerPower(1, "sixths");
}
@ -705,12 +738,6 @@ function start() {
}
}
g.reset();
Bangle.setUI({
mode : "clock"
});
Bangle.loadWidgets();
Bangle.drawWidgets();
let logfile = require("Storage").open("sixths.egt", "a");
if (0) {

1
package.json
View File

@ -18,6 +18,7 @@
"lint-apps": "node bin/sync-lint-exemptions.mjs && eslint ./apps",
"lint-modules": "eslint ./modules",
"test": "node bin/sanitycheck.js && npm run lint-apps && npm run lint-modules",
"fix": "eslint --fix ./apps ./modules",
"update-local-apps": "./bin/create_apps_json.sh apps.local.json",
"local": "npm-watch & npx http-server -a localhost -c-1",
"start": "npx http-server -c-1"