From 00f03360bc013a119e660eecbe25430e9b840d43 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 1 Aug 2018 16:46:59 -0700 Subject: [PATCH] APMrover2: kill AP_FEATURE_SAFETY_BUTTON This is redundant and can be just HAL_HAVE_SAFETY_SWITCH. --- APMrover2/Parameters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APMrover2/Parameters.cpp b/APMrover2/Parameters.cpp index d72f8b3c7e..74ebbd2a26 100644 --- a/APMrover2/Parameters.cpp +++ b/APMrover2/Parameters.cpp @@ -652,7 +652,7 @@ void Rover::load_parameters(void) L1_controller.set_default_period(NAVL1_PERIOD); // 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_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_SAFETY_ON| AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_ARMED);