typescript: handle typings which now distinguish setTimeout/Interval

master
Rob Pilling 2023-06-13 23:21:26 +01:00
parent 9c74797752
commit d848d40a25
4 changed files with 6 additions and 6 deletions

View File

@ -686,7 +686,7 @@ const setIntervals = (
const redrawInterval = setInterval(redraw, /*replaced*/1000); const redrawInterval = setInterval(redraw, /*replaced*/1000);
Bangle.on("lock", locked => setIntervals(locked)); Bangle.on("lock", locked => setIntervals(locked));
let bleInterval: undefined | number; let bleInterval: undefined | IntervalId;
NRF.on("connect", () => setIntervals(undefined, true)); NRF.on("connect", () => setIntervals(undefined, true));
NRF.on("disconnect", () => setIntervals(undefined, false)); NRF.on("disconnect", () => setIntervals(undefined, false));

View File

@ -1,6 +1,6 @@
(() => { (() => {
let durationOnPause = "---"; let durationOnPause = "---";
let redrawInterval: number | undefined; let redrawInterval: IntervalId | undefined;
let startTime: number | undefined; let startTime: number | undefined;
let showMillis = true; let showMillis = true;
const milliTime = 60; const milliTime = 60;
@ -16,7 +16,7 @@
if (startTime) { if (startTime) {
if (showMillis && Date.now() - startTime > milliTime * 1000) { if (showMillis && Date.now() - startTime > milliTime * 1000) {
showMillis = false; showMillis = false;
changeInterval(redrawInterval, 1000); changeInterval(redrawInterval!, 1000);
} }
} else { } else {
unqueueRedraw(); unqueueRedraw();

View File

@ -1,7 +1,7 @@
const app = "drained"; const app = "drained";
// from boot.js // from boot.js
declare var drainedInterval: number | undefined; declare var drainedInterval: IntervalId | undefined;
if(typeof drainedInterval !== "undefined") if(typeof drainedInterval !== "undefined")
drainedInterval = clearInterval(drainedInterval) as undefined; drainedInterval = clearInterval(drainedInterval) as undefined;
@ -41,7 +41,7 @@ Bangle.setOptions({
}); });
// clock // clock
let nextDraw: number | undefined; let nextDraw: TimeoutId | undefined;
const draw = () => { const draw = () => {
const x = g.getWidth() / 2; const x = g.getWidth() / 2;
const y = g.getHeight() / 2 - 48; const y = g.getHeight() / 2 - 48;

View File

@ -10,7 +10,7 @@
let anchor = {x:0,y:0}; let anchor = {x:0,y:0};
let start = {x:0,y:0}; let start = {x:0,y:0};
let dragging = false; let dragging = false;
let activeTimeout: number | undefined; let activeTimeout: TimeoutId | undefined;
let waitForRelease = true; let waitForRelease = true;
const onSwipe = ((_lr, ud) => { const onSwipe = ((_lr, ud) => {