Fixed bug where watch would chime on reload if minute matched one of its parameters
parent
0ae3a550ad
commit
b8895a028b
|
|
@ -2,7 +2,7 @@
|
|||
"id": "chimer",
|
||||
"name": "Chimer",
|
||||
"version": "0.01",
|
||||
"description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 12",
|
||||
"description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 13",
|
||||
"icon": "widget.png",
|
||||
"type": "widget",
|
||||
"tags": "widget",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
var readSettings = () => {
|
||||
var settings = require("Storage").readJSON(FILE, 1) || {
|
||||
type: 1,
|
||||
freq: 2,
|
||||
freq: 0,
|
||||
repeat: 1,
|
||||
start: 6,
|
||||
end: 22,
|
||||
|
|
@ -36,7 +36,8 @@ function sleep(milliseconds) {
|
|||
}
|
||||
};
|
||||
|
||||
//let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour
|
||||
let lastHour = (new Date()).getHours();
|
||||
let lastMinute = (new Date()).getMinutes(); // don't chime when (re)loaded at a whole hour
|
||||
function check() {
|
||||
const now = new Date(),
|
||||
h = now.getHours(), m = now.getMinutes(),
|
||||
|
|
@ -47,8 +48,9 @@ function sleep(milliseconds) {
|
|||
return;
|
||||
}
|
||||
if (settings.freq === 1){
|
||||
if (m===0 || m===30) chime();
|
||||
if (m !== lastMinute && m===0 || m===30) chime();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
// check again in 30 minutes
|
||||
switch (true){
|
||||
case (m/30 >= 1):
|
||||
|
|
@ -61,8 +63,9 @@ function sleep(milliseconds) {
|
|||
setTimeout(check, msLeft);
|
||||
|
||||
}else if (settings.freq === 2){
|
||||
if (m===0 || m===15 || m===30 || m===45) chime();
|
||||
if (m !== lastMinute && m===0 || m===15 || m===30 || m===45) chime();
|
||||
lastHour = h;
|
||||
lastMinute = m;
|
||||
// check again in 15 minutes
|
||||
switch (true){
|
||||
case (m/15 >= 3):
|
||||
|
|
@ -88,7 +91,7 @@ function sleep(milliseconds) {
|
|||
setTimeout(check, msLeft);
|
||||
|
||||
}else{
|
||||
if (m===0) chime();
|
||||
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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue