aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: rename set_alt to set_alt_cm in control_auto

Browse Source
This commit is contained in:
Randy Mackay 2016-04-28 19:53:45 +09:00
parent d92154a44e
commit f8f6c135e9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArduCopter/control_auto.cpp
View File

@ -113,11 +113,11 @@ void Copter::auto_takeoff_start(const Location& dest_loc)
// sanity check target
if (alt_target < current_loc.alt) {
dest.set_alt(current_loc.alt, Location_Class::ALT_FRAME_ABOVE_HOME);
dest.set_alt_cm(current_loc.alt, Location_Class::ALT_FRAME_ABOVE_HOME);
}
// Note: if taking off from below home this could cause a climb to an unexpectedly high altitude
if (alt_target < 100) {
dest.set_alt(100, Location_Class::ALT_FRAME_ABOVE_HOME);
dest.set_alt_cm(100, Location_Class::ALT_FRAME_ABOVE_HOME);
}
// set waypoint controller target
@ -478,7 +478,7 @@ void Copter::auto_circle_movetoedge_start(const Location_Class &circle_center, f
Location_Class circle_edge(circle_edge_neu);
// convert altitude to same as command
circle_edge.set_alt(circle_center.alt, circle_center.get_alt_frame());
circle_edge.set_alt_cm(circle_center.alt, circle_center.get_alt_frame());
// initialise wpnav to move to edge of circle
if (!wp_nav.set_wp_destination(circle_edge)) {