From c5c91b7eeafb9700a70c09d180bd67a3fdbeb3f8 Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Sun, 5 Aug 2018 17:36:58 +1200 Subject: [PATCH] Moved notifyFailures alerts to match alerts bits --- GpsTracker/Core.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/GpsTracker/Core.cpp b/GpsTracker/Core.cpp index 4bf2225..8518d91 100644 --- a/GpsTracker/Core.cpp +++ b/GpsTracker/Core.cpp @@ -70,16 +70,17 @@ namespace core { details::appendToSmsBuffer(buffer, PSTR("- Battery at %d%%.\n"), metadata.batteryLevel); } - if (bitRead(triggered, ALERT_RTC_CLOCK_FAILURE)) { - details::appendToSmsBuffer(buffer, PSTR("-RTC was stopped. %S"), backupFailureString); + if (bitRead(triggered, ALERT_RTC_TEMPERATURE_FAILURE)) { + details::appendToSmsBuffer(buffer, PSTR("- Temperature is %dC.%S"), static_cast(metadata.temperature * 100), backupFailureString); } - if (bitRead(triggered, ALERT_RTC_TEMPERATURE_FAILURE)) { - details::appendToSmsBuffer(buffer, PSTR("- Temperature is %dC. %S"), static_cast(metadata.temperature * 100), backupFailureString); + if (bitRead(triggered, ALERT_RTC_CLOCK_FAILURE)) { + details::appendToSmsBuffer(buffer, PSTR("-RTC was stopped.%S"), backupFailureString); } bool notified = network::sendSms(buffer); if (!notified) NOTICE_MSG("notifyFailure", "SMS not sent !"); + NOTICE_FORMAT("notifyFailures", "%s", buffer); network::powerOff(); return notified ? triggered : NO_ALERTS_NOTIFIED; //If not notified, the alerts state should not be persisted (so we can retry to notify them)