Author: Zach DeCook <zachdecook@gmail.com>
Date formats: Use ISO 8601 (#1040) * System Info: Use YYYY-MM-DD The date format with the slashes has different meaning in different regions * Terminal Watchface: Use dashes as date separator Using the popular ISO 8601 format instead Co-authored-by: Riku Isokoski <riksu9000@gmail.com>
src/displayapp/screens/SystemInfo.cpp | 6 +++--- src/displayapp/screens/WatchFaceTerminal.cpp | 2 +-
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index 7e1ae2f868794748fb06758533697028a92af21d..540597969fa84b27b3830187176c3cc1c08af345 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -143,7 +143,7 @@ lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(label, true); lv_label_set_text_fmt(label, - "#808080 Date# %02d/%02d/%04d\n" + "#808080 Date# %04d-%02d-%02d\n" "#808080 Time# %02d:%02d:%02d\n" "#808080 Uptime#\n %02lud %02lu:%02lu:%02lu\n" "#808080 Battery# %d%%/%03imV\n" @@ -152,9 +152,9 @@ "#808080 Last reset# %s\n" "#808080 Accel.# %s\n" "#808080 Touch.# %x.%x.%x\n" "#808080 Model# %s", - dateTimeController.Day(), - static_cast<uint8_t>(dateTimeController.Month()), dateTimeController.Year(), + static_cast<uint8_t>(dateTimeController.Month()), + dateTimeController.Day(), dateTimeController.Hours(), dateTimeController.Minutes(), dateTimeController.Seconds(), diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index c899648c038db2f7ec5a6267a0e24623739160e9..f5490b44a4d3512d1f40375bb3da55090414870e 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -149,7 +149,7 @@ } } if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) { - lv_label_set_text_fmt(label_date, "[DATE]#007fff %04d.%02d.%02d#", short(year), char(month), char(day)); + lv_label_set_text_fmt(label_date, "[DATE]#007fff %04d-%02d-%02d#", short(year), char(month), char(day)); currentYear = year; currentMonth = month;