From 92eae39a1b83d5f667dbcc3c9f9b7798cf41010e Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Thu, 29 Aug 2024 05:39:30 -0500 Subject: [PATCH] Move Time set from system to main (#4583) --- src/main.cpp | 6 ++++++ src/platform/portduino/PortduinoGlue.cpp | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index d38b4e669..b73d9803b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -257,6 +257,12 @@ void setup() #ifdef DEBUG_PORT consoleInit(); // Set serial baud rate and init our mesh console +#endif +#if ARCH_PORTDUINO + struct timeval tv; + tv.tv_sec = time(NULL); + tv.tv_usec = 0; + perhapsSetRTC(RTCQualityNTP, &tv); #endif powerMonInit(); diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index cce893c0b..dc143c661 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -1,6 +1,5 @@ #include "CryptoEngine.h" #include "PortduinoGPIO.h" -#include "RTC.h" #include "SPIChip.h" #include "mesh/RF95Interface.h" #include "sleep.h" @@ -8,7 +7,6 @@ #include #include -#include #include "PortduinoGlue.h" #include "linux/gpio/LinuxGPIOPin.h" @@ -372,11 +370,6 @@ void portduinoSetup() } } - struct timeval tv; - tv.tv_sec = time(NULL); - tv.tv_usec = 0; - perhapsSetRTC(RTCQualityNTP, &tv); - return; }