From fff0a00a4a251fafa1c195d9f92fdc07affe3ca2 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Sat, 31 Dec 2022 09:56:03 +0200
Subject: [PATCH] Revert "added low battery message"

This reverts PR https://github.com/InfiniTimeOrg/InfiniTime/pull/1352
---
 src/components/battery/BatteryController.cpp | 10 ----------
 src/components/battery/BatteryController.h   |  7 -------
 src/displayapp/screens/BatteryInfo.cpp       |  2 +-
 src/systemtask/Messages.h                    |  1 -
 src/systemtask/SystemTask.cpp                | 12 ------------
 5 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 4d860490..d9e198c5 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -81,20 +81,10 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
       newPercent = std::min(approx.GetValue(voltage), isCharging ? uint8_t {99} : uint8_t {100});
     }
 
-    if (isPowerPresent) {
-      batteryLowNotified = false;
-    }
-
     if ((isPowerPresent && newPercent > percentRemaining) || (!isPowerPresent && newPercent < percentRemaining) || firstMeasurement) {
       firstMeasurement = false;
       percentRemaining = newPercent;
       systemTask->PushMessage(System::Messages::BatteryPercentageUpdated);
-
-      // warn about low battery when not charging and below threshold
-      if (BatteryIsLow() && !isPowerPresent && !batteryLowNotified) {
-        systemTask->PushMessage(System::Messages::LowBattery);
-        batteryLowNotified = true;
-      }
     }
 
     nrfx_saadc_uninit();
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index b47b77cc..5a7394c4 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -18,10 +18,6 @@ namespace Pinetime {
         return percentRemaining;
       }
 
-      bool BatteryIsLow() const {
-        return percentRemaining <= lowBatteryThreshold;
-      }
-
       uint16_t Voltage() const {
         return voltage;
       }
@@ -43,7 +39,6 @@ namespace Pinetime {
       static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
       uint16_t voltage = 0;
       uint8_t percentRemaining = 0;
-      bool batteryLowNotified = false;
 
       bool isFull = false;
       bool isCharging = false;
@@ -55,8 +50,6 @@ namespace Pinetime {
       void SaadcEventHandler(nrfx_saadc_evt_t const* p_event);
       static void AdcCallbackStatic(nrfx_saadc_evt_t const* event);
 
-      static constexpr uint8_t lowBatteryThreshold {15};
-
       bool isReading = false;
 
       Pinetime::System::SystemTask* systemTask = nullptr;
diff --git a/src/displayapp/screens/BatteryInfo.cpp b/src/displayapp/screens/BatteryInfo.cpp
index 7cfd0aca..ab0a2bd4 100644
--- a/src/displayapp/screens/BatteryInfo.cpp
+++ b/src/displayapp/screens/BatteryInfo.cpp
@@ -58,7 +58,7 @@ void BatteryInfo::Refresh() {
   } else if (batteryPercent == 100) {
     lv_obj_set_style_local_bg_color(charging_bar, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_BLUE);
     lv_label_set_text_static(status, "Fully charged");
-  } else if (batteryController.BatteryIsLow()) {
+  } else if (batteryPercent < 10) {
     lv_obj_set_style_local_bg_color(charging_bar, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
     lv_label_set_text_static(status, "Battery low");
   } else {
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index 9679bbb5..3768ae9b 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -29,7 +29,6 @@ namespace Pinetime {
       SetOffAlarm,
       MeasureBatteryTimerExpired,
       BatteryPercentageUpdated,
-      LowBattery,
       StartFileTransfer,
       StopFileTransfer,
       BleRadioEnableToggle
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 3ceb63d4..07a85f5a 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -18,8 +18,6 @@
 #include "BootErrors.h"
 
 #include <memory>
-#include <algorithm>
-#include <cstring>
 
 using namespace Pinetime::System;
 
@@ -408,16 +406,6 @@ void SystemTask::Work() {
         case Messages::BatteryPercentageUpdated:
           nimbleController.NotifyBatteryLevel(batteryController.PercentRemaining());
           break;
-        case Messages::LowBattery: {
-          Pinetime::Controllers::NotificationManager::Notification notif;
-          constexpr char message[] = "Low Battery\0Charge your watch to prevent data loss.\0";
-          constexpr size_t messageSize = std::min(sizeof(message), Pinetime::Controllers::NotificationManager::MaximumMessageSize());
-          std::memcpy(notif.message.data(), message, messageSize);
-          notif.size = messageSize;
-          notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert;
-          notificationManager.Push(std::move(notif));
-          PushMessage(Messages::OnNewNotification);
-        } break;
         case Messages::OnPairing:
           if (state == SystemTaskState::Sleeping) {
             GoToRunning();