diff options
author | Jean-François Milants <jf@codingfield.com> | 2022-02-13 11:23:20 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2022-02-13 11:23:20 +0100 |
commit | e332be0d7c1eabda8c296d38b57bfcd47a456772 (patch) | |
tree | 7d7586810c062d8fac37f16f208f6da77757a3ba /src/components/datetime/DateTimeController.cpp | |
parent | d967efa19710f85cee846c59adbbe07d2a2189dc (diff) | |
parent | 87d882b151acc7ef60fdb1a957649faf39e737c1 (diff) |
Merge branch 'mruss77-statusBarTimeFormat' into develop
Diffstat (limited to 'src/components/datetime/DateTimeController.cpp')
-rw-r--r-- | src/components/datetime/DateTimeController.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 97ccbe38..e0d12431 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -11,6 +11,9 @@ namespace { char const* MonthsStringLow[] = {"--", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; } +DateTime::DateTime(Controllers::Settings& settingsController) : settingsController {settingsController} { +} + void DateTime::SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t) { this->currentDateTime = t; UpdateTime(previousSystickCounter); // Update internal state without updating the time @@ -120,3 +123,24 @@ const char* DateTime::MonthShortToStringLow(Months month) { void DateTime::Register(Pinetime::System::SystemTask* systemTask) { this->systemTask = systemTask; } + +using ClockType = Pinetime::Controllers::Settings::ClockType; +std::string DateTime::FormattedTime() { + // Return time as a string in 12- or 24-hour format + char buff[9]; + if (settingsController.GetClockType() == ClockType::H12) { + uint8_t hour12; + const char* amPmStr; + if (hour < 12) { + hour12 = (hour == 0) ? 12 : hour; + amPmStr = "AM"; + } else { + hour12 = (hour == 12) ? 12 : hour - 12; + amPmStr = "PM"; + } + sprintf(buff, "%i:%02i %s", hour12, minute, amPmStr); + } else { + sprintf(buff, "%02i:%02i", hour, minute); + } + return std::string(buff); +} |