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

AP_Rally: Remove stale comment, and unneded define check

This commit is contained in:
Michael du Breuil 2018-04-10 12:22:01 -07:00 committed by Randy Mackay
parent d9fe7b7105
commit 37df0c20eb
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libraries/AP_Rally/AP_Rally.cpp
View File

@ -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[] = {