FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

chimer: simplify logic for next chime

pull/2799/head
Rob Pilling 2023-06-07 17:29:12 +01:00
parent 0834cc358f
commit a82163fc88
1 changed files with 45 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
apps/chimer/widget.js
View File

@ -34,6 +34,19 @@
chime1(); chime1();
} }
function queueNextCheckMins(mins) {
const now = new Date(),
m = now.getMinutes(),
s = now.getSeconds(),
ms = now.getMilliseconds();
const mLeft = mins - (m + mins * 2) % mins,
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
setTimeout(check, msLeft);
}
let lastHour = new Date().getHours(); let lastHour = new Date().getHours();
let lastMinute = new Date().getMinutes(); // don't chime when (re)loaded at a whole hour let lastMinute = new Date().getMinutes(); // don't chime when (re)loaded at a whole hour
function check() { function check() {
@ -42,88 +55,41 @@
m = now.getMinutes(), m = now.getMinutes(),
s = now.getSeconds(), s = now.getSeconds(),
ms = now.getMilliseconds(); ms = now.getMilliseconds();
if ( if (settings.sleep && (
(settings.sleep && h > settings.end) || h > settings.end ||
(settings.sleep && h >= settings.end && m !== 0) || (h >= settings.end && m !== 0) ||
(settings.sleep && h < settings.start) h < settings.start)
) { ) {
var mLeft = 60 - m, queueNextCheckMins(60);
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
setTimeout(check, msLeft);
return; return;
} }
if (settings.freq === 1) { switch (settings.freq) {
if ((m !== lastMinute && m === 0) || (m !== lastMinute && m === 30)) case 1:
if (m !== lastMinute && m % 30 === 0)
chime(); chime();
lastHour = h; lastHour = h;
lastMinute = m; lastMinute = m;
// check again in 30 minutes queueNextCheckMins(30);
switch (true) {
case m / 30 >= 1:
var mLeft = 30 - (m - 30),
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
break; break;
case m / 30 < 1: case 2:
var mLeft = 30 - m, if (m !== lastMinute && m % 15 === 0)
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
break;
}
setTimeout(check, msLeft);
} else if (settings.freq === 2) {
if (
(m !== lastMinute && m === 0) ||
(m !== lastMinute && m === 15) ||
(m !== lastMinute && m === 30) ||
(m !== lastMinute && m === 45)
)
chime(); chime();
lastHour = h; lastHour = h;
lastMinute = m; lastMinute = m;
// check again in 15 minutes queueNextCheckMins(15);
switch (true) {
case m / 15 >= 3:
var mLeft = 15 - (m - 45),
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
break; break;
case m / 15 >= 2: case 3:
var mLeft = 15 - (m - 30), // unreachable - not available in settings
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
break;
case m / 15 >= 1:
var mLeft = 15 - (m - 15),
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
break;
case m / 15 < 1:
var mLeft = 15 - m,
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
break;
}
setTimeout(check, msLeft);
} else if (settings.freq === 3) {
if (m !== lastMinute) chime(); if (m !== lastMinute) chime();
lastHour = h; lastHour = h;
lastMinute = m; lastMinute = m;
// check again in 1 minute queueNextCheckMins(1);
break;
var mLeft = 1, default:
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
setTimeout(check, msLeft);
} else {
if (h !== lastHour && m === 0) chime(); if (h !== lastHour && m === 0) chime();
lastHour = h; lastHour = h;
// check again in 60 minutes queueNextCheckMins(60);
var mLeft = 60 - m, break;
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
setTimeout(check, msLeft);
} }
} }