From dab3c045db660ae4f7837312e713fcc206dd113a Mon Sep 17 00:00:00 2001
From: Marco H <myx00r@googlemail.com>
Date: Thu, 26 May 2022 19:13:40 +0200
Subject: [PATCH] Use prompt with dimiss and pause

---
 apps/widbaroalarm/ChangeLog     |  1 +
 apps/widbaroalarm/metadata.json |  2 +-
 apps/widbaroalarm/settings.js   | 20 +++++++++++++++
 apps/widbaroalarm/widget.js     | 44 ++++++++++++++++++++-------------
 4 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/apps/widbaroalarm/ChangeLog b/apps/widbaroalarm/ChangeLog
index 5786741c7..b61e1691b 100644
--- a/apps/widbaroalarm/ChangeLog
+++ b/apps/widbaroalarm/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Initial version
 0.02: Do not warn multiple times for the same exceedance
 0.03: Fix crash
+0.04: Use Prompt with dismiss and pause
diff --git a/apps/widbaroalarm/metadata.json b/apps/widbaroalarm/metadata.json
index 134f03623..9f5cffcfe 100644
--- a/apps/widbaroalarm/metadata.json
+++ b/apps/widbaroalarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "widbaroalarm",
   "name": "Barometer Alarm Widget",
   "shortName": "Barometer Alarm",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A widget that can alarm on when the pressure reaches defined thresholds.",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widbaroalarm/settings.js b/apps/widbaroalarm/settings.js
index bea6319d1..faece90a2 100644
--- a/apps/widbaroalarm/settings.js
+++ b/apps/widbaroalarm/settings.js
@@ -87,6 +87,26 @@
         },
         onchange: x => save('buzz', x)
       },
+      'Dismiss delay': {
+      value: settings.dismissDelayMin,
+      min: 5, max: 60,
+      onchange: v => {
+        save('dismissDelayMin', x)
+      },
+      format: x => {
+        return x + " min";
+      }
+    },
+    'Pause delay': {
+      value: settings.pauseDelayMin,
+      min: 30, max: 240,
+      onchange: v => {
+        save('pauseDelayMin', x)
+      },
+      format: x => {
+        return x + " min";
+      }
+    },
     };
     E.showMenu(menu);
   }
diff --git a/apps/widbaroalarm/widget.js b/apps/widbaroalarm/widget.js
index 2745db8ad..c2a9e1c54 100644
--- a/apps/widbaroalarm/widget.js
+++ b/apps/widbaroalarm/widget.js
@@ -32,13 +32,21 @@
 
   let history3 = storage.readJSON(LOG_FILE, true) || []; // history of recent 3 hours
 
-  function showAlarm(body, title) {
+  function showAlarm(body, title, key) {
     if (body == undefined) return;
 
-    require("notify").show({
+    E.showPrompt(body, {
       title: title || "Pressure",
-      body: body,
-      icon: require("heatshrink").decompress(atob("jEY4cA///gH4/++mkK30kiWC4H8x3BGDmSGgYDCgmSoEAg3bsAIDpAIFkmSpMAm3btgIFDQwIGNQpTYkAIJwAHEgMoCA0JgMEyBnBCAW3KoQQDhu3oAIH5JnDBAW24IIBEYm2EYwACBCIACA"))
+      buttons: { "Ok": 1, "Dismiss": 2, "Pause": 3 }
+    }).then(function (v) {
+      const tsNow = Math.round(Date.now() / 1000); // seconds
+
+      if (v == 2) {
+        saveSetting(key, tsNow + 60 * settings('dismissDelayMin'));
+      }
+      if (v == 3) {
+        saveSetting(key, tsNow + 60 * settings('pauseDelayMin'));
+      }
     });
 
     if (setting("buzz") &&
@@ -48,8 +56,10 @@
   }
 
 
-  function didWeAlreadyWarn(key) {
-    return setting(key) == undefined || setting(key) > 0;
+  function doWeNeedToWarn(key) {
+    const tsNow = Math.round(Date.now() / 1000); // seconds
+
+    return setting(key) == 0 || setting(key) < tsNow;
   }
 
   function checkForAlarms(pressure) {
@@ -77,7 +87,7 @@
     if (setting("lowalarm")) {
       // Is below the alarm threshold?
       if (pressure <= setting("min")) {
-        if (!didWeAlreadyWarn("lastLowWarningTs")) {
+        if (!doWeNeedToWarn("lastLowWarningTs")) {
           showAlarm("Pressure low: " + Math.round(pressure) + " hPa");
           saveSetting("lastLowWarningTs", ts);
           alreadyWarned = true;
@@ -92,7 +102,7 @@
     if (setting("highalarm")) {
       // Is above the alarm threshold?
       if (pressure >= setting("max")) {
-        if (!didWeAlreadyWarn("lastHighWarningTs")) {
+        if (!doWeNeedToWarn("lastHighWarningTs")) {
           showAlarm("Pressure high: " + Math.round(pressure) + " hPa");
           saveSetting("lastHighWarningTs", ts);
           alreadyWarned = true;
@@ -122,7 +132,7 @@
           // drop alarm
           if (drop3halarm > 0 && oldestPressure > pressure) {
             if (Math.abs(diff) > drop3halarm) {
-              if (!didWeAlreadyWarn("lastDropWarningTs")) {
+              if (!doWeNeedToWarn("lastDropWarningTs")) {
                 showAlarm((Math.round(Math.abs(diff) * 10) / 10) + " hPa/3h from " +
                   Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "Pressure drop");
                 saveSetting("lastDropWarningTs", ts);
@@ -137,7 +147,7 @@
           // raise alarm
           if (raise3halarm > 0 && oldestPressure < pressure) {
             if (Math.abs(diff) > raise3halarm) {
-              if (!didWeAlreadyWarn("lastRaiseWarningTs")) {
+              if (!doWeNeedToWarn("lastRaiseWarningTs")) {
                 showAlarm((Math.round(Math.abs(diff) * 10) / 10) + " hPa/3h from " +
                   Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "Pressure raise");
                 saveSetting("lastRaiseWarningTs", ts);
@@ -176,7 +186,7 @@
 
   /*
    turn on barometer power
-   take 5 measurements
+   take `numberOfMeasurements` measurements
    sort the results
    take the middle one (median)
    turn off barometer power
@@ -186,11 +196,11 @@
     setTimeout(function() {
       currentPressures = [];
 
-      Bangle.getPressure().then(baroHandler);
-      Bangle.getPressure().then(baroHandler);
-      Bangle.getPressure().then(baroHandler);
-      Bangle.getPressure().then(baroHandler);
-      Bangle.getPressure().then(baroHandler);
+      const numberOfMeasurements = 5;
+
+      for (let i = 0; i < numberOfMeasurements; i++) {
+        Bangle.getPressure().then(baroHandler);
+      }
 
       setTimeout(function() {
         Bangle.setBarometerPower(false, "widbaroalarm");
@@ -198,7 +208,7 @@
         currentPressures.sort();
 
         // take median value
-        medianPressure = currentPressures[3];
+        medianPressure = currentPressures[Math.round(numberOfMeasurements / 2) + 1];
         checkForAlarms(medianPressure);
       }, 1000);
     }, 500);