diff options
author | Mark Russell <mruss660@gmail.com> | 2021-11-10 20:11:09 -0500 |
---|---|---|
committer | Mark Russell <mruss660@gmail.com> | 2021-11-10 20:11:09 -0500 |
commit | 947ece0bc9ad90dd4c1fcd5875594a4a48eddd56 (patch) | |
tree | b67bd4a49c0d487c306a461fe409cf7adba1dd8c /src/components/datetime/DateTimeController.cpp | |
parent | 755ab72495b16bbe4cc64c33833c7cc30b815ca0 (diff) |
Status bar displays time in 12 or 24 hour format based on settings
Diffstat (limited to 'src/components/datetime/DateTimeController.cpp')
-rw-r--r-- | src/components/datetime/DateTimeController.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index e9c5d870..49b3e75e 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 @@ -101,3 +104,23 @@ 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); +} |