Skip to content

Commit 899bee2

Browse files
committed
Exposed Month and DayOfWeek texts in DateTimeController
Added static methods to return the text of a given month or dayOfWeek.
1 parent 06dfe14 commit 899bee2

2 files changed

Lines changed: 45 additions & 9 deletions

File tree

src/components/datetime/DateTimeController.cpp

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,31 +75,59 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
7575
}
7676

7777
const char* DateTime::MonthShortToString() {
78-
return DateTime::MonthsString[(uint8_t) month];
78+
return DateTime::MonthsString[static_cast<uint8_t>(month)];
7979
}
8080

8181
const char* DateTime::MonthShortToStringLow() {
82-
return DateTime::MonthsStringLow[(uint8_t) month];
82+
return DateTime::MonthsStringLow[static_cast<uint8_t>(month)];
8383
}
8484

8585
const char* DateTime::MonthsToStringLow() {
86-
return DateTime::MonthsLow[(uint8_t) month];
86+
return DateTime::MonthsLow[static_cast<uint8_t>(month)];
8787
}
8888

8989
const char* DateTime::DayOfWeekToString() {
90-
return DateTime::DaysString[(uint8_t) dayOfWeek];
90+
return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)];
9191
}
9292

9393
const char* DateTime::DayOfWeekShortToString() {
94-
return DateTime::DaysStringShort[(uint8_t) dayOfWeek];
94+
return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)];
9595
}
9696

9797
const char* DateTime::DayOfWeekToStringLow() {
98-
return DateTime::DaysStringLow[(uint8_t) dayOfWeek];
98+
return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)];
9999
}
100100

101101
const char* DateTime::DayOfWeekShortToStringLow() {
102-
return DateTime::DaysStringShortLow[(uint8_t) dayOfWeek];
102+
return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)];
103+
}
104+
105+
const char* DateTime::MonthShortToString(Months month) {
106+
return DateTime::MonthsString[static_cast<uint8_t>(month)];
107+
}
108+
109+
const char* DateTime::MonthShortToStringLow(Months month) {
110+
return DateTime::MonthsStringLow[static_cast<uint8_t>(month)];
111+
}
112+
113+
const char* DateTime::MonthsToStringLow(Months month) {
114+
return DateTime::MonthsLow[static_cast<uint8_t>(month)];
115+
}
116+
117+
const char* DateTime::DayOfWeekToString(Days dayOfWeek) {
118+
return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)];
119+
}
120+
121+
const char* DateTime::DayOfWeekShortToString(Days dayOfWeek) {
122+
return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)];
123+
}
124+
125+
const char* DateTime::DayOfWeekToStringLow(Days dayOfWeek) {
126+
return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)];
127+
}
128+
129+
const char* DateTime::DayOfWeekShortToStringLow(Days dayOfWeek) {
130+
return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)];
103131
}
104132

105133
void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
@@ -119,4 +147,4 @@ char const* DateTime::MonthsString[] = {"--", "JAN", "FEB", "MAR", "APR", "MAY",
119147
char const* DateTime::MonthsStringLow[] = {"--", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
120148

121149
char const* DateTime::MonthsLow[] = {
122-
"--", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
150+
"--", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};

src/components/datetime/DateTimeController.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ namespace Pinetime {
6666
const char* DayOfWeekToStringLow();
6767
const char* DayOfWeekShortToStringLow();
6868

69+
static const char* MonthShortToString(Months month);
70+
static const char* MonthShortToStringLow(Months month);
71+
static const char* MonthsToStringLow(Months month);
72+
static const char* DayOfWeekToString(Days dayOfWeek);
73+
static const char* DayOfWeekShortToString(Days dayOfWeek);
74+
static const char* DayOfWeekToStringLow(Days dayOfWeek);
75+
static const char* DayOfWeekShortToStringLow(Days dayOfWeek);
76+
6977
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
7078
return currentDateTime;
7179
}
@@ -100,4 +108,4 @@ namespace Pinetime {
100108
static char const* MonthsLow[];
101109
};
102110
}
103-
}
111+
}

0 commit comments

Comments
 (0)