Better way

Author: pipe01

src/components/datetime/DateTimeController.cpp

@@ -14,24 +14,12 @@ namespace {
   constexpr const char* const MonthsString[] = {"--", "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"};
   constexpr const char* const MonthsStringLow[] =
     {"--", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
-  constexpr int compileTimeAtoi(const char* str) {
-    int result = 0;
-    while (*str >= '0' && *str <= '9') {
-      result = result * 10 + *str - '0';
-      str++;
-    }
-    return result;
-  }
 }
 
 DateTime::DateTime(Controllers::Settings& settingsController) : settingsController {settingsController} {
   mutex = xSemaphoreCreateMutex();
   ASSERT(mutex != nullptr);
   xSemaphoreGive(mutex);
-
-  // __DATE__ is a string of the format "MMM DD YYYY", so an offset of 7 gives the start of the year
-  SetTime(compileTimeAtoi(&__DATE__[7]), 1, 1, 0, 0, 0, false);
 }
 
 void DateTime::SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t) {
@@ -41,7 +29,7 @@ void DateTime::SetCurrentTime(std::chrono::time_point<std::chrono::system_clock,
   xSemaphoreGive(mutex);
 }
 
-void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, bool log) {
+void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second) {
   std::tm tm = {
     /* .tm_sec  = */ second,
     /* .tm_min  = */ minute,
@@ -51,10 +39,8 @@ void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour,
     /* .tm_year = */ year - 1900,
   };
 
-  if (log) {
-    NRF_LOG_INFO("%d %d %d ", day, month, year);
-    NRF_LOG_INFO("%d %d %d ", hour, minute, second);
-  }
+  NRF_LOG_INFO("%d %d %d ", day, month, year);
+  NRF_LOG_INFO("%d %d %d ", hour, minute, second);
 
   tm.tm_isdst = -1; // Use DST value from local time zone
 

src/components/datetime/DateTimeController.h

@@ -34,7 +34,7 @@ namespace Pinetime {
         December
       };
 
-      void SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, bool log = true);
+      void SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second);
 
       /*
        * setter corresponding to the BLE Set Local Time characteristic.

src/main.cpp

@@ -47,6 +47,7 @@
 #include "systemtask/SystemTask.h"
 #include "touchhandler/TouchHandler.h"
 #include "buttonhandler/ButtonHandler.h"
+#include "utility/Math.h"
 
 #if NRF_LOG_ENABLED
   #include "logging/NrfLogger.h"
@@ -355,6 +356,9 @@ int main() {
   if (NoInit_MagicWord == NoInit_MagicValue) {
     dateTimeController.SetCurrentTime(NoInit_BackUpTime);
   } else {
+    // __DATE__ is a string of the format "MMM DD YYYY", so an offset of 7 gives the start of the year
+    dateTimeController.SetTime(Pinetime::Utility::compileTimeAtoi(&__DATE__[7]), 1, 1, 0, 0, 0);
+
     // Clear Memory to known state
     memset(&__start_noinit_data, 0, (uintptr_t) &__stop_noinit_data - (uintptr_t) &__start_noinit_data);
     NoInit_MagicWord = NoInit_MagicValue;

src/utility/Math.h

@@ -29,5 +29,14 @@ namespace Pinetime {
       }
       return res;
     }
+
+    constexpr int compileTimeAtoi(const char* str) {
+      int result = 0;
+      while (*str >= '0' && *str <= '9') {
+        result = result * 10 + *str - '0';
+        str++;
+      }
+      return result;
+    }
   }
 }