Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-03 14:38:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

added RTL_land_enabled

Browse Source 
added auto_pilot slew rate
This commit is contained in:
Jason Short 2012-02-15 09:05:17 -08:00
parent aa0662008b
commit 91edeeeef2
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ArduCopter/Parameters.h
View File

@ -106,8 +106,10 @@ public:
k_param_optflow_enabled, k_param_optflow_enabled,
k_param_low_voltage, k_param_low_voltage,
k_param_ch7_option, k_param_ch7_option,
k_param_auto_slew_rate,
k_param_sonar_type, k_param_sonar_type,
k_param_super_simple, //155 k_param_super_simple, //155
k_param_rtl_land_enabled,
// //
// 160: Navigation parameters // 160: Navigation parameters
@ -177,6 +179,8 @@ public:
k_param_pi_stabilize_yaw, k_param_pi_stabilize_yaw,
k_param_pi_loiter_lat, k_param_pi_loiter_lat,
k_param_pi_loiter_lon, k_param_pi_loiter_lon,
k_param_pid_loiter_rate_lat,
k_param_pid_loiter_rate_lon,
k_param_pid_nav_lat, k_param_pid_nav_lat,
k_param_pid_nav_lon, k_param_pid_nav_lon,
k_param_pi_alt_hold, k_param_pi_alt_hold,
@ -209,6 +213,7 @@ public:
AP_Int8 optflow_enabled; AP_Int8 optflow_enabled;
AP_Float low_voltage; AP_Float low_voltage;
AP_Int8 super_simple; AP_Int8 super_simple;
AP_Int8 rtl_land_enabled;
// Waypoints // Waypoints
@ -255,7 +260,7 @@ public:
AP_Int8 frame_orientation; AP_Int8 frame_orientation;
AP_Float top_bottom_ratio; AP_Float top_bottom_ratio;
AP_Int8 ch7_option; AP_Int8 ch7_option;
AP_Int16 auto_slew_rate;
#if FRAME_CONFIG == HELI_FRAME #if FRAME_CONFIG == HELI_FRAME
// Heli // Heli
@ -288,9 +293,13 @@ public:
AP_Float stabilize_d; AP_Float stabilize_d;
// PI/D controllers // PI/D controllers
AP_Float acro_P;
AC_PID pid_rate_roll; AC_PID pid_rate_roll;
AC_PID pid_rate_pitch; AC_PID pid_rate_pitch;
AC_PID pid_rate_yaw; AC_PID pid_rate_yaw;
AC_PID pid_loiter_rate_lat;
AC_PID pid_loiter_rate_lon;
AC_PID pid_nav_lat; AC_PID pid_nav_lat;
AC_PID pid_nav_lon; AC_PID pid_nav_lon;
@ -328,6 +337,7 @@ public:
optflow_enabled (OPTFLOW), optflow_enabled (OPTFLOW),
low_voltage (LOW_VOLTAGE), low_voltage (LOW_VOLTAGE),
super_simple (SUPER_SIMPLE), super_simple (SUPER_SIMPLE),
rtl_land_enabled (RTL_AUTO_LAND),
waypoint_mode (0), waypoint_mode (0),
command_total (0), command_total (0),
@ -363,6 +373,7 @@ public:
frame_orientation (FRAME_ORIENTATION), frame_orientation (FRAME_ORIENTATION),
top_bottom_ratio (TOP_BOTTOM_RATIO), top_bottom_ratio (TOP_BOTTOM_RATIO),
ch7_option (CH7_OPTION), ch7_option (CH7_OPTION),
auto_slew_rate (AUTO_SLEW_RATE),
#if FRAME_CONFIG == HELI_FRAME #if FRAME_CONFIG == HELI_FRAME
heli_servo_1 (k_param_heli_servo_1), heli_servo_1 (k_param_heli_servo_1),
@ -390,11 +401,14 @@ public:
stabilize_d (STABILIZE_D), stabilize_d (STABILIZE_D),
// PID controller initial P initial I initial D initial imax // PID controller initial P initial I initial D initial imax
//-------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------
pid_rate_roll (RATE_ROLL_P, RATE_ROLL_I, RATE_ROLL_D, RATE_ROLL_IMAX * 100), pid_rate_roll (RATE_ROLL_P, RATE_ROLL_I, RATE_ROLL_D, RATE_ROLL_IMAX * 100),
pid_rate_pitch (RATE_PITCH_P, RATE_PITCH_I, RATE_PITCH_D, RATE_PITCH_IMAX * 100), pid_rate_pitch (RATE_PITCH_P, RATE_PITCH_I, RATE_PITCH_D, RATE_PITCH_IMAX * 100),
pid_rate_yaw (RATE_YAW_P, RATE_YAW_I, RATE_YAW_D, RATE_YAW_IMAX * 100), pid_rate_yaw (RATE_YAW_P, RATE_YAW_I, RATE_YAW_D, RATE_YAW_IMAX * 100),
pid_loiter_rate_lat (LOITER_RATE_P, LOITER_RATE_I, LOITER_RATE_D, LOITER_RATE_IMAX * 100),
pid_loiter_rate_lon (LOITER_RATE_P, LOITER_RATE_I, LOITER_RATE_D, LOITER_RATE_IMAX * 100),
pid_nav_lat (NAV_P, NAV_I, NAV_D, NAV_IMAX * 100), pid_nav_lat (NAV_P, NAV_I, NAV_D, NAV_IMAX * 100),
pid_nav_lon (NAV_P, NAV_I, NAV_D, NAV_IMAX * 100), pid_nav_lon (NAV_P, NAV_I, NAV_D, NAV_IMAX * 100),