zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Plane: integrate AC_PosControl::get_roll_cd rename

zr-v5.1
Leonard Hall 4 years ago committed by Andrew Tridgell
parent
74d22594db
commit
ff2ae1d7d1
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ArduPlane/quadplane.cpp

12
ArduPlane/quadplane.cpp
Unescape View File

@ -2530,8 +2530,8 @@ void QuadPlane::vtol_position_controller(void) @@ -2530,8 +2530,8 @@ void QuadPlane::vtol_position_controller(void)
pos_control->update_xy_controller();
// nav roll and pitch are controller by position controller
plane.nav_roll_cd = pos_control->get_roll();
plane.nav_pitch_cd = pos_control->get_pitch();
plane.nav_roll_cd = pos_control->get_roll_cd();
plane.nav_pitch_cd = pos_control->get_pitch_cd();
/*
limit the pitch down with an expanding envelope. This
@ -2597,8 +2597,8 @@ void QuadPlane::vtol_position_controller(void) @@ -2597,8 +2597,8 @@ void QuadPlane::vtol_position_controller(void)
pos_control->update_xy_controller();
// nav roll and pitch are controller by position controller
plane.nav_roll_cd = pos_control->get_roll();
plane.nav_pitch_cd = pos_control->get_pitch();
plane.nav_roll_cd = pos_control->get_roll_cd();
plane.nav_pitch_cd = pos_control->get_pitch_cd();
// call attitude controller
attitude_control->input_euler_angle_roll_pitch_euler_rate_yaw(plane.nav_roll_cd,
@ -2735,8 +2735,8 @@ void QuadPlane::takeoff_controller(void) @@ -2735,8 +2735,8 @@ void QuadPlane::takeoff_controller(void)
pos_control->update_xy_controller();
// nav roll and pitch are controller by position controller
plane.nav_roll_cd = pos_control->get_roll();
plane.nav_pitch_cd = pos_control->get_pitch();
plane.nav_roll_cd = pos_control->get_roll_cd();
plane.nav_pitch_cd = pos_control->get_pitch_cd();
attitude_control->input_euler_angle_roll_pitch_euler_rate_yaw(plane.nav_roll_cd,
plane.nav_pitch_cd,

Write Preview
Loading…
Cancel
Save