Browse Source

AP_NavEKF2: use millis/micros/panic functions

mission-4.1.18
Caio Marcelo de Oliveira Filho 9 years ago committed by Randy Mackay
parent
commit
8d882b06dd
  1. 2
      libraries/AP_NavEKF2/AP_NavEKF2_Measurements.cpp
  2. 4
      libraries/AP_NavEKF2/AP_NavEKF2_core.cpp

2
libraries/AP_NavEKF2/AP_NavEKF2_Measurements.cpp

@ -320,7 +320,7 @@ void NavEKF2_core::readIMUData() @@ -320,7 +320,7 @@ void NavEKF2_core::readIMUData()
dtIMUavg = 1.0f/ins.get_sample_rate();
// the imu sample time is used as a common time reference throughout the filter
imuSampleTime_ms = hal.scheduler->millis();
imuSampleTime_ms = AP_HAL::millis();
// use the nominated imu or primary if not available
if (ins.use_accel(imu_index)) {

4
libraries/AP_NavEKF2/AP_NavEKF2_core.cpp

@ -98,7 +98,7 @@ void NavEKF2_core::InitialiseVariables() @@ -98,7 +98,7 @@ void NavEKF2_core::InitialiseVariables()
localFilterTimeStep_ms = max(localFilterTimeStep_ms,10);
// initialise time stamps
imuSampleTime_ms = hal.scheduler->millis();
imuSampleTime_ms = AP_HAL::millis();
lastHealthyMagTime_ms = imuSampleTime_ms;
prevTasStep_ms = imuSampleTime_ms;
prevBetaStep_ms = imuSampleTime_ms;
@ -393,7 +393,7 @@ void NavEKF2_core::UpdateFilter(bool predict) @@ -393,7 +393,7 @@ void NavEKF2_core::UpdateFilter(bool predict)
// TODO - in-flight restart method
//get starting time for update step
imuSampleTime_ms = hal.scheduler->millis();
imuSampleTime_ms = AP_HAL::millis();
// Check arm status and perform required checks and mode changes
controlFilterModes();

Loading…
Cancel
Save