eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
Conversation 0 Commits 592 Files Changed 218 +13 -1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ae9e539a6 - Show all commits

7
bsp_q7s/core/CoreController.cpp
View File

@ -16,6 +16,7 @@
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <algorithm> #include <algorithm>
#include <filesystem> #include <filesystem>
@ -1730,6 +1731,12 @@ ReturnValue_t CoreController::initClockFromTimeFile() {
if (iss.bad() or *checkPtr) { if (iss.bad() or *checkPtr) {
return RETURN_FAILED; return RETURN_FAILED;
} }
#if OBSW_VERBOSE_LEVEL >= 1
time_t timeRaw = currentTime.tv_sec;
std::tm *time = std::gmtime(&timeRaw);
sif::info << "Setting system time from time files: " << std::put_time(time, "%c %Z")
<< std::endl;
#endif
return Clock::setClock(&currentTime); return Clock::setClock(&currentTime);
} }
return RETURN_OK; return RETURN_OK;

7
linux/devices/GPSHyperionLinuxController.cpp
View File

@ -192,7 +192,12 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
} }
if (timeInit and validFix) { if (timeInit and validFix) {
if (not utility::timeSanityCheck()) { if (not utility::timeSanityCheck()) {
sif::info << "Setting init clock in gps ctrl" << std::endl; #if OBSW_VERBOSE_LEVEL >= 1
time_t timeRaw = time.tv_sec;
std::tm *time = std::gmtime(&timeRaw);
sif::info << "Setting invalid system time from GPS data directly: "
<< std::put_time(time, "%c %Z") << std::endl;
#endif
// For some reason, the clock needs to be somewhat correct for NTP to work. Really dumb.. // For some reason, the clock needs to be somewhat correct for NTP to work. Really dumb..
Clock::setClock(&time); Clock::setClock(&time);
} }