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

2 files changed, 38 insertions, 2 deletions

diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index 0756d38..26b69a2 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@@ -107,6 +107,34 @@ const char* DateTime::DayOfWeekShortToStringLow() {
   return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)];
 }
 
+const char* DateTime::MonthShortToString(Months month) {
+  return DateTime::MonthsString[static_cast<uint8_t>(month)];
+}
+
+const char* DateTime::MonthShortToStringLow(Months month) {
+  return DateTime::MonthsStringLow[static_cast<uint8_t>(month)];
+}
+
+const char* DateTime::MonthsToStringLow(Months month) {
+  return DateTime::MonthsLow[static_cast<uint8_t>(month)];
+}
+
+const char* DateTime::DayOfWeekToString(Days dayOfWeek) {
+  return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)];
+}
+
+const char* DateTime::DayOfWeekShortToString(Days dayOfWeek) {
+  return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)];
+}
+
+const char* DateTime::DayOfWeekToStringLow(Days dayOfWeek) {
+  return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)];
+}
+
+const char* DateTime::DayOfWeekShortToStringLow(Days dayOfWeek) {
+  return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)];
+}
+
 void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
   this->systemTask = systemTask;
 }
@@ -124,4 +152,4 @@ char const* DateTime::MonthsString[] = {"--", "JAN", "FEB", "MAR", "APR", "MAY",
 char const* DateTime::MonthsStringLow[] = {"--", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
 char const* DateTime::MonthsLow[] = {
-  "--", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
\ No newline at end of file
+  "--", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index 061c303..c5f218d 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/src/components/datetime/DateTimeController.h
@@ -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[];
     };
   }
-}
\ No newline at end of file
+}