From dc283e9c26b88de35bddef776cae34bfb6133cc3 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Sat, 23 Dec 2017 14:54:11 +0900 Subject: [PATCH] Rover: re-order calc_steering declarations to match .cpp file --- APMrover2/mode.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/APMrover2/mode.h b/APMrover2/mode.h index 4b5f1c47f4..0711d7718d 100644 --- a/APMrover2/mode.h +++ b/APMrover2/mode.h @@ -107,11 +107,12 @@ protected: // steering_out is in the range -4500 ~ +4500, throttle_out is in the range -100 ~ +100 void get_pilot_desired_steering_and_throttle(float &steering_out, float &throttle_out); + // calculate steering output to drive along line from origin to destination waypoint + void calc_steering_to_waypoint(const struct Location &origin, const struct Location &destination, bool reversed = false); + // calculate steering angle given a desired lateral acceleration void calc_steering_from_lateral_acceleration(bool reversed = false); - // calculate steering output to drive along line from origin to destination waypoint - void calc_steering_to_waypoint(const struct Location &origin, const struct Location &destination, bool reversed = false); // calculates the amount of throttle that should be output based // on things like proximity to corners and current speed