Merge pull request #3805 from bobrippling/fix/sched-clkinfo-trigger

sched: prevent timers from firing immediately

apps/alarm/app.js

@@ -87,11 +87,10 @@ function showMainMenu(scroll, group, scrollback) {
   };
   const getGroups = settings.showGroup && !group;
   const groups = getGroups ? {} : undefined;
-  var showAlarm;
   const getIcon = (e)=>{return e.on ? (e.timer ? iconTimerOn : iconAlarmOn) : (e.timer ? iconTimerOff : iconAlarmOff);};
 
   alarms.forEach((e, index) => {
-    showAlarm = !settings.showGroup || (group ? e.group === group : !e.group);
+    const showAlarm = !settings.showGroup || (group ? e.group === group : !e.group);
     if(showAlarm) {
       const label = trimLabel(getLabel(e),40);
       menu[label] = {

apps/sched/ChangeLog

@@ -32,3 +32,4 @@
 0.29: Improve clkinfo startup time by 10ms
 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.32: clkinfo ensures an alarm won't trigger immediately (copying `alarm`'s behaviour)

apps/sched/lib.js

@@ -46,6 +46,9 @@ exports.resetTimer = function(alarm, time) {
   time = time || new Date();
   var currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
   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
 exports.getTimeToAlarm = function(alarm, time) {

apps/sched/metadata.json

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