Updated formatting

master
aaronrolls 2022-08-24 09:15:18 +00:00
parent 04819fcfe1
commit 86b5c10937
3 changed files with 153 additions and 139 deletions

View File

@ -2,8 +2,6 @@
* @param {function} back Use back() to return to settings menu
*/
(function (back) {
// default to buzzing
var FILE = "chimer.json";
@ -11,60 +9,63 @@
const chimes = ["Off", "Buzz", "Beep", "Both"];
const frequency = ["60 min", "30 min", "15 min", "1 min"];
var showMainMenu = () => {
E.showMenu({
"": {"title": "Chimer"},
"": { title: "Chimer" },
"< Back": () => back(),
"Chime Type": {
value: settings.type,
min: 0, max: 2, // both is just silly
format: v => chimes[v],
onchange: v => {
min: 0,
max: 2, // both is just silly
format: (v) => chimes[v],
onchange: (v) => {
settings.type = v;
writeSettings(settings);
},
},
"Frequency": {
Frequency: {
value: settings.freq,
min: 0, max: 2,
format: v => frequency[v],
onchange: v => {
min: 0,
max: 2,
format: (v) => frequency[v],
onchange: (v) => {
settings.freq = v;
writeSettings(settings);
}
},
"Repetition": {
},
Repetition: {
value: settings.repeat,
min: 1, max: 3,
format: v => v,
onchange: v => {
min: 1,
max: 3,
format: (v) => v,
onchange: (v) => {
settings.repeat = v;
writeSettings(settings);
}
},
},
"Start Hour": {
value: settings.start,
min: 1, max: 24,
format: v => v,
onchange: v => {
min: 1,
max: 24,
format: (v) => v,
onchange: (v) => {
settings.start = v;
writeSettings(settings);
}
},
},
"End Hour": {
value: settings.end,
min: 1, max: 24,
format: v => v,
onchange: v => {
min: 1,
max: 24,
format: (v) => v,
onchange: (v) => {
settings.end = v;
writeSettings(settings);
}
}
},
},
});
};
var readSettings = () => {
var settings = require("Storage").readJSON(FILE, 1) || {
type: 1,
@ -82,5 +83,4 @@ var showMainMenu = () => {
settings = readSettings();
showMainMenu();
})
});

View File

@ -34,51 +34,67 @@ function sleep(milliseconds) {
}
sleep(100);
}
};
}
let lastHour = (new Date()).getHours();
let lastMinute = (new Date()).getMinutes(); // don't chime when (re)loaded at a whole hour
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(),
s = now.getSeconds(), ms = now.getMilliseconds();
h = now.getHours(),
m = now.getMinutes(),
s = now.getSeconds(),
ms = now.getMilliseconds();
if (h > settings.end || h < settings.start) {
var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
var mLeft = 60 - m,
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
setTimeout(check, msLeft);
return;
}
if (settings.freq === 1) {
if (m !== lastMinute && 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):
var mLeft = 30-(m-30), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
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;
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===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):
var mLeft = 15-(m-45), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
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;
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;
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;
case m / 15 < 1:
var mLeft = 15 - m,
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
break;
}
setTimeout(check, msLeft);
@ -88,22 +104,20 @@ function sleep(milliseconds) {
lastMinute = m;
// check again in 1 minute
var mLeft = 1, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
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;
var mLeft = 60 - m,
sLeft = mLeft * 60 - s,
msLeft = sLeft * 1000 - ms;
setTimeout(check, msLeft);
}
}
};
check();
})
();
})();