sched: prevent timers from firing immediately

master
Rob Pilling 2025-04-17 18:23:38 +01:00
parent 0a67619541
commit 491d36e73a
3 changed files with 6 additions and 2 deletions

View File

@ -32,3 +32,4 @@
0.29: Improve clkinfo startup time by 10ms 0.29: Improve clkinfo startup time by 10ms
0.30: Fix possible bug in toggling an alarm to on, from clkinfo 0.30: Fix possible bug in toggling an alarm to on, from clkinfo
0.31: Ensure we reschedule alarms after setTimeZone has been called (fix #3791) 0.31: Ensure we reschedule alarms after setTimeZone has been called (fix #3791)
0.32: clkinfo ensures an alarm won't trigger immediately (copying `alarm`'s behaviour)

View File

@ -46,6 +46,9 @@ exports.resetTimer = function(alarm, time) {
time = time || new Date(); time = time || new Date();
var currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000); var currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
alarm.t = (currentTime + alarm.timer) % 86400000; alarm.t = (currentTime + alarm.timer) % 86400000;
alarm.last = "timer" in alarm || alarm.t >= require("time_utils").getCurrentTimeMillis()
? 0
: new Date().getDate();
}; };
/// Get time until the given alarm (object). Return undefined if alarm not enabled, or if 86400000 or more, alarm could be *more* than a day in the future /// Get time until the given alarm (object). Return undefined if alarm not enabled, or if 86400000 or more, alarm could be *more* than a day in the future
exports.getTimeToAlarm = function(alarm, time) { exports.getTimeToAlarm = function(alarm, time) {

View File

@ -1,7 +1,7 @@
{ {
"id": "sched", "id": "sched",
"name": "Scheduler", "name": "Scheduler",
"version": "0.31", "version": "0.32",
"description": "Scheduling library for alarms and timers", "description": "Scheduling library for alarms and timers",
"icon": "app.png", "icon": "app.png",
"type": "scheduler", "type": "scheduler",