Update Q Alarm

pull/868/head
qucchia 2021-10-28 16:00:43 +02:00
parent c582e8dfc1
commit 5bbe209a44
4 changed files with 7 additions and 18 deletions

View File

@ -1 +1,2 @@
0.01: First version! 0.01: First version!
0.02: Fixed alarms not working and localised days of week.

View File

@ -172,21 +172,14 @@ function showDaysMenu(alarmIndex, alarm) {
"< Back": () => showEditAlarmMenu(alarmIndex, alarm), "< Back": () => showEditAlarmMenu(alarmIndex, alarm),
}; };
[ for (let i = 0; i < 7; i++) {
"Sunday", let dayOfWeek = require("locale").dow({ getDay: () => i });
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday",
].forEach((dayOfWeek, i) => {
menu[dayOfWeek] = { menu[dayOfWeek] = {
value: alarm.daysOfWeek[i], value: alarm.daysOfWeek[i],
format: (v) => (v ? "Yes" : "No"), format: (v) => (v ? "Yes" : "No"),
onchange: (v) => (alarm.daysOfWeek[i] = v), onchange: (v) => (alarm.daysOfWeek[i] = v),
}; };
}); }
return E.showMenu(menu); return E.showMenu(menu);
} }

View File

@ -1,7 +1,5 @@
// This file shows the alarm // This file shows the alarm
print("Starting alarm");
function formatTime(t) { function formatTime(t) {
let hrs = Math.floor(t / 3600000); let hrs = Math.floor(t / 3600000);
let mins = Math.round((t / 60000) % 60); let mins = Math.round((t / 60000) % 60);
@ -150,8 +148,6 @@ let active = alarms.filter(
(alarm.timer || alarm.daysOfWeek[time.getDay()]) (alarm.timer || alarm.daysOfWeek[time.getDay()])
); );
print(active);
if (active.length) { if (active.length) {
showAlarm(active.sort((a, b) => a.t - b.t)[0]); showAlarm(active.sort((a, b) => a.t - b.t)[0]);
} }

View File

@ -29,13 +29,12 @@ let nextAlarms = (require("Storage").readJSON("qalarm.json", 1) || [])
.sort((a, b) => a.t - b.t); .sort((a, b) => a.t - b.t);
if (nextAlarms[0]) { if (nextAlarms[0]) {
print("Found alarm, scheduling...", nextAlarms[0].t - t);
setTimeout(() => { setTimeout(() => {
load("qalarm.js");
eval(require("Storage").read("qalarmcheck.js")); eval(require("Storage").read("qalarmcheck.js"));
}, 3600000 * (nextAlarms[0].t - t)); load("qalarm.js");
}, nextAlarms[0].t - t);
} else { } else {
print("No alarms found. Will re-check at midnight."); // No alarms found: will re-check at midnight
setTimeout(() => { setTimeout(() => {
eval(require("Storage").read("qalarmcheck.js")); eval(require("Storage").read("qalarmcheck.js"));
}, 86400000 - t); }, 86400000 - t);