Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevents blocking when Infineat watchface is charging #2256

Merged
merged 5 commits into from
Feb 26, 2025
Merged

Prevents blocking when Infineat watchface is charging #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7198b5b
Prevent blocking when Infineat watchface is charging
SteveAmor Feb 19, 2025
45f1ec7
Use RTOS timers for annimation
SteveAmor Feb 23, 2025
de7238a
Adds comment on height of animation
SteveAmor Feb 24, 2025
4c822e8
Fixes clang formatting error for comment
SteveAmor Feb 24, 2025
9a06545
Fixes comments
SteveAmor Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/displayapp/screens/WatchFaceInfineat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,12 +434,15 @@ void WatchFaceInfineat::Refresh() {

batteryPercentRemaining = batteryController.PercentRemaining();
isCharging = batteryController.IsCharging();
if (batteryController.IsCharging()) { // Charging battery animation
chargingBatteryPercent += 1;
// Charging battery animation
if (batteryController.IsCharging() && (xTaskGetTickCount() - chargingAnimationTick > pdMS_TO_TICKS(150))) {
// Dividing 100 by the height gives the battery percentage required to shift the animation by 1 pixel
chargingBatteryPercent += 100 / lv_obj_get_height(logoPine);
if (chargingBatteryPercent > 100) {
chargingBatteryPercent = batteryPercentRemaining.Get();
}
SetBatteryLevel(chargingBatteryPercent);
chargingAnimationTick = xTaskGetTickCount();
} else if (isCharging.IsUpdated() || batteryPercentRemaining.IsUpdated()) {
chargingBatteryPercent = batteryPercentRemaining.Get();
SetBatteryLevel(chargingBatteryPercent);
Expand Down
1 change: 1 addition & 0 deletions src/displayapp/screens/WatchFaceInfineat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ namespace Pinetime {
private:
uint32_t savedTick = 0;
uint8_t chargingBatteryPercent = 101; // not a mistake ;)
TickType_t chargingAnimationTick = 0;

Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
Utility::DirtyValue<bool> isCharging {};
Expand Down