btadv: clear approx. hrm (when disabled)

pull/2587/head
Rob Pilling 2023-02-19 21:17:05 +00:00
parent d16debab87
commit f600c61bf9
2 changed files with 16 additions and 0 deletions

View File

@ -23,6 +23,7 @@ var hrmAny;
var mag;
var btnsShown = false;
var prevBtnsShown = undefined;
var hrmAnyClear;
var settings = {
bar: false,
gps: false,
@ -132,6 +133,12 @@ var drawInfo = function (force) {
g.drawString("~".concat(hrmAny.bpm, " BPM (").concat(hrmAny.confidence, "%)"), mid, y);
y += g.getFontHeight();
drawn = true;
if (!settings.hrm && !hrmAnyClear) {
hrmAnyClear = setTimeout(function () {
hrmAny = undefined;
hrmAnyClear = undefined;
}, 10000);
}
}
if (mag) {
g.drawString("".concat(mag.x, " ").concat(mag.y, " ").concat(mag.z), mid, y);

View File

@ -88,6 +88,7 @@ let hrmAny: undefined | Hrm;
let mag: undefined | CompassData;
let btnsShown = false;
let prevBtnsShown: boolean | undefined = undefined;
let hrmAnyClear: undefined | number;
type BtAdvType<IncludeAcc = false> = "bar" | "gps" | "hrm" | "mag" | (IncludeAcc extends true ? "acc" : never);
type BtAdvMap<T, IncludeAcc = false> = { [key in BtAdvType<IncludeAcc>]: T };
@ -285,6 +286,14 @@ const drawInfo = (force?: true) => {
drawn = true;
if (!settings.hrm && !hrmAnyClear) {
// hrm is erased, but hrmAny will remain until cleared (or reset)
// if it runs via health check, we reset it here
hrmAnyClear = setTimeout(() => {
hrmAny = undefined;
hrmAnyClear = undefined;
}, 10000);
}
}
if (mag) {