will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with develop and fix conflicts from timaios:set-datetime-manually.

Browse Source
This commit is contained in:
Jean-François Milants
2021-10-10 16:01:43 +02:00
parent 977faebcb8 3e9c30a18f
commit cf9e149b33
10 changed files with 508 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/datetime/DateTimeController.h
View File

@@ -66,6 +66,14 @@ namespace Pinetime {
const char* DayOfWeekToStringLow();
const char* DayOfWeekShortToStringLow();
static const char* MonthShortToString(Months month);
static const char* MonthShortToStringLow(Months month);
static const char* MonthsToStringLow(Months month);
static const char* DayOfWeekToString(Days dayOfWeek);
static const char* DayOfWeekShortToString(Days dayOfWeek);
static const char* DayOfWeekToStringLow(Days dayOfWeek);
static const char* DayOfWeekShortToStringLow(Days dayOfWeek);
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
return currentDateTime;
}
@@ -101,4 +109,4 @@ namespace Pinetime {
static char const* MonthsLow[];
};
}
}
}