Browse Source

AP_L1_Control: move get_bearing_cd to Location and rename to get_bearing_to

mission-4.1.18
Pierre Kancir 6 years ago committed by Peter Barker
parent
commit
2efe32e4b1
  1. 4
      libraries/AP_L1_Control/AP_L1_Control.cpp
  2. 1
      libraries/AP_L1_Control/AP_L1_Control.h

4
libraries/AP_L1_Control/AP_L1_Control.cpp

@ -224,7 +224,7 @@ void AP_L1_Control::update_waypoint(const struct Location &prev_WP, const struct @@ -224,7 +224,7 @@ void AP_L1_Control::update_waypoint(const struct Location &prev_WP, const struct
Vector2f _groundspeed_vector = _ahrs.groundspeed_vector();
// update _target_bearing_cd
_target_bearing_cd = get_bearing_cd(_current_loc, next_WP);
_target_bearing_cd = _current_loc.get_bearing_to(next_WP);
//Calculate groundspeed
float groundSpeed = _groundspeed_vector.length();
@ -360,7 +360,7 @@ void AP_L1_Control::update_loiter(const struct Location &center_WP, float radius @@ -360,7 +360,7 @@ void AP_L1_Control::update_loiter(const struct Location &center_WP, float radius
// update _target_bearing_cd
_target_bearing_cd = get_bearing_cd(_current_loc, center_WP);
_target_bearing_cd = _current_loc.get_bearing_to(center_WP);
// Calculate time varying control parameters

1
libraries/AP_L1_Control/AP_L1_Control.h

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <AP_Param/AP_Param.h>
#include <AP_Navigation/AP_Navigation.h>
#include <AP_SpdHgtControl/AP_SpdHgtControl.h>
#include <AP_Common/Location.h>
class AP_L1_Control : public AP_Navigation {
public:

Loading…
Cancel
Save