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

APMrover2: kill AP_FEATURE_SAFETY_BUTTON 

This is redundant and can be just HAL_HAVE_SAFETY_SWITCH.
This commit is contained in:
Lucas De Marchi 2018-08-01 16:46:59 -07:00 committed by Lucas De Marchi
parent 604deaf4ba
commit 00f03360bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/Parameters.cpp
View File

@ -652,7 +652,7 @@ void Rover::load_parameters(void)
L1_controller.set_default_period(NAVL1_PERIOD); L1_controller.set_default_period(NAVL1_PERIOD);
// configure safety switch to allow stopping the motors while armed // configure safety switch to allow stopping the motors while armed
#if AP_FEATURE_SAFETY_BUTTON #if HAL_HAVE_SAFETY_SWITCH
AP_Param::set_default_by_name("BRD_SAFETYOPTION", AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_SAFETY_OFF| AP_Param::set_default_by_name("BRD_SAFETYOPTION", AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_SAFETY_OFF|
AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_SAFETY_ON| AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_SAFETY_ON|
AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_ARMED); AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_ARMED);