diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-15 09:08:14 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-15 09:08:14 +0200 |
commit | ac3f1c55c7604f45cc6cad228566e95806fae900 (patch) | |
tree | e38e824086957377aca8b9ec7c2b7783966de5b0 /src/lib | |
parent | 8fbf698e623bf7aa1f651ded574ec2e557beed32 (diff) | |
download | px4-firmware-ac3f1c55c7604f45cc6cad228566e95806fae900.tar.gz px4-firmware-ac3f1c55c7604f45cc6cad228566e95806fae900.tar.bz2 px4-firmware-ac3f1c55c7604f45cc6cad228566e95806fae900.zip |
Adding more references, adding inline references to make sure a reader of the source file will not miss them
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/ecl/attitude_fw/ecl_roll_controller.h | 2 | ||||
-rw-r--r-- | src/lib/ecl/l1/ecl_l1_pos_control.cpp | 9 | ||||
-rw-r--r-- | src/lib/ecl/l1/ecl_l1_pos_control.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.h b/src/lib/ecl/attitude_fw/ecl_roll_controller.h index a6d30d210..3c0362ecc 100644 --- a/src/lib/ecl/attitude_fw/ecl_roll_controller.h +++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.h @@ -40,7 +40,7 @@ * Acknowledgements: * * The control design is based on a design - * by Paul Riseborough, 2013. + * by Paul Riseborough and Andrew Tridgell, 2013. */ #ifndef ECL_ROLL_CONTROLLER_H diff --git a/src/lib/ecl/l1/ecl_l1_pos_control.cpp b/src/lib/ecl/l1/ecl_l1_pos_control.cpp index 6f5065960..4b4e38b0b 100644 --- a/src/lib/ecl/l1/ecl_l1_pos_control.cpp +++ b/src/lib/ecl/l1/ecl_l1_pos_control.cpp @@ -69,6 +69,7 @@ float ECL_L1_Pos_Control::target_bearing() float ECL_L1_Pos_Control::switch_distance(float wp_radius) { + /* following [2], switching on L1 distance */ return math::min(wp_radius, _L1_distance); } @@ -85,6 +86,7 @@ float ECL_L1_Pos_Control::crosstrack_error(void) void ECL_L1_Pos_Control::navigate_waypoints(const math::Vector2f &vector_A, const math::Vector2f &vector_B, const math::Vector2f &vector_curr_position, const math::Vector2f &ground_speed_vector) { + /* this follows the logic presented in [1] */ float eta; float xtrack_vel; @@ -126,6 +128,7 @@ void ECL_L1_Pos_Control::navigate_waypoints(const math::Vector2f &vector_A, cons float distance_A_to_airplane = vector_A_to_airplane.length(); float alongTrackDist = vector_A_to_airplane * vector_AB; + /* extension from [2] */ if (distance_A_to_airplane > _L1_distance && alongTrackDist / math::max(distance_A_to_airplane , 1.0f) < -0.7071f) { /* calculate eta to fly to waypoint A */ @@ -175,6 +178,7 @@ void ECL_L1_Pos_Control::navigate_waypoints(const math::Vector2f &vector_A, cons void ECL_L1_Pos_Control::navigate_loiter(const math::Vector2f &vector_A, const math::Vector2f &vector_curr_position, float radius, int8_t loiter_direction, const math::Vector2f &ground_speed_vector) { + /* the complete guidance logic in this section was proposed by [2] */ /* calculate the gains for the PD loop (circle tracking) */ float omega = (2.0f * M_PI_F / _L1_period); @@ -263,6 +267,7 @@ void ECL_L1_Pos_Control::navigate_loiter(const math::Vector2f &vector_A, const m void ECL_L1_Pos_Control::navigate_heading(float navigation_heading, float current_heading, const math::Vector2f &ground_speed_vector) { + /* the complete guidance logic in this section was proposed by [2] */ float eta; @@ -298,6 +303,8 @@ void ECL_L1_Pos_Control::navigate_heading(float navigation_heading, float curren void ECL_L1_Pos_Control::navigate_level_flight(float current_heading) { + /* the logic in this section is trivial, but originally proposed by [2] */ + /* reset all heading / error measures resulting in zero roll */ _target_bearing = current_heading; _nav_bearing = current_heading; @@ -313,6 +320,8 @@ void ECL_L1_Pos_Control::navigate_level_flight(float current_heading) math::Vector2f ECL_L1_Pos_Control::get_local_planar_vector(const math::Vector2f &origin, const math::Vector2f &target) const { + /* this is an approximation for small angles, proposed by [2] */ + math::Vector2f out; out.setX(math::radians((target.getX() - origin.getX()))); diff --git a/src/lib/ecl/l1/ecl_l1_pos_control.h b/src/lib/ecl/l1/ecl_l1_pos_control.h index 7f4a44018..3ddb691fa 100644 --- a/src/lib/ecl/l1/ecl_l1_pos_control.h +++ b/src/lib/ecl/l1/ecl_l1_pos_control.h @@ -47,7 +47,7 @@ * Proceedings of the AIAA Guidance, Navigation and Control * Conference, Aug 2004. AIAA-2004-4900. * - * [2] Paul Riseborough and Andrew Tridgell, L1 control for APM. Aug 2013. + * [2] Paul Riseborough, Brandon Jones and Andrew Tridgell, L1 control for APM. Aug 2013. * - Explicit control over frequency and damping * - Explicit control over track capture angle * - Ability to use loiter radius smaller than L1 length |