Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_GPS: adjust for Location_Class and Location unification

This commit is contained in:
Peter Barker 2019-01-02 14:11:38 +11:00 committed by Peter Barker
parent 384ab476b4
commit 30980815a8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_GPS/AP_GPS.cpp
View File

@ -1341,7 +1341,7 @@ void AP_GPS::calc_blended_state(void)
state[GPS_BLENDED_INSTANCE].have_speed_accuracy = false; state[GPS_BLENDED_INSTANCE].have_speed_accuracy = false;
state[GPS_BLENDED_INSTANCE].have_horizontal_accuracy = false; state[GPS_BLENDED_INSTANCE].have_horizontal_accuracy = false;
state[GPS_BLENDED_INSTANCE].have_vertical_accuracy = false; state[GPS_BLENDED_INSTANCE].have_vertical_accuracy = false;
memset(&state[GPS_BLENDED_INSTANCE].location, 0, sizeof(state[GPS_BLENDED_INSTANCE].location)); state[GPS_BLENDED_INSTANCE].location = {};
_blended_antenna_offset.zero(); _blended_antenna_offset.zero();
_blended_lag_sec = 0; _blended_lag_sec = 0;

1
libraries/AP_GPS/AP_GPS.h
View File

@ -17,6 +17,7 @@
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <inttypes.h> #include <inttypes.h>
#include <AP_Common/AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Common/Location.h>
#include <AP_Param/AP_Param.h> #include <AP_Param/AP_Param.h>
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
#include <AP_Vehicle/AP_Vehicle.h> #include <AP_Vehicle/AP_Vehicle.h>