resolve merge conflicts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good

This commit is contained in:
2023-02-08 13:40:03 +01:00
parent 80f48acb07
commit da166c7bc3
3 changed files with 23 additions and 44 deletions

View File

@ -157,7 +157,7 @@ bool GpsHyperionLinuxController::readGpsDataFromGpsd() {
}
};
// GPS is off, no point in reading data from GPSD.
if(mode == MODE_OFF) {
if (mode == MODE_OFF) {
return false;
}
if (readMode == ReadModes::SOCKET) {