From 11014b678edb6b381b09a82192e178a68164df6f Mon Sep 17 00:00:00 2001
From: Felipe Martinez <felipe@pipe01.net>
Date: Mon, 29 Dec 2025 23:02:50 +0100
Subject: [PATCH 1/4] Fix DateTime::SetTime logging before initialized

---
 src/components/datetime/DateTimeController.cpp | 10 ++++++----
 src/components/datetime/DateTimeController.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index 2ef0ef22f1..c309968eb5 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@@ -31,7 +31,7 @@ DateTime::DateTime(Controllers::Settings& settingsController) : settingsControll
   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);
+  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 +41,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) {
+void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, bool log) {
   std::tm tm = {
     /* .tm_sec  = */ second,
     /* .tm_min  = */ minute,
@@ -51,8 +51,10 @@ void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour,
     /* .tm_year = */ year - 1900,
   };
 
-  NRF_LOG_INFO("%d %d %d ", day, month, year);
-  NRF_LOG_INFO("%d %d %d ", hour, minute, second);
+  if (log) {
+    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
 
diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index 33fef6be09..ffa950fdfc 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/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);
+      void SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, bool log = true);
 
       /*
        * setter corresponding to the BLE Set Local Time characteristic.

From 34b2c8722c59bc9f729e40d4a26eb7b894fdefc1 Mon Sep 17 00:00:00 2001
From: Felipe Martinez <felipe@pipe01.net>
Date: Tue, 30 Dec 2025 02:31:11 +0100
Subject: [PATCH 2/4] Better way

---
 .../datetime/DateTimeController.cpp           | 20 +++----------------
 src/components/datetime/DateTimeController.h  |  2 +-
 src/main.cpp                                  |  4 ++++
 src/utility/Math.h                            |  9 +++++++++
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index c309968eb5..63038636d3 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/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
 
diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index ffa950fdfc..33fef6be09 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/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.
diff --git a/src/main.cpp b/src/main.cpp
index d0ab3e4887..fe1ee8b134 100644
--- a/src/main.cpp
+++ b/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;
diff --git a/src/utility/Math.h b/src/utility/Math.h
index 314e4e373e..ac27585b66 100644
--- a/src/utility/Math.h
+++ b/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;
+    }
   }
 }

From 7e52d6ffb469e15d5d0574feaaaba410f52d4988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADnez?= <felipe@pipe01.net>
Date: Wed, 31 Dec 2025 18:40:34 +0100
Subject: [PATCH 3/4] Update src/utility/Math.h

Co-authored-by: mark9064 <30447455+mark9064@users.noreply.github.com>
---
 src/utility/Math.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utility/Math.h b/src/utility/Math.h
index ac27585b66..3c65303c32 100644
--- a/src/utility/Math.h
+++ b/src/utility/Math.h
@@ -30,7 +30,7 @@ namespace Pinetime {
       return res;
     }
 
-    constexpr int compileTimeAtoi(const char* str) {
+    constexpr int CompileTimeAtoi(const char* str) {
       int result = 0;
       while (*str >= '0' && *str <= '9') {
         result = result * 10 + *str - '0';

From f2be81ef16ed37b3712f27fab85132e5458eba16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADnez?= <felipe@pipe01.net>
Date: Wed, 31 Dec 2025 18:41:07 +0100
Subject: [PATCH 4/4] Fix function name casing in SetTime call

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index fe1ee8b134..b178934a41 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -357,7 +357,7 @@ int main() {
     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);
+    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);