dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

estimator: Fix local variable compile warnings.

This commit is contained in:
Lorenz Meier 2014-06-29 12:59:04 +02:00
parent 2b32414709
commit 0426fd3a52
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/ekf_att_pos_estimator/estimator_23states.cpp
View File

@ -1760,21 +1760,21 @@ int AttPosEKF::RecallStates(float* statesForFusion, uint64_t msec)
int64_t bestTimeDelta = 200; int64_t bestTimeDelta = 200;
unsigned bestStoreIndex = 0; unsigned bestStoreIndex = 0;
for (unsigned storeIndex = 0; storeIndex < data_buffer_size; storeIndex++) for (unsigned storeIndexLocal = 0; storeIndexLocal < data_buffer_size; storeIndexLocal++)
{ {
// Work around a GCC compiler bug - we know 64bit support on ARM is // Work around a GCC compiler bug - we know 64bit support on ARM is
// sketchy in GCC. // sketchy in GCC.
uint64_t timeDelta; uint64_t timeDelta;
if (msec > statetimeStamp[storeIndex]) { if (msec > statetimeStamp[storeIndexLocal]) {
timeDelta = msec - statetimeStamp[storeIndex]; timeDelta = msec - statetimeStamp[storeIndexLocal];
} else { } else {
timeDelta = statetimeStamp[storeIndex] - msec; timeDelta = statetimeStamp[storeIndexLocal] - msec;
} }
if (timeDelta < bestTimeDelta) if (timeDelta < (uint64_t)bestTimeDelta)
{ {
bestStoreIndex = storeIndex; bestStoreIndex = storeIndexLocal;
bestTimeDelta = timeDelta; bestTimeDelta = timeDelta;
} }
} }