From 70b02aeadfaab7502c4d2418032aa9dd52b3a0af Mon Sep 17 00:00:00 2001 From: Andy Piper Date: Mon, 25 Oct 2021 18:10:11 +0100 Subject: [PATCH] AP_BattMonitor: convert APM_BUILD_COPTER_OR_HELI() to APM_BUILD_COPTER_OR_HELI --- libraries/AP_BattMonitor/AP_BattMonitor.cpp | 2 +- libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor.cpp b/libraries/AP_BattMonitor/AP_BattMonitor.cpp index 105b0c9b53..3d47989f91 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor.cpp @@ -449,7 +449,7 @@ void AP_BattMonitor::convert_params(void) { #if APM_BUILD_TYPE(APM_BUILD_ArduPlane) info.old_key = 166; -#elif APM_BUILD_COPTER_OR_HELI() +#elif APM_BUILD_COPTER_OR_HELI info.old_key = 36; #elif APM_BUILD_TYPE(APM_BUILD_ArduSub) info.old_key = 33; diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp index 250ce84a94..c601f9d9c4 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp @@ -3,11 +3,11 @@ #include "AP_BattMonitor_Params.h" #include "AP_BattMonitor.h" -#if APM_BUILD_COPTER_OR_HELI() +#if APM_BUILD_COPTER_OR_HELI #define DEFAULT_LOW_BATTERY_VOLTAGE 10.5f #else #define DEFAULT_LOW_BATTERY_VOLTAGE 0.0f -#endif // APM_BUILD_COPTER_OR_HELI() +#endif // APM_BUILD_COPTER_OR_HELI const AP_Param::GroupInfo AP_BattMonitor_Params::var_info[] = { // @Param: MONITOR