From fd52ca8fe6f42226ec32a001f4c61dc100ead94a Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 3 Sep 2021 14:35:38 +0300
Subject: Detect full charge and improve watchface display

---
 src/components/battery/BatteryController.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/components/battery/BatteryController.h')

diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 6f09b737..164057c4 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -23,13 +23,19 @@ namespace Pinetime {
       }
 
       bool IsCharging() const {
-        return isCharging;
+        // isCharging will go up and down when fully charged
+        // isFull makes sure this returns false while fully charged.
+        return isCharging && !isFull;
       }
 
       bool IsPowerPresent() const {
         return isPowerPresent;
       }
 
+      bool IsFull() const {
+        return isFull;
+      }
+
     private:
       static Battery* instance;
       nrf_saadc_value_t saadc_value;
@@ -40,6 +46,7 @@ namespace Pinetime {
       uint16_t voltage = 0;
       uint8_t percentRemaining = 0;
 
+      bool isFull = false;
       bool isCharging = false;
       bool isPowerPresent = false;
 
-- 
cgit v1.2.3


From b31b2425f8afd5022173852f5a78592b37104c39 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Fri, 3 Sep 2021 16:57:00 +0300
Subject: Use percentage instead of IsFull

---
 src/components/battery/BatteryController.h | 4 ----
 src/displayapp/screens/BatteryInfo.cpp     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/components/battery/BatteryController.h')

diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 164057c4..b66da5e4 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -32,10 +32,6 @@ namespace Pinetime {
         return isPowerPresent;
       }
 
-      bool IsFull() const {
-        return isFull;
-      }
-
     private:
       static Battery* instance;
       nrf_saadc_value_t saadc_value;
diff --git a/src/displayapp/screens/BatteryInfo.cpp b/src/displayapp/screens/BatteryInfo.cpp
index 4dcf29c5..25fd1efa 100644
--- a/src/displayapp/screens/BatteryInfo.cpp
+++ b/src/displayapp/screens/BatteryInfo.cpp
@@ -63,7 +63,7 @@ void BatteryInfo::Refresh() {
   if (batteryController.IsCharging()) {
     lv_obj_set_style_local_bg_color(charging_bar, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_RED);
     lv_label_set_text_static(status, "Charging");
-  } else if (batteryController.IsFull()) {
+  } 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 (batteryPercent < 10) {
-- 
cgit v1.2.3