rei-forks/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no errors, no warnings, no work..

Browse Source
This commit is contained in:
Дмитрий Марков 2022-01-21 08:59:44 +05:00
parent eb8bd4dc4e
commit 1e4a6763d7
No known key found for this signature in database
GPG Key ID: 49CFEE49DBF77352
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/displayapp/screens/WatchFaceTerminal.cpp
View File

@ -108,14 +108,13 @@ WatchFaceTerminal::~WatchFaceTerminal() {
lv_obj_clean(lv_scr_act()); lv_obj_clean(lv_scr_act());
} }
void WatchFaceTerminal::Refresh() { void WatchFaceTerminal::Refresh() {
batteryPercentRemaining = batteryController.PercentRemaining(); batteryPercentRemaining = batteryController.PercentRemaining();
if (batteryPercentRemaining.IsUpdated()) { if (batteryPercentRemaining.IsUpdated()) {
auto batteryPercent = batteryPercentRemaining.Get(); auto batteryPercent = batteryPercentRemaining.Get();
lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent)); lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
auto isCharging = batteryController.IsCharging() || batteryController.IsPowerPresent(); auto isCharging = batteryController.IsCharging() || batteryController.IsPowerPresent();
lv_label_set_text(batteryPlug, BatteryIcon::GetPlugIcon(isCharging)); lv_label_set_text(batteryPlug, BatteryIcon::GetPlugIcon(isCharging));
} }
/*char* bleValue;*/ /*char* bleValue;*/
@ -184,17 +183,16 @@ void WatchFaceTerminal::Refresh() {
sprintf(hoursChar, "%02d", hour); sprintf(hoursChar, "%02d", hour);
} }
auto batteryValue = static_cast<uint8_t>(batteryController.PercentRemaining()); char secondsChar[5];
sprintf(secondsChar, "%02d", static_cast<int>(second));
auto batteryValue = static_cast<uint8_t>(batteryController.PercentRemaining());
char battStr[24]; char battStr[24];
sprintf(battStr, "[BATT]#387b54 %d%\%#", batteryValue); sprintf(battStr, "[BATT]#387b54 %d%\%#", batteryValue);
lv_label_set_text(batteryPercent, battStr); lv_label_set_text(batteryPercent, battStr);
char secondsChar[5];
sprintf(secondsChar, "%02d", static_cast<int>(second));
char bleStr[24]; char bleStr[24];
sprintf(bleStr, "[STAT]#387b54 %s#", bleValue); sprintf(bleStr, "[STAT]#387b54 %d#", bleValue);
lv_label_set_text(connectState, bleStr); lv_label_set_text(connectState, bleStr);
if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] || if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||