Skip to content

Commit

Permalink
ekf2 update setGpsData usage
Browse files Browse the repository at this point in the history
  • Loading branch information
dagar committed Mar 5, 2019
1 parent a97151f commit 3971cdb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/lib/ecl
Submodule ecl updated from 1378ec to 25aa9e
4 changes: 2 additions & 2 deletions src/modules/ekf2/ekf2_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ void Ekf2::run()

if ((_gps_blend_mask.get() == 0) && gps1_updated) {
// 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)) {
// blend dual receivers if available
Expand Down Expand Up @@ -1072,7 +1072,7 @@ void Ekf2::run()
}

// 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
ekf_gps_position_s gps;
Expand Down

0 comments on commit 3971cdb

Please sign in to comment.