From 731c134cde83eabee52d037619741f0a328059f3 Mon Sep 17 00:00:00 2001 From: Marco H Date: Wed, 9 Mar 2022 10:24:39 +0100 Subject: [PATCH] Try not to warn multiple times for the same exceedance (2nd part) --- apps/widbaroalarm/widget.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/apps/widbaroalarm/widget.js b/apps/widbaroalarm/widget.js index a78f0a05c..42e234fc7 100644 --- a/apps/widbaroalarm/widget.js +++ b/apps/widbaroalarm/widget.js @@ -120,29 +120,33 @@ const diff = oldestPressure - pressure; // drop alarm - if (drop3halarm > 0 && oldestPressure > pressure && !didWeAlreadyWarn("lastHighWarningTs")) { + if (drop3halarm > 0 && oldestPressure > pressure) { if (Math.abs(diff) > drop3halarm) { - showAlarm((Math.round(Math.abs(diff) * 10) / 10) + " hPa/3h from " + - Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "Pressure drop"); - saveSetting("lastDropWarningTs", ts); + if (!didWeAlreadyWarn("lastHighWarningTs")) { + showAlarm((Math.round(Math.abs(diff) * 10) / 10) + " hPa/3h from " + + Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "Pressure drop"); + saveSetting("lastDropWarningTs", ts); + } } else { - saveSetting("lastDropWarningTs", ts); + saveSetting("lastDropWarningTs", 0); } } else { - saveSetting("lastDropWarningTs", ts); + saveSetting("lastDropWarningTs", 0); } // raise alarm - if (raise3halarm > 0 && oldestPressure < pressure && !didWeAlreadyWarn("lastRaiseWarningTs")) { + if (raise3halarm > 0 && oldestPressure < pressure) { if (Math.abs(diff) > raise3halarm) { - showAlarm((Math.round(Math.abs(diff) * 10) / 10) + " hPa/3h from " + - Math.round(oldestPressure) + " to " + Math.round(pressure) + " hPa", "Pressure raise"); - saveSetting("lastRaiseWarningTs", ts); + if (!didWeAlreadyWarn("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); + } } else { - saveSetting("lastRaiseWarningTs", ts); + saveSetting("lastRaiseWarningTs", 0); } } else { - saveSetting("lastRaiseWarningTs", ts); + saveSetting("lastRaiseWarningTs", 0); } } }