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

Seperated drawing of steps and rings on step

master
David Volovskiy 2025-05-18 11:46:15 -04:00
parent 12ffb9bbac
commit 3f57a859ab
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
apps/daisy/app.js
View File

@ -32,6 +32,7 @@ const ringThick = 6;
let nextUpdateMs; let nextUpdateMs;
var drawingSteps = false; var drawingSteps = false;
var innerMostRing = 0; var innerMostRing = 0;
var prevStepDisplayed = 0;
var prevRing = Array(3).fill().map(() => ({ start: null, end: null, max: null })); var prevRing = Array(3).fill().map(() => ({ start: null, end: null, max: null }));
function log_debug(o) { function log_debug(o) {
@ -307,7 +308,7 @@ const infoData = {
ID_DAY: { calc: () => {var d = require("locale").dow(new Date()).toLowerCase(); return d[0].toUpperCase() + d.substring(1);} }, ID_DAY: { calc: () => {var d = require("locale").dow(new Date()).toLowerCase(); return d[0].toUpperCase() + d.substring(1);} },
ID_SR: { calc: () => 'SUNRISE ' + sunRise }, ID_SR: { calc: () => 'SUNRISE ' + sunRise },
ID_SS: { calc: () => 'SUNSET ' + sunSet }, ID_SS: { calc: () => 'SUNSET ' + sunSet },
ID_STEP: { calc: () => 'STEPS ' + getSteps() }, ID_STEP: { calc: () => {var steps = getSteps(); prevStepDisplayed = steps; return 'STEPS ' + steps;}},
ID_BATT: { calc: batteryString}, ID_BATT: { calc: batteryString},
ID_HRM: { calc: () => hrmCurrent } ID_HRM: { calc: () => hrmCurrent }
}; };
@ -533,27 +534,35 @@ function drawClock() {
drawCount++; drawCount++;
} }
function checkRedrawSteps(steps) {
var redrawText = false;
var redrawRings = false;
const minStepText = 10; // In number of steps
const minStepPctUpdate = 3; // If the current step is less percent than last updated, don't redraw the rings
if (infoMode == "ID_STEP") {
if (minStepText >= (steps - prevStepDisplayed)) {
redrawText = true;
}
}
for (let i = 0; i < settings.rings.length; i++) {
let ring = settings.rings[i];
if(ring.type == "None" || ring.ring != 'Steps') continue;
let percentChanged = 100 * ((steps - prevRing[i].end) / ring.step_target);
if(percentChanged >= minStepPctUpdate) {
redrawRings = true;
break;
}
}
return [redrawText, redrawRings];
}
function drawSteps() { function drawSteps() {
if (drawingSteps) return;
drawingSteps = true;
clearInfo(); clearInfo();
const minStepPctUpdate = 3; // If the current step less percent than last updated, don't redraw
var dims = getInfoDims(); var dims = getInfoDims();
setSmallFont(); setSmallFont();
g.setFontAlign(0,0); g.setFontAlign(0,0);
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
var steps = getSteps(); g.drawString((infoData[infoMode].calc().toUpperCase()), w/2, dims[0]);
g.drawString('STEPS ' + steps, w/2, dims[0]);
for (let i = 0; i < settings.rings.length; i++) {
let ring = settings.rings[i];
if(ring.type == "None" || ring.ring != 'Steps') continue;
var percentChanged = 100 * ((steps - prevRing[idx].end) / ring.step_target);
if(percentChanged >= minStepPctUpdate) {
drawAllRings(new Date(), 'Steps');
break;
}
}
drawingSteps = false;
} }
///////////////// GAUGE images ///////////////////////////////////// ///////////////// GAUGE images /////////////////////////////////////
@ -780,8 +789,14 @@ Bangle.on('step', s => {
} }
idle = false; idle = false;
warned = 0; warned = 0;
if (drawingSteps) return;
if (infoMode == "ID_STEP") drawSteps(); var steps = getSteps();
ret = checkRedrawSteps(steps);
if (!ret[0] && !ret[1]) return;
drawingSteps = true;
if (ret[0]) drawSteps();
if (ret[1]) drawAllRings(new Date(), 'Steps');
drawingSteps = false;
}); });
function checkIdle() { function checkIdle() {