From 78fef1c4c5f8560da9632295be8b9617ad902520 Mon Sep 17 00:00:00 2001 From: Ewoud Smeur Date: Wed, 21 Sep 2016 11:00:07 +1000 Subject: [PATCH] Revert "waypoint altitude without conversion" This reverts commit d93dc592ff8e0f5fb9d11ef79ca64539575a84f7. --- sw/tools/generators/gen_flight_plan.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/tools/generators/gen_flight_plan.ml b/sw/tools/generators/gen_flight_plan.ml index 5ab8900d114..9eb1d7cddc5 100644 --- a/sw/tools/generators/gen_flight_plan.ml +++ b/sw/tools/generators/gen_flight_plan.ml @@ -136,7 +136,7 @@ let print_waypoint_enu = fun utm0 default_alt waypoint -> let ecef0 = Latlong.ecef_of_geo Latlong.WGS84 (Latlong.of_utm Latlong.WGS84 utm0) !ground_alt in let ecef = Latlong.ecef_of_geo Latlong.WGS84 (Latlong.of_utm Latlong.WGS84 (Latlong.utm_add utm0 (x, y))) (float_of_string alt) in let ned = Latlong.array_of_ned (Latlong.ned_of_ecef ecef0 ecef) in - printf " {%.2f, %.2f, %.2f}, /* ENU in meters */ \\\n" ned.(1) ned.(0) (float_of_string alt -. !ground_alt) + printf " {%.2f, %.2f, %.2f}, /* ENU in meters */ \\\n" ned.(1) ned.(0) (-.ned.(2)) let convert_angle = fun rad -> Int64.of_float (1e7 *. (Rad>>Deg)rad)