From 81faf98660af074b31419bc60b08641c4d0d06f1 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Sat, 24 Dec 2022 14:08:15 +0100 Subject: [PATCH] UX improvement Date is now separated in 2 lines Day of the week + Day and Month + Year --- NTP/Core/Inc/clock.h | 2 +- NTP/Core/Src/app_main.c | 2 +- NTP/Core/Src/clock.c | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NTP/Core/Inc/clock.h b/NTP/Core/Inc/clock.h index a5c199d..40c294b 100644 --- a/NTP/Core/Inc/clock.h +++ b/NTP/Core/Inc/clock.h @@ -18,4 +18,4 @@ void Clock_Draw_Outline(uint16_t xCenter, uint16_t yCenter, double radius); void Clock_Draw_Hands(uint16_t xCenter, uint16_t yCenter, double radius, uint8_t hours, uint8_t minutes, uint8_t seconds); -void Clock_Write_Date(uint16_t xCenter, uint16_t yCenter, uint8_t Wday, uint8_t Day, uint8_t Month, uint16_t Year); +void Clock_Write_Date(uint16_t xCenter, uint16_t xOffset, uint16_t yCenter, uint16_t yOffset, uint8_t Wday, uint8_t Day, uint8_t Month, uint16_t Year); diff --git a/NTP/Core/Src/app_main.c b/NTP/Core/Src/app_main.c index 570aa8a..b4d3666 100644 --- a/NTP/Core/Src/app_main.c +++ b/NTP/Core/Src/app_main.c @@ -73,7 +73,7 @@ void app_main(void *argument) debugln("DIFF : %02d:%02d:%02d", diff.Hour, diff.Minute, diff.Second); BSP_LCD_Clear(LCD_COLOR_TRANSPARENT); - Clock_Write_Date(0, Y_CENTER + 40, local.Wday, local.Day, local.Month, local.Year + 1970); + Clock_Write_Date(0, 0, Y_CENTER, 40, local.Wday, local.Day, local.Month, local.Year + 1970); Clock_Draw_Hands(X_CENTER, Y_CENTER, Radius, local.Hour, local.Minute, local.Second); } diff --git a/NTP/Core/Src/clock.c b/NTP/Core/Src/clock.c index 3a1864b..6fcd89f 100644 --- a/NTP/Core/Src/clock.c +++ b/NTP/Core/Src/clock.c @@ -82,10 +82,13 @@ void Clock_Draw_Hands(uint16_t xCenter, uint16_t yCenter, double radius, BSP_LCD_DrawLine(xCenter, yCenter, x2, y2); } -void Clock_Write_Date(uint16_t xCenter, uint16_t yCenter, uint8_t Wday, uint8_t Day, uint8_t Month, uint16_t Year) +void Clock_Write_Date(uint16_t xCenter, uint16_t xOffset, uint16_t yCenter, uint16_t yOffset, uint8_t Wday, uint8_t Day, uint8_t Month, uint16_t Year) { char buff[16]; memset(buff, 0, 16); - sprintf(buff, "%s %2u %s %4u", days[Wday - 1], Day, months[Month - 1], Year); - BSP_LCD_DisplayStringAt(xCenter, yCenter, (uint8_t*)buff, CENTER_MODE); + sprintf(buff, "%s %2u", days[Wday - 1], Day); + BSP_LCD_DisplayStringAt(xCenter - xOffset, yCenter - yOffset, (uint8_t*)buff, CENTER_MODE); + memset(buff, 0, 16); + sprintf(buff, "%s %4u", months[Month - 1], Year); + BSP_LCD_DisplayStringAt(xCenter + xOffset, yCenter + yOffset, (uint8_t*)buff, CENTER_MODE); }