bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with alarm operation, especially snoozing

master
Travis Evans 2025-05-12 17:01:21 -05:00
parent 1d1e37acd6
commit c6afc5c1cd
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/tevtimer/alarm.js
View File

@ -21,6 +21,16 @@ function showAlarm(alarm) {
} }
let message = timer.display_name() + '\n' + alarm.msg; let message = timer.display_name() + '\n' + alarm.msg;
// Altering alarms from here is tricky. Making changes to timers
// requires calling tt.update_system_alarms() to update the system
// alarm list to reflect the new timer state. But that means we need
// to retrieve the alarms again from sched.getAlarms() before
// changing them ourselves or else we risk overwriting the changes.
// Likewise, after directly modifying alarms, we need to write them
// back with sched.setAlarms() before doing anything that will call
// tt.update_system_alarms(), or else the latter will work with an
// outdated list of alarms.
// If there's a timer chained from this one, start it (only for // If there's a timer chained from this one, start it (only for
// alarms not in snoozed status) // alarms not in snoozed status)
var isChainedTimer = false; var isChainedTimer = false;
@ -77,6 +87,7 @@ function showAlarm(alarm) {
let currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000); let currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
alarm.t = currentTime + settings.defaultSnoozeMillis; alarm.t = currentTime + settings.defaultSnoozeMillis;
alarm.t %= 86400000; alarm.t %= 86400000;
require("sched").setAlarms(alarms);
Bangle.emit("alarmSnooze", alarm); Bangle.emit("alarmSnooze", alarm);
} }
@ -84,6 +95,7 @@ function showAlarm(alarm) {
let index = alarms.indexOf(alarm); let index = alarms.indexOf(alarm);
if (index !== -1) { if (index !== -1) {
alarms.splice(index, 1); alarms.splice(index, 1);
require("sched").setAlarms(alarms);
} }
if (timer !== chainTimer) { if (timer !== chainTimer) {
timer.pause(); timer.pause();
@ -100,8 +112,6 @@ function showAlarm(alarm) {
Bangle.emit("alarmDismiss", alarm); Bangle.emit("alarmDismiss", alarm);
// The updated alarm is still a member of 'alarms'
// so writing to array writes changes back directly
require("sched").setAlarms(alarms); require("sched").setAlarms(alarms);
if (action === 'halt' || tt.SETTINGS.alarm_return) { if (action === 'halt' || tt.SETTINGS.alarm_return) {