diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 21:41:29 (GMT) |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 21:41:29 (GMT) |
| commit | 6cf4a933b6323fc24a3b27ae55a3c12d31d6a841 (patch) | |
| tree | ffee2e59a62efe62aa8255f68e7cc89be1cad152 /src/displayapp/screens/Alarm.cpp | |
| parent | ae4b9e0f2e877d200bd780f99e2a8952f9f8bf5b (diff) | |
| parent | 42a5cdb5b776c2cdeb08a8c6f26606282a809178 (diff) | |
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/displayapp/screens/Alarm.cpp')
| -rw-r--r-- | src/displayapp/screens/Alarm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp index 772e5d4..537ac0e 100644 --- a/src/displayapp/screens/Alarm.cpp +++ b/src/displayapp/screens/Alarm.cpp @@ -36,7 +36,7 @@ Alarm::Alarm(DisplayApp* app, Controllers::AlarmController& alarmController) alarmHours = alarmController.Hours(); alarmMinutes = alarmController.Minutes(); - lv_label_set_text_fmt(time, "%02lu:%02lu", alarmHours, alarmMinutes); + lv_label_set_text_fmt(time, "%02hhu:%02hhu", alarmHours, alarmMinutes); lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -25); @@ -223,7 +223,7 @@ void Alarm::ShowInfo() { auto secToAlarm = timeToAlarm % 60; lv_label_set_text_fmt( - txtMessage, "Time to\nalarm:\n%2d Days\n%2d Hours\n%2d Minutes\n%2d Seconds", daysToAlarm, hrsToAlarm, minToAlarm, secToAlarm); + txtMessage, "Time to\nalarm:\n%2lu Days\n%2lu Hours\n%2lu Minutes\n%2lu Seconds", daysToAlarm, hrsToAlarm, minToAlarm, secToAlarm); } else { lv_label_set_text(txtMessage, "Alarm\nis not\nset."); } |
