Skip to content

Commit 7cbd568

Browse files
committed
DateTimeController : remove unused methods and variables.
1 parent cf9e149 commit 7cbd568

2 files changed

Lines changed: 9 additions & 81 deletions

File tree

src/components/datetime/DateTimeController.cpp

Lines changed: 9 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55

66
using namespace Pinetime::Controllers;
77

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+
814
void DateTime::SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t) {
915
this->currentDateTime = t;
1016
UpdateTime(previousSystickCounter); // Update internal state without updating the time
@@ -80,76 +86,18 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
8086
}
8187

8288
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)];
9690
}
9791

9892
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)];
11294
}
11395

11496
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)];
13698
}
13799

138100
void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
139101
this->systemTask = systemTask;
140102
}
141103

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"};

src/components/datetime/DateTimeController.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,8 @@ namespace Pinetime {
5959
}
6060

6161
const char* MonthShortToString();
62-
const char* MonthShortToStringLow();
63-
const char* MonthsToStringLow();
64-
const char* DayOfWeekToString();
6562
const char* DayOfWeekShortToString();
66-
const char* DayOfWeekToStringLow();
67-
const char* DayOfWeekShortToStringLow();
68-
69-
static const char* MonthShortToString(Months month);
7063
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);
7664

7765
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
7866
return currentDateTime;
@@ -99,14 +87,6 @@ namespace Pinetime {
9987

10088
bool isMidnightAlreadyNotified = false;
10189
System::SystemTask* systemTask = nullptr;
102-
103-
static char const* DaysString[];
104-
static char const* DaysStringShort[];
105-
static char const* DaysStringLow[];
106-
static char const* DaysStringShortLow[];
107-
static char const* MonthsString[];
108-
static char const* MonthsStringLow[];
109-
static char const* MonthsLow[];
11090
};
11191
}
11292
}

0 commit comments

Comments
 (0)