From 37df0c20eb9678c98fb9ce2b71b152783a3843c5 Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Tue, 10 Apr 2018 12:22:01 -0700 Subject: [PATCH] AP_Rally: Remove stale comment, and unneded define check --- libraries/AP_Rally/AP_Rally.cpp | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/libraries/AP_Rally/AP_Rally.cpp b/libraries/AP_Rally/AP_Rally.cpp index 17dce9362a..7b14485a7b 100644 --- a/libraries/AP_Rally/AP_Rally.cpp +++ b/libraries/AP_Rally/AP_Rally.cpp @@ -8,26 +8,18 @@ extern const AP_HAL::HAL& hal; // storage object StorageAccess AP_Rally::_storage(StorageManager::StorageRally); -// ArduCopter/defines.h sets this, and this definition will be moved into ArduPlane/defines.h when that is patched to use the lib -#ifdef APM_BUILD_DIRECTORY - #if APM_BUILD_TYPE(APM_BUILD_ArduCopter) - #define RALLY_LIMIT_KM_DEFAULT 0.3f - #define RALLY_INCLUDE_HOME_DEFAULT 1 - #elif APM_BUILD_TYPE(APM_BUILD_ArduPlane) - #define RALLY_LIMIT_KM_DEFAULT 5.0f - #define RALLY_INCLUDE_HOME_DEFAULT 0 - #elif APM_BUILD_TYPE(APM_BUILD_APMrover2) - #define RALLY_LIMIT_KM_DEFAULT 0.5f - #define RALLY_INCLUDE_HOME_DEFAULT 0 - #endif -#endif // APM_BUILD_DIRECTORY - -#ifndef RALLY_LIMIT_KM_DEFAULT -#define RALLY_LIMIT_KM_DEFAULT 1.0f -#endif - -#ifndef RALLY_INCLUDE_HOME_DEFAULT -#define RALLY_INCLUDE_HOME_DEFAULT 0 +#if APM_BUILD_TYPE(APM_BUILD_ArduCopter) + #define RALLY_LIMIT_KM_DEFAULT 0.3f + #define RALLY_INCLUDE_HOME_DEFAULT 1 +#elif APM_BUILD_TYPE(APM_BUILD_ArduPlane) + #define RALLY_LIMIT_KM_DEFAULT 5.0f + #define RALLY_INCLUDE_HOME_DEFAULT 0 +#elif APM_BUILD_TYPE(APM_BUILD_APMrover2) + #define RALLY_LIMIT_KM_DEFAULT 0.5f + #define RALLY_INCLUDE_HOME_DEFAULT 0 +#else + #define RALLY_LIMIT_KM_DEFAULT 1.0f + #define RALLY_INCLUDE_HOME_DEFAULT 0 #endif const AP_Param::GroupInfo AP_Rally::var_info[] = {