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

Tracker: replace location_offset() and get_distance() function calls with Location object member function calls 

This allows removing duplicated code
This commit is contained in:
Dr.-Ing. Amilcar do Carmo Lucas 2019-02-25 01:11:04 +01:00 committed by Peter Barker
parent 36d755a48a
commit 62fa59238b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AntennaTracker/tracking.cpp
View File

@ -15,7 +15,7 @@ void Tracker::update_vehicle_pos_estimate()
vehicle.location_estimate = vehicle.location; vehicle.location_estimate = vehicle.location;
float north_offset = vehicle.vel.x * dt; float north_offset = vehicle.vel.x * dt;
float east_offset = vehicle.vel.y * dt; float east_offset = vehicle.vel.y * dt;
location_offset(vehicle.location_estimate, north_offset, east_offset); vehicle.location_estimate.offset(north_offset, east_offset);
vehicle.location_estimate.alt += vehicle.vel.z * 100.0f * dt; vehicle.location_estimate.alt += vehicle.vel.z * 100.0f * dt;
// set valid_location flag // set valid_location flag
vehicle.location_valid = true; vehicle.location_valid = true;
@ -56,7 +56,7 @@ void Tracker::update_bearing_and_distance()
} }
// calculate distance to vehicle // calculate distance to vehicle
nav_status.distance = get_distance(current_loc, vehicle.location_estimate); nav_status.distance = current_loc.get_distance(vehicle.location_estimate);
// calculate altitude difference to vehicle using gps // calculate altitude difference to vehicle using gps
if (g.alt_source == ALT_SOURCE_GPS){ if (g.alt_source == ALT_SOURCE_GPS){