From 43497b399faca19363a1a9565611c15e11992998 Mon Sep 17 00:00:00 2001 From: Marius Eggert Date: Wed, 12 Oct 2022 15:18:07 +0200 Subject: [PATCH] enabled processGps --- mission/controller/acs/SensorProcessing.cpp | 4 ++-- mission/controller/acs/SensorValues.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mission/controller/acs/SensorProcessing.cpp b/mission/controller/acs/SensorProcessing.cpp index 93b9eb47..dc930fc8 100644 --- a/mission/controller/acs/SensorProcessing.cpp +++ b/mission/controller/acs/SensorProcessing.cpp @@ -447,8 +447,8 @@ void SensorProcessing::process(timeval now, ACS::SensorValues *sensorValues, ACS::OutputValues *outputValues, const AcsParameters *acsParameters) { sensorValues->update(); - // processGps(sensorValues->gps0latitude, sensorValues->gps0longitude, sensorValues->gps0Valid, - // &outputValues->gcLatitude, &outputValues->gdLongitude); + processGps(sensorValues->gpsSet.latitude.value, sensorValues->gpsSet.longitude.value, + sensorValues->gpsSet.isValid(), &outputValues->gcLatitude, &outputValues->gdLongitude); outputValues->mgmUpdated = processMgm( sensorValues->mgm0Lis3Set.fieldStrengths.value, diff --git a/mission/controller/acs/SensorValues.cpp b/mission/controller/acs/SensorValues.cpp index 1492ad6e..acc6f3eb 100644 --- a/mission/controller/acs/SensorValues.cpp +++ b/mission/controller/acs/SensorValues.cpp @@ -82,6 +82,7 @@ ReturnValue_t SensorValues::update() { ReturnValue_t susUpdate = updateSus(); ReturnValue_t gyrUpdate = updateGyr(); ReturnValue_t strUpdate = updateStr(); + if ((mgmUpdate && susUpdate && gyrUpdate && strUpdate) == returnvalue::FAILED) { return returnvalue::FAILED; };