From 466e9db1f996d625dc6cd796f5c7fa124a032abe Mon Sep 17 00:00:00 2001 From: Randy Mackay <rmackay9@yahoo.com> Date: Wed, 30 Apr 2014 10:49:20 +0900 Subject: [PATCH] Copter: integrate AC_WPNav get_speed_xy name change --- ArduCopter/ArduCopter.pde | 2 +- ArduCopter/commands_logic.pde | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde index ce2503fb4..a2fa3c4e6 100644 --- a/ArduCopter/ArduCopter.pde +++ b/ArduCopter/ArduCopter.pde @@ -1448,7 +1448,7 @@ static void tuning(){ case CH6_WP_SPEED: // set waypoint navigation horizontal speed to 0 ~ 1000 cm/s - wp_nav.set_horizontal_velocity(g.rc_6.control_in); + wp_nav.set_speed_xy(g.rc_6.control_in); break; // Acro roll pitch gain diff --git a/ArduCopter/commands_logic.pde b/ArduCopter/commands_logic.pde index 663d609ca..de7cbcda1 100644 --- a/ArduCopter/commands_logic.pde +++ b/ArduCopter/commands_logic.pde @@ -794,7 +794,7 @@ static bool do_guided(const AP_Mission::Mission_Command& cmd) static void do_change_speed(const AP_Mission::Mission_Command& cmd) { if (cmd.content.speed.target_ms > 0) { - wp_nav.set_horizontal_velocity(cmd.content.speed.target_ms * 100.0f); + wp_nav.set_speed_xy(cmd.content.speed.target_ms * 100.0f); } } -- GitLab