Skip to content

Commit 1e4b1d7

Browse files
committed
AP_NavEKF3: convert to using common buffer classes
this saves a considerable amount of flash
1 parent 39ba8a8 commit 1e4b1d7

File tree

3 files changed

+35
-246
lines changed

3 files changed

+35
-246
lines changed

libraries/AP_NavEKF3/AP_NavEKF3_Buffer.h

Lines changed: 0 additions & 200 deletions
This file was deleted.

libraries/AP_NavEKF3/AP_NavEKF3_Measurements.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ void NavEKF3_core::readIMUData()
497497
runUpdates = true;
498498

499499
// extract the oldest available data from the FIFO buffer
500-
imuDataDelayed = storedIMU.pop_oldest_element();
500+
imuDataDelayed = storedIMU.get_oldest_element();
501501

502502
// protect against delta time going to zero
503503
float minDT = 0.1f * dtEkfAvg;
@@ -1040,12 +1040,13 @@ void NavEKF3_core::writeExtNavVelData(const Vector3f &vel, float err, uint32_t t
10401040
timeStamp_ms -= localFilterTimeStep_ms/2;
10411041
// Prevent time delay exceeding age of oldest IMU data in the buffer
10421042
timeStamp_ms = MAX(timeStamp_ms,imuDataDelayed.time_ms);
1043-
const ext_nav_vel_elements extNavVelNew {
1044-
vel,
1045-
err,
1046-
timeStamp_ms,
1047-
false
1048-
};
1043+
1044+
ext_nav_vel_elements extNavVelNew;
1045+
extNavVelNew.time_ms = timeStamp_ms;
1046+
extNavVelNew.vel = vel;
1047+
extNavVelNew.err = err;
1048+
extNavVelNew.corrected = false;
1049+
10491050
storedExtNavVel.push(extNavVelNew);
10501051
}
10511052

0 commit comments

Comments
 (0)