summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/Timer.cpp
diff options
context:
space:
mode:
authorKieran Cawthray <kieranc@gmail.com>2021-07-11 14:04:50 (GMT)
committerKieran Cawthray <kieranc@gmail.com>2021-07-11 14:04:50 (GMT)
commitf970dc9993d3d1ff108dbe9a70048571d8a6b53e (patch)
tree1293d181ecf545ff404fbb4eb120ff0b1877241d /src/displayapp/screens/Timer.cpp
parentf5639db8ed48a332eeeed48a359a3323b0537d39 (diff)
parent6a91b83b12ef849f68d54f490153b02f0ecf58dc (diff)
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to 'src/displayapp/screens/Timer.cpp')
-rw-r--r--src/displayapp/screens/Timer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
index 260a17e..99e979b 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -63,8 +63,8 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
uint32_t seconds = timerController.GetTimeRemaining() / 1000;
- lv_label_set_text_fmt(time, "%02d:%02d", seconds / 60, seconds % 60);
-
+ lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
+
lv_obj_align(time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20);
btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
@@ -90,7 +90,7 @@ Timer::~Timer() {
bool Timer::Refresh() {
if (timerController.IsRunning()) {
uint32_t seconds = timerController.GetTimeRemaining() / 1000;
- lv_label_set_text_fmt(time, "%02d:%02d", seconds / 60, seconds % 60);
+ lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
}
return running;
}