mirror of https://github.com/espruino/BangleApps
Merge branch 'master' of github.com:espruino/BangleApps
commit
65d4b410ff
|
@ -1,2 +1,3 @@
|
|||
0.01: Initial Creation
|
||||
0.02: Fixed some sleep bugs. Added a sleep mode toggle
|
||||
0.02: Fixed some sleep bugs. Added a sleep mode toggle
|
||||
0.03: Reduce busy-loop and code
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"id": "chimer",
|
||||
"name": "Chimer",
|
||||
"version": "0.02",
|
||||
"description": "A fork of Hour Chime that adds extra features such as: \n - Buzz or beep on every 60, 30 or 15 minutes. \n - Reapeat Chime up to 3 times \n - Set hours to disable chime",
|
||||
"version": "0.03",
|
||||
"description": "A fork of Hour Chime that adds extra features such as: \n - Buzz or beep on every 60, 30 or 15 minutes. \n - Repeat Chime up to 3 times \n - Set hours to disable chime",
|
||||
"icon": "widget.png",
|
||||
"type": "widget",
|
||||
"tags": "widget",
|
||||
|
|
|
@ -16,16 +16,10 @@
|
|||
|
||||
var settings = readSettings();
|
||||
|
||||
function sleep(milliseconds) {
|
||||
const date = Date.now();
|
||||
let currentDate = null;
|
||||
do {
|
||||
currentDate = Date.now();
|
||||
} while (currentDate - date < milliseconds);
|
||||
}
|
||||
|
||||
function chime() {
|
||||
for (var i = 0; i < settings.repeat; i++) {
|
||||
let count = settings.repeat;
|
||||
|
||||
const chime1 = () => {
|
||||
if (settings.type === 1) {
|
||||
Bangle.buzz(100);
|
||||
} else if (settings.type === 2) {
|
||||
|
@ -33,8 +27,24 @@
|
|||
} else {
|
||||
return;
|
||||
}
|
||||
sleep(150);
|
||||
}
|
||||
if (--count > 0)
|
||||
setTimeout(chime1, 150);
|
||||
};
|
||||
|
||||
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();
|
||||
|
@ -45,88 +55,41 @@
|
|||
m = now.getMinutes(),
|
||||
s = now.getSeconds(),
|
||||
ms = now.getMilliseconds();
|
||||
if (
|
||||
(settings.sleep && h > settings.end) ||
|
||||
(settings.sleep && h >= settings.end && m !== 0) ||
|
||||
(settings.sleep && h < settings.start)
|
||||
if (settings.sleep && (
|
||||
h > settings.end ||
|
||||
(h >= settings.end && m !== 0) ||
|
||||
h < settings.start)
|
||||
) {
|
||||
var mLeft = 60 - m,
|
||||
sLeft = mLeft * 60 - s,
|
||||
msLeft = sLeft * 1000 - ms;
|
||||
setTimeout(check, msLeft);
|
||||
queueNextCheckMins(60);
|
||||
return;
|
||||
}
|
||||
if (settings.freq === 1) {
|
||||
if ((m !== lastMinute && m === 0) || (m !== lastMinute && m === 30))
|
||||
chime();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
// check again in 30 minutes
|
||||
switch (true) {
|
||||
case m / 30 >= 1:
|
||||
var mLeft = 30 - (m - 30),
|
||||
sLeft = mLeft * 60 - s,
|
||||
msLeft = sLeft * 1000 - ms;
|
||||
break;
|
||||
case m / 30 < 1:
|
||||
var mLeft = 30 - m,
|
||||
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();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
// check again in 15 minutes
|
||||
switch (true) {
|
||||
case m / 15 >= 3:
|
||||
var mLeft = 15 - (m - 45),
|
||||
sLeft = mLeft * 60 - s,
|
||||
msLeft = sLeft * 1000 - ms;
|
||||
break;
|
||||
case m / 15 >= 2:
|
||||
var mLeft = 15 - (m - 30),
|
||||
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();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
// check again in 1 minute
|
||||
|
||||
var mLeft = 1,
|
||||
sLeft = mLeft * 60 - s,
|
||||
msLeft = sLeft * 1000 - ms;
|
||||
setTimeout(check, msLeft);
|
||||
} else {
|
||||
if (h !== lastHour && m === 0) chime();
|
||||
lastHour = h;
|
||||
// check again in 60 minutes
|
||||
var mLeft = 60 - m,
|
||||
sLeft = mLeft * 60 - s,
|
||||
msLeft = sLeft * 1000 - ms;
|
||||
setTimeout(check, msLeft);
|
||||
switch (settings.freq) {
|
||||
case 1:
|
||||
if (m !== lastMinute && m % 30 === 0)
|
||||
chime();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
queueNextCheckMins(30);
|
||||
break;
|
||||
case 2:
|
||||
if (m !== lastMinute && m % 15 === 0)
|
||||
chime();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
queueNextCheckMins(15);
|
||||
break;
|
||||
case 3:
|
||||
// unreachable - not available in settings
|
||||
if (m !== lastMinute) chime();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
queueNextCheckMins(1);
|
||||
break;
|
||||
default:
|
||||
if (h !== lastHour && m === 0) chime();
|
||||
lastHour = h;
|
||||
queueNextCheckMins(60);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue