diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-09-03 13:57:00 (GMT) |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2021-09-03 13:57:00 (GMT) |
| commit | b31b2425f8afd5022173852f5a78592b37104c39 (patch) | |
| tree | c06d80c34f0db72727aab404bbdbc804a7b9abae /src | |
| parent | ac2ccaeff6e713b0121b39a6ae5dfce15ea8680c (diff) | |
Use percentage instead of IsFull
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/battery/BatteryController.h | 4 | ||||
| -rw-r--r-- | src/displayapp/screens/BatteryInfo.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h index 164057c..b66da5e 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 4dcf29c..25fd1ef 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) { |