This commit is contained in:
parent
84fc44fd5f
commit
43497b399f
@ -447,8 +447,8 @@ void SensorProcessing::process(timeval now, ACS::SensorValues *sensorValues,
|
|||||||
ACS::OutputValues *outputValues,
|
ACS::OutputValues *outputValues,
|
||||||
const AcsParameters *acsParameters) {
|
const AcsParameters *acsParameters) {
|
||||||
sensorValues->update();
|
sensorValues->update();
|
||||||
// processGps(sensorValues->gps0latitude, sensorValues->gps0longitude, sensorValues->gps0Valid,
|
processGps(sensorValues->gpsSet.latitude.value, sensorValues->gpsSet.longitude.value,
|
||||||
// &outputValues->gcLatitude, &outputValues->gdLongitude);
|
sensorValues->gpsSet.isValid(), &outputValues->gcLatitude, &outputValues->gdLongitude);
|
||||||
|
|
||||||
outputValues->mgmUpdated = processMgm(
|
outputValues->mgmUpdated = processMgm(
|
||||||
sensorValues->mgm0Lis3Set.fieldStrengths.value,
|
sensorValues->mgm0Lis3Set.fieldStrengths.value,
|
||||||
|
@ -82,6 +82,7 @@ ReturnValue_t SensorValues::update() {
|
|||||||
ReturnValue_t susUpdate = updateSus();
|
ReturnValue_t susUpdate = updateSus();
|
||||||
ReturnValue_t gyrUpdate = updateGyr();
|
ReturnValue_t gyrUpdate = updateGyr();
|
||||||
ReturnValue_t strUpdate = updateStr();
|
ReturnValue_t strUpdate = updateStr();
|
||||||
|
|
||||||
if ((mgmUpdate && susUpdate && gyrUpdate && strUpdate) == returnvalue::FAILED) {
|
if ((mgmUpdate && susUpdate && gyrUpdate && strUpdate) == returnvalue::FAILED) {
|
||||||
return returnvalue::FAILED;
|
return returnvalue::FAILED;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user