From 8fbab678b3fbaa64c73b435de93b6f3013def40c Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Thu, 6 May 2021 18:30:15 +0200
Subject: [PATCH] Add D_TIMESTAMP to lang.h

---
 src/hasp_debug.cpp |  6 +++---
 src/lang/lang.h    | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp
index 85383777..12fe6258 100644
--- a/src/hasp_debug.cpp
+++ b/src/hasp_debug.cpp
@@ -66,7 +66,7 @@ static void debugPrintTimestamp(int level, Print* _logOutput)
         unsigned long int milli = curTime.tv_usec / 1000;
         char buffer[24];
         // strftime(buffer, sizeof(buffer), "[%b %d %H:%M:%S", timeinfo); // Literal String
-        strftime(buffer, sizeof(buffer), "[%H:%M:%S", timeinfo); // Literal String
+        strftime(buffer, sizeof(buffer), "[" D_TIMESTAMP, timeinfo); // Literal String
 
 #ifdef ARDUINO
         _logOutput->printf(PSTR("%s.%03lu]"), buffer, milli);
@@ -78,9 +78,9 @@ static void debugPrintTimestamp(int level, Print* _logOutput)
 
         uint32_t msecs = millis();
 #ifdef ARDUINO
-        _logOutput->printf(PSTR("[%15d.%03d]"), msecs / 1000, msecs % 1000);
+        _logOutput->printf(PSTR("[" D_TIME_MILLIS ".%03d]"), msecs / 1000, msecs % 1000);
 #else
-        debug_print(_logOutput, PSTR("[%15d.%03d]"), msecs / 1000, msecs % 1000);
+        debug_print(_logOutput, PSTR("[" D_TIME_MILLIS ".%03d]"), msecs / 1000, msecs % 1000);
 #endif
     }
 }
diff --git a/src/lang/lang.h b/src/lang/lang.h
index 74b95923..7be7e779 100644
--- a/src/lang/lang.h
+++ b/src/lang/lang.h
@@ -2,12 +2,12 @@
 #define HASP_LANG_H
 
 #ifndef HASP_LANGUAGE
-  #include "en_US.h"
+#include "en_US.h"
 #else
-  #define QUOTEME(x) QUOTEME_1(x)
-  #define QUOTEME_1(x) #x
-  #define INCLUDE_FILE(x) QUOTEME(x.h)
-  #include INCLUDE_FILE(HASP_LANGUAGE)
+#define QUOTEME(x) QUOTEME_1(x)
+#define QUOTEME_1(x) #x
+#define INCLUDE_FILE(x) QUOTEME(x.h)
+#include INCLUDE_FILE(HASP_LANGUAGE)
 #endif
 
 //  language independent defines
@@ -15,4 +15,7 @@
 #define D_BULLET "    * "
 #define D_MANUFACTURER "openHASP"
 
+#define D_TIMESTAMP "%H:%M:%S" // Used when reference time is set from NTP
+#define D_TIME_MILLIS "%8d"    // Used when no reference clock could be set
+
 #endif
\ No newline at end of file