Browse Source

AC_AttControl: bug fix for yaw target handling

master
Randy Mackay 11 years ago committed by Andrew Tridgell
parent
commit
ba3ba9e157
  1. 3
      libraries/AC_AttitudeControl/AC_AttitudeControl.cpp
  2. 2
      libraries/AC_AttitudeControl/AC_AttitudeControl.h

3
libraries/AC_AttitudeControl/AC_AttitudeControl.cpp

@ -54,11 +54,12 @@ void AC_AttitudeControl::angleef_rp_rateef_y(float roll_angle_ef, float pitch_an @@ -54,11 +54,12 @@ void AC_AttitudeControl::angleef_rp_rateef_y(float roll_angle_ef, float pitch_an
}
// angleef_rpy - attempts to maintain a roll, pitch and yaw angle (all earth frame)
void AC_AttitudeControl::angleef_rpy(float roll_angle_ef, float pitch_angle_ef, float yaw_rate_ef)
void AC_AttitudeControl::angleef_rpy(float roll_angle_ef, float pitch_angle_ef, float yaw_angle_ef)
{
// set earth-frame angle targets
_angle_ef_target.x = roll_angle_ef;
_angle_ef_target.y = pitch_angle_ef;
_angle_ef_target.z = yaw_angle_ef;
// convert earth-frame angle targets to earth-frame rate targets
angle_to_rate_ef_roll();

2
libraries/AC_AttitudeControl/AC_AttitudeControl.h

@ -80,7 +80,7 @@ public: @@ -80,7 +80,7 @@ public:
void angleef_rp_rateef_y(float roll_angle_ef, float pitch_angle_ef, float yaw_rate_ef);
// angleef_rpy - attempts to maintain a roll, pitch and yaw angle (all earth frame)
void angleef_rpy(float roll_angle_ef, float pitch_angle_ef, float yaw_rate_ef);
void angleef_rpy(float roll_angle_ef, float pitch_angle_ef, float yaw_angle_ef);
//
// angle controller (earth-frame) methods

Loading…
Cancel
Save