From 372be534716459d0f4dc7bd5096ec5bc03cf86d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sun, 14 Jun 2020 14:16:12 +0200 Subject: [PATCH] make uptime in LCD UI use systick function for converting uptime --- stm-firmware/reflow-menu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/stm-firmware/reflow-menu.c b/stm-firmware/reflow-menu.c index 36681f9..b1de29c 100644 --- a/stm-firmware/reflow-menu.c +++ b/stm-firmware/reflow-menu.c @@ -108,8 +108,11 @@ static void reflow_menu_about(struct lcd_menu *menu, enum menu_entry_func_entry static void *my_parent; static bool button_ready; static int page = 0; - static uint64_t uptime_secs; - uint64_t new_uptime_secs; + static uint32_t uptime_secs; + uint32_t new_uptime_secs; + uint32_t uptime_mins; + uint32_t uptime_hours; + uint32_t uptime_days; int16_t rot_delta; enum button_state push_button; char buff[20]; @@ -151,11 +154,11 @@ static void reflow_menu_about(struct lcd_menu *menu, enum menu_entry_func_entry menu_lcd_output(menu, 3, "<-About Uptime->"); break; case 2: - new_uptime_secs = (uint64_t)(systick_get_global_tick() / 1000); + systick_get_uptime_from_tick(&uptime_days, &uptime_hours, &uptime_mins, &new_uptime_secs); if (new_uptime_secs != uptime_secs) { uptime_secs = new_uptime_secs; menu_lcd_output(menu, 0, "Uptime:"); - snprintf(buff, sizeof(buff), "%u s", (unsigned int)uptime_secs); + snprintf(buff, sizeof(buff), "%lu days %02lu:%02lu:%02lu", uptime_days, uptime_hours, uptime_mins, uptime_secs); menu_lcd_output(menu, 1, buff); menu_lcd_output(menu, 3, "<-Version"); }