Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: fix method shadowing

Browse Source
This commit is contained in:
Francisco Ferreira 2018-04-03 15:35:32 +01:00
parent ac73fa9681
commit 8ff74f31e9
No known key found for this signature in database
GPG Key ID: F63C20A6773E787E
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ArduCopter/GCS_Mavlink.cpp
View File

@ -29,7 +29,7 @@ MAV_TYPE GCS_MAVLINK_Copter::frame_type() const
MAV_MODE GCS_MAVLINK_Copter::base_mode() const
{
uint8_t base_mode = MAV_MODE_FLAG_STABILIZE_ENABLED;
uint8_t _base_mode = MAV_MODE_FLAG_STABILIZE_ENABLED;
// work out the base_mode. This value is not very useful
// for APM, but we calculate it as best we can so a generic
// MAVLink enabled ground station can work out something about
@ -49,7 +49,7 @@ MAV_MODE GCS_MAVLINK_Copter::base_mode() const
case POSHOLD:
case BRAKE:
case SMART_RTL:
base_mode |= MAV_MODE_FLAG_GUIDED_ENABLED;
_base_mode |= MAV_MODE_FLAG_GUIDED_ENABLED;
// note that MAV_MODE_FLAG_AUTO_ENABLED does not match what
// APM does in any mode, as that is defined as "system finds its own goal
// positions", which APM does not currently do
@ -60,21 +60,21 @@ MAV_MODE GCS_MAVLINK_Copter::base_mode() const
// all modes except INITIALISING have some form of manual
// override if stick mixing is enabled
base_mode |= MAV_MODE_FLAG_MANUAL_INPUT_ENABLED;
_base_mode |= MAV_MODE_FLAG_MANUAL_INPUT_ENABLED;
#if HIL_MODE != HIL_MODE_DISABLED
base_mode |= MAV_MODE_FLAG_HIL_ENABLED;
_base_mode |= MAV_MODE_FLAG_HIL_ENABLED;
#endif
// we are armed if we are not initialising
if (copter.motors != nullptr && copter.motors->armed()) {
base_mode |= MAV_MODE_FLAG_SAFETY_ARMED;
_base_mode |= MAV_MODE_FLAG_SAFETY_ARMED;
}
// indicate we have set a custom mode
base_mode |= MAV_MODE_FLAG_CUSTOM_MODE_ENABLED;
_base_mode |= MAV_MODE_FLAG_CUSTOM_MODE_ENABLED;
return (MAV_MODE)base_mode;
return (MAV_MODE)_base_mode;
}
uint32_t GCS_MAVLINK_Copter::custom_mode() const