diff options
| author | mabuch <marcel.buechler@gmail.com> | 2022-04-18 12:35:31 (GMT) |
|---|---|---|
| committer | mabuch <marcel.buechler@gmail.com> | 2022-04-18 12:35:31 (GMT) |
| commit | 82a4f9aa68c3f8d5f3cfa6de87de078fe680d944 (patch) | |
| tree | cc83c0af796a029f9464003cda043f373b716749 /src/components/datetime/DateTimeController.cpp | |
| parent | ea14c580ca6296cb93facf526d65a2db0e3ff1b0 (diff) | |
| parent | 2607c3d79947e900ce4c5ded296f649677511a34 (diff) | |
resolved merge conflict after renaming PineTimeStyle to WatchFacePineTimeStyle
Diffstat (limited to 'src/components/datetime/DateTimeController.cpp')
| -rw-r--r-- | src/components/datetime/DateTimeController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index e0d1243..3bfbdc7 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -108,11 +108,11 @@ void DateTime::UpdateTime(uint32_t systickCounter) { } } -const char* DateTime::MonthShortToString() { +const char* DateTime::MonthShortToString() const { return MonthsString[static_cast<uint8_t>(month)]; } -const char* DateTime::DayOfWeekShortToString() { +const char* DateTime::DayOfWeekShortToString() const { return DaysStringShort[static_cast<uint8_t>(dayOfWeek)]; } |