diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
commit | cf9e149b33885c67c84697a9b422e123c090bc72 (patch) | |
tree | c59c322655180d670ebaa3a47e9686eaada5eff7 /src/components/datetime/DateTimeController.cpp | |
parent | 977faebcb8b26212e0868b30e1af5c38076ff6cb (diff) | |
parent | 3e9c30a18fb0a0fa7cc69e62821ca0d11e518f47 (diff) |
Merge with develop and fix conflicts from timaios:set-datetime-manually.
Diffstat (limited to 'src/components/datetime/DateTimeController.cpp')
-rw-r--r-- | src/components/datetime/DateTimeController.cpp | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 0756d38d..26b69a27 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -107,6 +107,34 @@ const char* DateTime::DayOfWeekShortToStringLow() { return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)]; } +const char* DateTime::MonthShortToString(Months month) { + return DateTime::MonthsString[static_cast<uint8_t>(month)]; +} + +const char* DateTime::MonthShortToStringLow(Months month) { + return DateTime::MonthsStringLow[static_cast<uint8_t>(month)]; +} + +const char* DateTime::MonthsToStringLow(Months month) { + return DateTime::MonthsLow[static_cast<uint8_t>(month)]; +} + +const char* DateTime::DayOfWeekToString(Days dayOfWeek) { + return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)]; +} + +const char* DateTime::DayOfWeekShortToString(Days dayOfWeek) { + return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)]; +} + +const char* DateTime::DayOfWeekToStringLow(Days dayOfWeek) { + return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)]; +} + +const char* DateTime::DayOfWeekShortToStringLow(Days dayOfWeek) { + return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)]; +} + void DateTime::Register(Pinetime::System::SystemTask* systemTask) { this->systemTask = systemTask; } @@ -124,4 +152,4 @@ char const* DateTime::MonthsString[] = {"--", "JAN", "FEB", "MAR", "APR", "MAY", char const* DateTime::MonthsStringLow[] = {"--", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; char const* DateTime::MonthsLow[] = { - "--", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
\ No newline at end of file + "--", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}; |