fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 05:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

ekf2 update setGpsData usage

Browse Source
This commit is contained in:
Daniel Agar
2019-03-05 23:28:26 -05:00
committed by GitHub
parent a97151feed
commit beca16fa37
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ecl
+1 -1
Submodule src/lib/ecl updated: 1378ec1797...a85d3a43ed
src/modules/ekf2/ekf2_main.cpp
+2 -2
View File
@@ -1027,7 +1027,7 @@ void Ekf2::run()
if ((_gps_blend_mask.get() == 0) && gps1_updated) { if ((_gps_blend_mask.get() == 0) && gps1_updated) {
// When GPS blending is disabled we always use the first receiver instance // When GPS blending is disabled we always use the first receiver instance
_ekf.setGpsData(_gps_state[0].time_usec, &_gps_state[0]); _ekf.setGpsData(_gps_state[0].time_usec, _gps_state[0]);
} else if ((_gps_blend_mask.get() > 0) && (gps1_updated || gps2_updated)) { } else if ((_gps_blend_mask.get() > 0) && (gps1_updated || gps2_updated)) {
// blend dual receivers if available // blend dual receivers if available
@@ -1072,7 +1072,7 @@ void Ekf2::run()
} }
// write selected GPS to EKF // write selected GPS to EKF
_ekf.setGpsData(_gps_output[_gps_select_index].time_usec, &_gps_output[_gps_select_index]); _ekf.setGpsData(_gps_output[_gps_select_index].time_usec, _gps_output[_gps_select_index]);
// log blended solution as a third GPS instance // log blended solution as a third GPS instance
ekf_gps_position_s gps; ekf_gps_position_s gps;