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

Mission: rename AUTORESET to RESTART

This commit is contained in:
Randy Mackay 2014-05-08 23:06:06 +09:00
parent cc1b75ad29
commit 05f5164dfa
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_Mission/AP_Mission.cpp
View File

@ -15,11 +15,11 @@ const AP_Param::GroupInfo AP_Mission::var_info[] PROGMEM = {
// @User: Advanced
AP_GROUPINFO("TOTAL", 0, AP_Mission, _cmd_total, 0),
// @Param: AUTORESET
// @DisplayName: Reset mission on AUTO
// @Description: When set to 0 the mission will continue a previous AUTO mission when switching to AUTO mode. When set to 1 the mission will restart from the first waypoint each time AUTO mode is started.
// @Values: 0:Continue Mission, 1:Reset Mission
AP_GROUPINFO("AUTORESET", 1, AP_Mission, _auto_reset, 0),
// @Param: RESTART
// @DisplayName: Mission Restart when entering Auto mode
// @Description: Controls mission starting point when entering Auto mode (either restart from beginning of mission or resume from last command run)
// @Values: 0:Resume Mission, 1:Restart Mission
AP_GROUPINFO("RESTART", 1, AP_Mission, _restart, AP_MISSION_RESTART_DEFAULT),
AP_GROUPEND
};
@ -105,7 +105,7 @@ void AP_Mission::resume()
/// start_or_resume - if MIS_AUTORESTART=0 this will call resume(), otherwise it will call start()
void AP_Mission::start_or_resume()
{
if (_auto_reset) {
if (_restart) {
start();
} else {
resume();

4
libraries/AP_Mission/AP_Mission.h
View File

@ -35,6 +35,8 @@
#define AP_MISSION_FIRST_REAL_COMMAND 1 // command #0 reserved to hold home position
#define AP_MISSION_RESTART_DEFAULT 0 // resume the mission from the last command run by default
/// @class AP_Mission
/// @brief Object managing Mission
class AP_Mission {
@ -362,7 +364,7 @@ private:
// parameters
AP_Int16 _cmd_total; // total number of commands in the mission
AP_Int8 _auto_reset; // when true the mission will reset to the first command when initiated
AP_Int8 _restart; // controls mission starting point when entering Auto mode (either restart from beginning of mission or resume from last command run)
// pointer to main program functions
mission_cmd_fn_t _cmd_start_fn; // pointer to function which will be called when a new command is started