summaryrefslogtreecommitdiff
path: root/src/components/battery
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/battery')
-rw-r--r--src/components/battery/BatteryController.cpp6
-rw-r--r--src/components/battery/BatteryController.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index e0042f5c..aaa245e4 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -34,9 +34,9 @@ void Battery::Update() {
// see https://forum.pine64.org/showthread.php?tid=8147
voltage = (value * 2.0f) / (1024/3.0f);
- float percentRemaining = ((voltage - 3.55f)*100.0f)*3.9f;
- percentRemaining = std::max(percentRemaining, 0.0f);
- percentRemaining = std::min(percentRemaining, 100.0f);
+ int percentRemaining = ((voltage - 3.55f)*100.0f)*3.9f;
+ percentRemaining = std::max(percentRemaining, 0);
+ percentRemaining = std::min(percentRemaining, 100);
percentRemainingBuffer.insert(percentRemaining);
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 21caffec..0f2c2a42 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -20,8 +20,8 @@ namespace Pinetime {
}
}
- float GetAverage() const {
- float sum = std::accumulate(arr.begin(), arr.end(), 0.0f);
+ int GetAverage() const {
+ int sum = std::accumulate(arr.begin(), arr.end(), 0.0f);
return (sum / sz);
}
@@ -36,7 +36,7 @@ namespace Pinetime {
public:
void Init();
void Update();
- float PercentRemaining() const { return percentRemainingBuffer.GetAverage(); }
+ int PercentRemaining() const { return percentRemainingBuffer.GetAverage(); }
float Voltage() const { return voltage; }
bool IsCharging() const { return isCharging; }
bool IsPowerPresent() const { return isPowerPresent; }