|
5 | 5 |
|
6 | 6 | using namespace Pinetime::Controllers; |
7 | 7 |
|
| 8 | +namespace { |
| 9 | + char const* DaysStringShort[] = {"--", "MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"}; |
| 10 | + char const* MonthsString[] = {"--", "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"}; |
| 11 | + char const* MonthsStringLow[] = {"--", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; |
| 12 | +} |
| 13 | + |
8 | 14 | void DateTime::SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t) { |
9 | 15 | this->currentDateTime = t; |
10 | 16 | UpdateTime(previousSystickCounter); // Update internal state without updating the time |
@@ -80,76 +86,18 @@ void DateTime::UpdateTime(uint32_t systickCounter) { |
80 | 86 | } |
81 | 87 |
|
82 | 88 | const char* DateTime::MonthShortToString() { |
83 | | - return DateTime::MonthsString[static_cast<uint8_t>(month)]; |
84 | | -} |
85 | | - |
86 | | -const char* DateTime::MonthShortToStringLow() { |
87 | | - return DateTime::MonthsStringLow[static_cast<uint8_t>(month)]; |
88 | | -} |
89 | | - |
90 | | -const char* DateTime::MonthsToStringLow() { |
91 | | - return DateTime::MonthsLow[static_cast<uint8_t>(month)]; |
92 | | -} |
93 | | - |
94 | | -const char* DateTime::DayOfWeekToString() { |
95 | | - return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)]; |
| 89 | + return MonthsString[static_cast<uint8_t>(month)]; |
96 | 90 | } |
97 | 91 |
|
98 | 92 | const char* DateTime::DayOfWeekShortToString() { |
99 | | - return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)]; |
100 | | -} |
101 | | - |
102 | | -const char* DateTime::DayOfWeekToStringLow() { |
103 | | - return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)]; |
104 | | -} |
105 | | - |
106 | | -const char* DateTime::DayOfWeekShortToStringLow() { |
107 | | - return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)]; |
108 | | -} |
109 | | - |
110 | | -const char* DateTime::MonthShortToString(Months month) { |
111 | | - return DateTime::MonthsString[static_cast<uint8_t>(month)]; |
| 93 | + return DaysStringShort[static_cast<uint8_t>(dayOfWeek)]; |
112 | 94 | } |
113 | 95 |
|
114 | 96 | const char* DateTime::MonthShortToStringLow(Months month) { |
115 | | - return DateTime::MonthsStringLow[static_cast<uint8_t>(month)]; |
116 | | -} |
117 | | - |
118 | | -const char* DateTime::MonthsToStringLow(Months month) { |
119 | | - return DateTime::MonthsLow[static_cast<uint8_t>(month)]; |
120 | | -} |
121 | | - |
122 | | -const char* DateTime::DayOfWeekToString(Days dayOfWeek) { |
123 | | - return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)]; |
124 | | -} |
125 | | - |
126 | | -const char* DateTime::DayOfWeekShortToString(Days dayOfWeek) { |
127 | | - return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)]; |
128 | | -} |
129 | | - |
130 | | -const char* DateTime::DayOfWeekToStringLow(Days dayOfWeek) { |
131 | | - return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)]; |
132 | | -} |
133 | | - |
134 | | -const char* DateTime::DayOfWeekShortToStringLow(Days dayOfWeek) { |
135 | | - return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)]; |
| 97 | + return MonthsStringLow[static_cast<uint8_t>(month)]; |
136 | 98 | } |
137 | 99 |
|
138 | 100 | void DateTime::Register(Pinetime::System::SystemTask* systemTask) { |
139 | 101 | this->systemTask = systemTask; |
140 | 102 | } |
141 | 103 |
|
142 | | -char const* DateTime::DaysStringLow[] = {"--", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"}; |
143 | | - |
144 | | -char const* DateTime::DaysStringShortLow[] = {"--", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"}; |
145 | | - |
146 | | -char const* DateTime::DaysStringShort[] = {"--", "MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"}; |
147 | | - |
148 | | -char const* DateTime::DaysString[] = {"--", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"}; |
149 | | - |
150 | | -char const* DateTime::MonthsString[] = {"--", "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"}; |
151 | | - |
152 | | -char const* DateTime::MonthsStringLow[] = {"--", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; |
153 | | - |
154 | | -char const* DateTime::MonthsLow[] = { |
155 | | - "--", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}; |
0 commit comments