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

more useful printout
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-04-08 11:40:35 +02:00
parent 351920aa7b
commit 6ae9e539a6
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bsp_q7s/core/CoreController.cpp
View File

@ -16,6 +16,7 @@
#endif
#include <fcntl.h>
#include <unistd.h>
#include <algorithm>
#include <filesystem>
@ -1730,6 +1731,12 @@ ReturnValue_t CoreController::initClockFromTimeFile() {
if (iss.bad() or *checkPtr) {
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 RETURN_OK;

7
linux/devices/GPSHyperionLinuxController.cpp
View File

@ -192,7 +192,12 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
}
if (timeInit and validFix) {
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..
Clock::setClock(&time);
}