Skip to content

Commit

Permalink
Merge branch 'ArduPilot:master' into drivers/SPA06_baro
Browse files Browse the repository at this point in the history
  • Loading branch information
radiolinkW authored Aug 23, 2024
2 parents f12a0a2 + 62e3c6a commit 0b97f27
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libraries/AC_AttitudeControl/AC_PosControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ void AC_PosControl::stop_vel_xy_stabilisation()
_pid_vel_xy.reset_I();
}

// is_active_xy - returns true if the xy position controller has bee n run in the previous 5 loop times
// is_active_xy - returns true if the xy position controller has been run in the previous loop
bool AC_PosControl::is_active_xy() const
{
const uint32_t dt_ticks = AP::scheduler().ticks32() - _last_update_xy_ticks;
Expand Down Expand Up @@ -942,7 +942,7 @@ void AC_PosControl::update_pos_offset_z(float pos_offset_z)
_jerk_max_z_cmsss, _dt, false);
}

// is_active_z - returns true if the z position controller has been run in the previous 5 loop times
// is_active_z - returns true if the z position controller has been run in the previous loop
bool AC_PosControl::is_active_z() const
{
const uint32_t dt_ticks = AP::scheduler().ticks32() - _last_update_z_ticks;
Expand Down

0 comments on commit 0b97f27

Please sign in to comment.