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

pace: fix split calcs 

i.e. time/distance mix-up
master
Rob Pilling 2024-10-10 18:02:33 +01:00
parent 3ef013d002
commit 160093a07b
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apps/pace/app.ts
View File

@ -14,7 +14,15 @@ const exs = require("exstats").getStats(
let drawTimeout: TimeoutId | undefined; let drawTimeout: TimeoutId | undefined;
const splits: number[] = []; // times type Dist = number & { brand: 'dist' };
type Time = number & { brand: 'time' };
type Split = {
dist: Dist,
time: Time,
};
const splits: Split[] = []; // times
let splitOffset = 0, splitOffsetPx = 0; let splitOffset = 0, splitOffsetPx = 0;
const GPS_TIMEOUT_MS = 30000; const GPS_TIMEOUT_MS = 30000;
@ -55,9 +63,9 @@ const layout = new Layout({
lazy: true lazy: true
}); });
const calculatePace = (time: number, dist: number) => { const calculatePace = (split: Split) => {
if (dist === 0) return 0; if (split.dist === 0) return 0;
return time / dist / 1000 / 60; return split.time / split.dist / 1000 / 60;
}; };
const draw = () => { const draw = () => {
@ -103,7 +111,7 @@ const drawSplits = () => {
const w = g.getWidth(); const w = g.getWidth();
const h = g.getHeight(); const h = g.getHeight();
const max = splits.reduce((a, x) => Math.max(a, x), 0); const max = splits.reduce((a, s) => Math.max(a, s.time), 0);
g.setFont("6x8", 2).setFontAlign(-1, -1); g.setFont("6x8", 2).setFontAlign(-1, -1);
@ -115,10 +123,10 @@ const drawSplits = () => {
const y = Bangle.appRect.y + i * (barSize + barSpacing) + barSpacing / 2; const y = Bangle.appRect.y + i * (barSize + barSpacing) + barSpacing / 2;
if (y > h) break; if (y > h) break;
const size = w * split / max; // Scale bar height based on pace const size = w * split.time / max; // Scale bar height based on pace
g.setColor("#00f").fillRect(0, y, size, y + barSize); g.setColor("#00f").fillRect(0, y, size, y + barSize);
const splitPace = calculatePace(split, 1); // Pace per km const splitPace = calculatePace(split); // Pace per km
drawSplit(i, y, splitPace); drawSplit(i, y, splitPace);
} }
@ -163,15 +171,15 @@ const onButton = () => {
exs.start(); // aka reset exs.start(); // aka reset
exs.stats.dist.on("notify", (dist) => { exs.stats.dist.on("notify", (dist) => {
const prev = splits[splits.length - 1] || 0; const prevDist = splits[splits.length - 1]?.dist ?? 0;
const totalDist = dist.getValue(); const totalDist = dist.getValue();
let thisSplit = totalDist - prev; let thisSplit = totalDist - prevDist;
const prevTime = splits.reduce((a, b) => a + b, 0); const prevTime = splits.reduce((t, s) => t + s.time, 0);
let time = exs.state.duration - prevTime; let thisTime = exs.state.duration - prevTime;
while(thisSplit > 0) { while(thisSplit > 1000) {
splits.push(time); splits.push({ dist: thisSplit as Dist, time: thisTime as Time });
time = 0; // if we've jumped more than 1k, credit the time to the first split thisTime = 0; // if we've jumped more than 1k, credit the time to the first split
thisSplit -= 1000; thisSplit -= 1000;
} }
}); });