sched 0.39: Allow a press of the button to stop/snooze the alarm when it's gone off (fix espruino#3753)

Author: gfwilliams

apps/sched/ChangeLog

@@ -38,4 +38,5 @@
 0.35: If you use 2v28 (or above) firmware, you can long-press on the snooze button to gain finer control over snooze lengths.
 0.36: Make 'Unlock At Buzz' (unlocking the watch when the alarm goes off) default to true
 0.37: Ensure we always execute an alarm, even if it was >1 minute in the past. This fixes missed alarms when >1 alarm is scheduled next to each other (fix #2712)
-0.38: Fix timer going off immediately if it was long enough it went to the next day (#4220)
+0.38: Fix timer going off immediately if it was long enough it went to the next day (#4220)
+0.39: Allow a press of the button to stop/snooze the alarm when it's gone off

apps/sched/README.md

@@ -21,6 +21,7 @@ With sched version 0.35 or later, when an alarm or timer is triggered, and you h
 - `Unlock at Buzz` - If `Yes` the alarm/timer will unlock the watch
 - `Delete Expired Timers` - Default for whether expired timers are removed after firing.
 - `Default Auto Snooze` - Default _Auto Snooze_ value for newly created alarms (_Alarms_ only)
+- `Button Stops Alarm` - When the alarm screen is showing, pressing the button will stop the alarm (instead of snoozing it)
 - `Default Snooze` - Default _Snooze_ value for newly created alarms/timers
 - `Buzz Count` - The number of buzzes before the watch goes silent, or "forever" to buzz until stopped.
 - `Buzz Interval` - The interval between one buzz and the next

apps/sched/lib.js

@@ -106,6 +106,7 @@ exports.getSettings = function () {
       defaultSnoozeMillis: 600000, // 10 minutes
       defaultAutoSnooze: false,
       defaultDeleteExpiredTimers: true, // Always
+      btnToStop: false, // pressing the button on the alarm screen will stop the alarm instead of snoozing it
       buzzCount: 10,
       buzzIntervalMillis: 3000, // 3 seconds
       defaultAlarmPattern: "==",

apps/sched/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.38",
+  "version": "0.39",
   "author": "gfwilliams",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",

apps/sched/sched.js

@@ -75,11 +75,7 @@ function showAlarm(alarm) {
 
   let buzzCount = settings.buzzCount;
 
-  E.showPrompt(message, {
-    title: alarm.timer ? /*LANG*/"TIMER!" : /*LANG*/"ALARM!",
-    buttons: { /*LANG*/"Snooze": 1, /*LANG*/"Stop": 2 }, // default is sleep so it'll come back in some mins
-    buttonsLong:{/*LANG*/"Snooze":3},
-  }).then(function (sleep) {
+  function stopOrSleep(sleep) {
     buzzCount = 0;
     //long press triggered
     if(sleep==3){
@@ -95,7 +91,7 @@ function showAlarm(alarm) {
       alarm.t = currentTime + settings.defaultSnoozeMillis;
       alarm.t %= 86400000;
       Bangle.emit("alarmSnooze", alarm);
-    } else {
+    } else { // sleep=2, stop the alarm
       let del = alarm.del === undefined ? settings.defaultDeleteExpiredTimers : alarm.del;
       if (del) {
         alarms.splice(alarmIndex, 1);
@@ -120,7 +116,14 @@ function showAlarm(alarm) {
     // so writing to array writes changes back directly
     require("sched").setAlarms(alarms);
     load();
-  });
+  }
+
+  E.showPrompt(message, {
+    title: alarm.timer ? /*LANG*/"TIMER!" : /*LANG*/"ALARM!",
+    buttons: { /*LANG*/"Snooze": 1, /*LANG*/"Stop": 2 }, // default is sleep so it'll come back in some mins
+    buttonsLong:{/*LANG*/"Snooze":3},
+    back: () => stopOrSleep(settings.btnToStop ? 2 : 1)
+  }).then(stopOrSleep);
 
   function buzz() {
     if (settings.unlockAtBuzz) {

apps/sched/settings.js

@@ -30,6 +30,14 @@
       }
     },
 
+    /*LANG*/"Button Stops Alarm": {
+      value: settings.btnToStop,
+      onchange: v => {
+        settings.btnToStop = v;
+        require("sched").setSettings(settings);
+      }
+    },
+
     /*LANG*/"Default Snooze": {
       value: settings.defaultSnoozeMillis / 60000,
       min: 5,