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

GPS Time Handling #203

Merged
meierj merged 7 commits from mueller/gps-time-update into develop 2022-04-08 13:33:13 +02:00
Conversation 0 Commits 7 Files Changed 17 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 351920aa7b - Show all commits

4
bsp_q7s/core/CoreController.cpp
View File

@ -3,8 +3,6 @@
#include <fsfw/events/EventManager.h> #include <fsfw/events/EventManager.h>
#include <fsfw/ipc/QueueFactory.h> #include <fsfw/ipc/QueueFactory.h>
#include <algorithm>
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "OBSWVersion.h" #include "OBSWVersion.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
@ -18,7 +16,7 @@
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <algorithm>
#include <filesystem> #include <filesystem>
#include "bsp_q7s/memory/SdCardManager.h" #include "bsp_q7s/memory/SdCardManager.h"

2
linux/devices/GPSHyperionLinuxController.cpp
View File

@ -190,7 +190,7 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
} else { } else {
timeIsConstantCounter = 0; timeIsConstantCounter = 0;
} }
if (timeInit) { if (timeInit and validFix) {
if (not utility::timeSanityCheck()) { if (not utility::timeSanityCheck()) {
sif::info << "Setting init clock in gps ctrl" << std::endl; sif::info << "Setting init clock in gps ctrl" << std::endl;
// 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..