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

Rover: FS_ param values changed to camel case 

Also minor comment change in crash-check failsafe
This commit is contained in:
Randy Mackay 2017-12-23 13:52:21 +09:00
parent 41f2e8869e
commit 457c39bf1b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APMrover2/Parameters.cpp
View File

@ -152,7 +152,7 @@ const AP_Param::Info Rover::var_info[] = {
// @Param: FS_ACTION // @Param: FS_ACTION
// @DisplayName: Failsafe Action // @DisplayName: Failsafe Action
// @Description: What to do on a failsafe event // @Description: What to do on a failsafe event
// @Values: 0:Nothing,1:RTL,2:HOLD // @Values: 0:Nothing,1:RTL,2:Hold
// @User: Standard // @User: Standard
GSCALAR(fs_action, "FS_ACTION", 2), GSCALAR(fs_action, "FS_ACTION", 2),
@ -188,7 +188,7 @@ const AP_Param::Info Rover::var_info[] = {
// @Param: FS_CRASH_CHECK // @Param: FS_CRASH_CHECK
// @DisplayName: Crash check action // @DisplayName: Crash check action
// @Description: What to do on a crash event. When enabled the rover will go to hold if a crash is detected. // @Description: What to do on a crash event. When enabled the rover will go to hold if a crash is detected.
// @Values: 0:Disabled,1:HOLD,2:HoldAndDisarm // @Values: 0:Disabled,1:Hold,2:HoldAndDisarm
// @User: Standard // @User: Standard
GSCALAR(fs_crash_check, "FS_CRASH_CHECK", FS_CRASH_DISABLE), GSCALAR(fs_crash_check, "FS_CRASH_CHECK", FS_CRASH_DISABLE),

2
APMrover2/crash_check.cpp
View File

@ -12,7 +12,7 @@ void Rover::crash_check()
{ {
static uint16_t crash_counter; // number of iterations vehicle may have been crashed static uint16_t crash_counter; // number of iterations vehicle may have been crashed
// return immediately if disarmed, or crash checking disabled or in HOLD mode // return immediately if disarmed, crash checking is disabled or vehicle is Hold, Manual or Acro mode
if (!arming.is_armed() || g.fs_crash_check == FS_CRASH_DISABLE || (!control_mode->is_autopilot_mode())) { if (!arming.is_armed() || g.fs_crash_check == FS_CRASH_DISABLE || (!control_mode->is_autopilot_mode())) {
crash_counter = 0; crash_counter = 0;
return; return;