CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #168 from Panky-codes/fix-erratic-battery

Browse Source 
Fix erratic battery
This commit is contained in:
JF002
2021-01-20 20:41:55 +00:00
committed by GitHub
parent 6d85139387 b31c0e7e45
commit be48f5275a
5 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/displayapp/screens/BatteryIcon.cpp
View File

@@ -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;
}

2
src/displayapp/screens/BatteryIcon.h
View File

@@ -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);
};
}

2
src/displayapp/screens/Clock.h
View File

@@ -64,7 +64,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};