Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sub: Switch to AC_PosControl_Sub

This commit is contained in:
Jacob Walser 2017-02-03 11:47:36 -05:00 committed by Andrew Tridgell
parent 565afc23ad
commit 8d60a34474
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduSub/Sub.h
View File

@ -56,7 +56,7 @@
#include <AC_PID/AC_PI_2D.h> // PID library (2-axis)
#include <AC_PID/AC_P.h> // P library
#include <AC_AttitudeControl/AC_AttitudeControl_Sub.h> // Attitude control library
#include <AC_AttitudeControl/AC_PosControl.h> // Position control library
#include <AC_AttitudeControl/AC_PosControl_Sub.h> // Position control library
#include <RC_Channel/RC_Channel.h> // RC Channel Library
#include <AP_Motors/AP_Motors.h> // AP Motors library
#include <AP_RangeFinder/AP_RangeFinder.h> // Range finder library
@ -405,7 +405,7 @@ private:
// To-Do: move inertial nav up or other navigation variables down here
AC_AttitudeControl_Sub attitude_control;
AC_PosControl pos_control;
AC_PosControl_Sub pos_control;
#if AVOIDANCE_ENABLED == ENABLED
AC_Avoid avoid;

2
ArduSub/make.inc
View File

@ -22,7 +22,7 @@ LIBRARIES += AC_PID
LIBRARIES += AC_PI_2D
LIBRARIES += AC_P
LIBRARIES += AC_AttitudeControl
LIBRARIES += AC_PosControl
LIBRARIES += AC_PosControl_Sub
LIBRARIES += RC_Channel
LIBRARIES += AP_Motors
LIBRARIES += AP_RangeFinder