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

Copter: add AP_Mission object parameter 

Remove global command_total and command_index parameters
This commit is contained in:
Randy Mackay 2014-02-28 10:15:40 +09:00
parent e8db57ced3
commit 1bad6a4b15
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ArduCopter/Parameters.h
View File

@ -99,6 +99,7 @@ public:
k_param_rssi_range,
k_param_rc_feel_rp,
k_param_NavEKF, // 41 - Extended Kalman Filter Inertial Navigation Group
k_param_mission, // mission library
// 65: AP_Limits Library
k_param_limits = 65, // deprecated - remove
@ -247,8 +248,8 @@ public:
// 210: Waypoint data
//
k_param_waypoint_mode = 210, // remove
k_param_command_total,
k_param_command_index,
k_param_command_total, // remove
k_param_command_index, // remove
k_param_command_nav_index, // remove
k_param_waypoint_radius, // remove
k_param_circle_radius, // remove
@ -328,8 +329,6 @@ public:
// Waypoints
//
AP_Int8 command_total;
AP_Int8 command_index;
AP_Int32 rtl_loiter_time;
AP_Int16 land_speed;
AP_Int16 pilot_velocity_z_max; // maximum vertical velocity the pilot may request

16
ArduCopter/Parameters.pde
View File

@ -204,18 +204,6 @@ const AP_Param::Info var_info[] PROGMEM = {
// @User: Standard
GSCALAR(wp_yaw_behavior, "WP_YAW_BEHAVIOR", WP_YAW_BEHAVIOR_DEFAULT),
// @Param: WP_TOTAL
// @DisplayName: Waypoint Total
// @Description: Total number of commands in the mission stored in the eeprom. Do not update this parameter directly!
// @User: Advanced
GSCALAR(command_total, "WP_TOTAL", 0),
// @Param: WP_INDEX
// @DisplayName: Waypoint Index
// @Description: The index number of the command that is currently being executed. Do not update this parameter directly!
// @User: Advanced
GSCALAR(command_index, "WP_INDEX", 0),
// @Param: RTL_LOIT_TIME
// @DisplayName: RTL loiter time
// @Description: Time (in milliseconds) to loiter above home before begining final descent
@ -1017,6 +1005,10 @@ const AP_Param::Info var_info[] PROGMEM = {
GOBJECTN(ahrs.get_NavEKF(), NavEKF, "EKF_", NavEKF),
#endif
// @Group: MIS_
// @Path: ../libraries/AP_Mission/AP_Mission.cpp
GOBJECT(mission, "MIS_", AP_Mission),
AP_VAREND
};