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

1 files changed, 9 insertions, 1 deletions

diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index 061c303f..c5f218d8 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
+}