Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-24 01:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: rename parameter to avoid name conflict with lock

Browse Source
This commit is contained in:
Peter Barker 2019-09-12 19:51:06 +10:00 committed by Peter Barker
parent 87058ef141
commit 714ec6981a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APMrover2/GCS_Mavlink.cpp
View File

@ -586,11 +586,11 @@ MAV_RESULT GCS_MAVLINK_Rover::_handle_command_preflight_calibration(const mavlin
return GCS_MAVLINK::_handle_command_preflight_calibration(packet); return GCS_MAVLINK::_handle_command_preflight_calibration(packet);
} }
bool GCS_MAVLINK_Rover::set_home_to_current_location(bool lock) { bool GCS_MAVLINK_Rover::set_home_to_current_location(bool _lock) {
return rover.set_home_to_current_location(lock); return rover.set_home_to_current_location(_lock);
} }
bool GCS_MAVLINK_Rover::set_home(const Location& loc, bool lock) { bool GCS_MAVLINK_Rover::set_home(const Location& loc, bool _lock) {
return rover.set_home(loc, lock); return rover.set_home(loc, _lock);
} }
MAV_RESULT GCS_MAVLINK_Rover::handle_command_int_packet(const mavlink_command_int_t &packet) MAV_RESULT GCS_MAVLINK_Rover::handle_command_int_packet(const mavlink_command_int_t &packet)