aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_NaveEKF3: reduce code duplication in setup_core

Browse Source 
Less code.

Saves 40 bytes on PixRacer
This commit is contained in:
Peter Barker 2020-10-21 11:54:04 +11:00 committed by Peter Barker
parent 74f75dcd31
commit a1e7c91f8e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/AP_NavEKF3/AP_NavEKF3_core.cpp
View File

@ -71,16 +71,17 @@ bool NavEKF3_core::setup_core(uint8_t _imu_index, uint8_t _core_index)
// Wait for the configuration of all GPS units to be confirmed. Until this has occurred the GPS driver cannot provide a correct time delay // Wait for the configuration of all GPS units to be confirmed. Until this has occurred the GPS driver cannot provide a correct time delay
float gps_delay_sec = 0; float gps_delay_sec = 0;
if (!AP::gps().get_lag(selected_gps, gps_delay_sec)) { if (!AP::gps().get_lag(selected_gps, gps_delay_sec)) {
if (AP_HAL::millis() - lastInitFailReport_ms > 10000) { const uint32_t now = AP_HAL::millis();
lastInitFailReport_ms = AP_HAL::millis(); if (now - lastInitFailReport_ms > 10000) {
lastInitFailReport_ms = now;
// provide an escalating series of messages // provide an escalating series of messages
if (AP_HAL::millis() > 30000) { MAV_SEVERITY severity = MAV_SEVERITY_INFO;
gcs().send_text(MAV_SEVERITY_ERROR, "EKF3 waiting for GPS config data"); if (now > 30000) {
} else if (AP_HAL::millis() > 15000) { severity = MAV_SEVERITY_ERROR;
gcs().send_text(MAV_SEVERITY_WARNING, "EKF3 waiting for GPS config data"); } else if (now > 15000) {
} else { severity = MAV_SEVERITY_WARNING;
gcs().send_text(MAV_SEVERITY_INFO, "EKF3 waiting for GPS config data");
} }
gcs().send_text(severity, "EKF3 waiting for GPS config data");
} }
return false; return false;
} }