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

sixths: Refactor info printing, so we can scroll down less important stuff

master
Pavel Machek 2024-07-20 22:39:31 +02:00
parent 19e9fa8361
commit 661bf324fd
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,18 +542,6 @@ function draw() {
g.setColor(0.25, 1, 1); g.setColor(0.25, 1, 1);
g.fillPoly([ W/2, 24, W, 80, 0, 80 ]); g.fillPoly([ W/2, 24, W, 80, 0, 80 ]);
} }
let msg = "";
if (gps_on) {
msg = gpsHandle();
} else {
let o = Bangle.getOptions();
let pr = o.seaLevelPressure;
if (pr)
msg = pr.toFixed(1) + "hPa";
if (note != "") {
msg = note;
}
}
drawBackground(); drawBackground();
let now = new Date(); let now = new Date();
@ -564,16 +552,21 @@ function draw() {
//let km = 0.001 * 0.719 * Bangle.getHealthStatus("day").steps; //let km = 0.001 * 0.719 * Bangle.getHealthStatus("day").steps;
g.setFontAlign(-1, 1);
// 33 still fits // 33 still fits
g.setFont('Vector', 30); g.setFont('Vector', 30);
const weekday = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]; const weekday = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
msg = weekday[now.getDay()] + "" + now.getDate() + ". "
+ fmtSteps(Bangle.getHealthStatus("day").steps) + "\n";
g.drawString(weekday[now.getDay()] + "" + now.getDate() + ". " if (gps_on) {
+ fmtSteps(Bangle.getHealthStatus("day").steps), 10, 115); msg += gpsHandle() + "\n";
}
g.drawString(msg, 10, 145);
if (cur_mark) {
msg += markHandle() + "\n";
}
if (getTime() - last_active > 15*60) { if (getTime() - last_active > 15*60) {
let alt_adjust = cur_altitude - rest_altitude; let alt_adjust = cur_altitude - rest_altitude;
@ -589,17 +582,27 @@ function draw() {
Bangle.setOptions(o); Bangle.setOptions(o);
} }
let pr = o.seaLevelPressure; let pr = o.seaLevelPressure;
msg = "emu?";
if (pr) if (pr)
msg = pr.toFixed(1) + "hPa"; msg += pr.toFixed(1) + "hPa";
else
msg += "emu?";
} else { } else {
msg = fmtAlt(cur_altitude); msg += fmtAlt(cur_altitude);
} }
msg = msg + " " + cur_temperature.toFixed(1)+icon_c; msg = msg + " " + cur_temperature.toFixed(1)+icon_c + "\n";
if (cur_mark) {
msg = markHandle(); if (note != "")
msg += note + "\n";
{
let o = Bangle.getOptions();
let pr = o.seaLevelPressure;
if (pr)
msg += pr.toFixed(1) + "hPa\n";
} }
g.drawString(msg, 10, 175); g.setFontAlign(-1, -1);
g.drawString(msg, 10, 85);
if (disp_mode == 1) { if (disp_mode == 1) {
g.drawString(debug, 10, 45); g.drawString(debug, 10, 45);