summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/battery/BatteryController.h2
-rw-r--r--src/displayapp/screens/BatteryIcon.cpp10
-rw-r--r--src/displayapp/screens/BatteryIcon.h2
-rw-r--r--src/displayapp/screens/Clock.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 0f2c2a42..2329f162 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -7,7 +7,7 @@
namespace Pinetime {
namespace Controllers {
// A simple circular buffer that can be used to average
- // out sensor values
+ // out the sensor values
template <int N>
class CircBuffer {
public:
diff --git a/src/displayapp/screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp
index 4c102477..455b0c6d 100644
--- a/src/displayapp/screens/BatteryIcon.cpp
+++ b/src/displayapp/screens/BatteryIcon.cpp
@@ -3,11 +3,11 @@
using namespace Pinetime::Applications::Screens;
-const char* BatteryIcon::GetBatteryIcon(float batteryPercent) {
- if(batteryPercent > 90.0f) return Symbols::batteryFull;
- if(batteryPercent > 75.0f) return Symbols::batteryThreeQuarter;
- if(batteryPercent > 50.0f) return Symbols::batteryHalf;
- if(batteryPercent > 25.0f) return Symbols::batteryOneQuarter;
+const char* BatteryIcon::GetBatteryIcon(int batteryPercent) {
+ if(batteryPercent > 90) return Symbols::batteryFull;
+ if(batteryPercent > 75) return Symbols::batteryThreeQuarter;
+ if(batteryPercent > 50) return Symbols::batteryHalf;
+ if(batteryPercent > 25) return Symbols::batteryOneQuarter;
return Symbols::batteryEmpty;
}
diff --git a/src/displayapp/screens/BatteryIcon.h b/src/displayapp/screens/BatteryIcon.h
index f1001923..006e5621 100644
--- a/src/displayapp/screens/BatteryIcon.h
+++ b/src/displayapp/screens/BatteryIcon.h
@@ -6,7 +6,7 @@ namespace Pinetime {
class BatteryIcon {
public:
static const char* GetUnknownIcon();
- static const char* GetBatteryIcon(float batteryPercent);
+ static const char* GetBatteryIcon(int batteryPercent);
static const char* GetPlugIcon(bool isCharging);
};
}
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 4c5f60a0..c7f2d9db 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -62,7 +62,7 @@ namespace Pinetime {
Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
uint8_t currentDay = 0;
- DirtyValue<float> batteryPercentRemaining {0};
+ DirtyValue<int> batteryPercentRemaining {0};
DirtyValue<bool> bleState {false};
DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime;
DirtyValue<uint32_t> stepCount {0};