Fix timestamp and fsm date

2 files changed, 20 insertions, 5 deletions

diff --git a/src/common/src/Core/common.c b/src/common/src/Core/common.c
index 2077a16..d04987a 100644
--- a/src/common/src/Core/common.c
+++ b/src/common/src/Core/common.c
@@ -26,9 +26,10 @@
 #include "GPIO/usart.h"
 #include "FreeRTOS.h"
 #include "timers.h"
-/* #include "Core/gps.h" */
+#include "GPS/gps.h"
 #include <time.h>
 
+
 static uint64_t common_timestamp = 0; // milliseconds since startup
 static TimerHandle_t common_timer;
 
@@ -38,6 +39,11 @@ static uint16_t lfsr;
 
 static void common_increase_timestamp(TimerHandle_t t);
 
+
+#ifdef SIMULATOR
+long timestamp_delta = 0;
+#endif
+
 int find_last_sunday(const struct tm* time) {
     struct tm t = *time;
 
@@ -157,11 +163,20 @@ void common_init(void)
 
 static void common_increase_timestamp(TimerHandle_t t)
 {
-    common_timestamp++;
 
 #ifdef SIMULATOR
-    //Simulator rate is 100ticks/s
-    common_timestamp += 9;
+    struct timespec ctime;
+
+    clock_gettime(CLOCK_REALTIME, &ctime);
+    common_timestamp = ctime.tv_sec * 1000 + ctime.tv_nsec / 1.0e6 - timestamp_delta;
+
+    if (timestamp_delta == 0) {
+        timestamp_delta = common_timestamp;
+        common_timestamp = 0;
+    }
+
+#else
+    common_timestamp++;
 #endif
 }
 
diff --git a/src/simulator/src/Core/fsm.c b/src/simulator/src/Core/fsm.c
index ec17e56..6f771c2 100644
--- a/src/simulator/src/Core/fsm.c
+++ b/src/simulator/src/Core/fsm.c
@@ -17,7 +17,7 @@ void fsm_state_switched(char * new_state) {
 
 
     time_t now = time(NULL);
-    struct tm *t = gmtime(&now);
+    struct tm *t = localtime(&now);
 
     gui_last_fsm_states[0] = new_state;
     gui_last_fsm_states_timestamps[0] = t->tm_hour * 10000 + t->tm_min * 100 + t->tm_sec;