aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2023-01-21 13:30:10 +0200
committerRiku Isokoski <riksu9000@gmail.com>2023-01-26 10:58:47 +0200
commit52bc0cd623d62f8bf074e3b4c03f11ab2dd05fbd (patch)
tree019cbf2f24521abf819d19d16925e52e83308cda
parenta3a4091e032b8bc112b3f10ea2ab8b9f958e4197 (diff)
infineat: Battery display simplification
-rw-r--r--src/displayapp/screens/WatchFaceInfineat.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp
index 5bd44a90..9f12d0a1 100644
--- a/src/displayapp/screens/WatchFaceInfineat.cpp
+++ b/src/displayapp/screens/WatchFaceInfineat.cpp
@@ -409,17 +409,13 @@ void WatchFaceInfineat::Refresh() {
batteryPercentRemaining = batteryController.PercentRemaining();
isCharging = batteryController.IsCharging();
- // We store if battery and charging are updated before calling Get(),
- // since Get() sets isUpdated to false.
- bool isBatteryUpdated = batteryPercentRemaining.IsUpdated();
- bool isChargingUpdated = isCharging.IsUpdated();
- if (isCharging.Get()) { // Charging battery animation
+ if (batteryController.IsCharging()) { // Charging battery animation
chargingBatteryPercent += 1;
if (chargingBatteryPercent > 100) {
chargingBatteryPercent = batteryPercentRemaining.Get();
}
SetBatteryLevel(chargingBatteryPercent);
- } else if (isChargingUpdated || isBatteryUpdated) {
+ } else if (isCharging.IsUpdated() || batteryPercentRemaining.IsUpdated()) {
chargingBatteryPercent = batteryPercentRemaining.Get();
SetBatteryLevel(chargingBatteryPercent);
}