fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

EKF: Fix ringbuffer warnings

Browse Source
This commit is contained in:
Lorenz Meier
2015-12-22 17:24:43 +01:00
committed by Roman
parent 5e5d6f432a
commit faf48242ed
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EKF/RingBuffer.h
+5 -4
View File
@@ -76,7 +76,7 @@ public:
inline void push(data_type sample, bool debug = false) inline void push(data_type sample, bool debug = false)
{ {
if (debug) { if (debug) {
printf("elapsed %i\n", sample.time_us - _time_last); printf("elapsed %llu\n", sample.time_us - _time_last);
_time_last = sample.time_us; _time_last = sample.time_us;
} }
@@ -120,11 +120,12 @@ public:
if (timestamp >= _buffer[index].time_us && timestamp - _buffer[index].time_us < 100000) { if (timestamp >= _buffer[index].time_us && timestamp - _buffer[index].time_us < 100000) {
memcpy(sample, &_buffer[index], sizeof(*sample)); // TODO Re-evaluate the static cast and usage patterns
memcpy(static_cast<void*>(sample), static_cast<void*>(&_buffer[index]), sizeof(*sample));
// Now we can set the tail to the item which comes after the one we removed // Now we can set the tail to the item which comes after the one we removed
// since we don't want to have any older data in the buffer // since we don't want to have any older data in the buffer
if (index == _head) { if (index == static_cast<int>(_head)) {
_tail = _head; _tail = _head;
_first_write = true; _first_write = true;
@@ -137,7 +138,7 @@ public:
return true; return true;
} }
if (index == _tail) { if (index == static_cast<int>(_tail)) {
// we have reached the tail and haven't got a match // we have reached the tail and haven't got a match
return false; return false;
} }