Merge branch 'v7' of github.com:tudelft/obc2016 into v7

paparazzi · Sep 21, 2016 · 82d1b0d · 82d1b0d
2 parents c117b44 + d93dc59
commit 82d1b0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/conf/airframes/TUDELFT/tudelft_control_panel.xml b/conf/airframes/TUDELFT/tudelft_control_panel.xml
@@ -56,6 +56,7 @@
       <arg flag="4252" />
     </program>
     <program name="Iridium Link" command="sw/tools/iridium/iridium_link.py"/>
+    <program name="SVInfo" command="sw/ground_segment/python/svinfo/svinfo.py"/>
   </section>
 
   <section name="sessions">
@@ -176,6 +177,7 @@
         <arg flag="-s" constant="57600"/>
       </program>
       <program name="Server"/>
+      <program name="SVInfo"/>
       <program name="GCS">
         <arg flag="-speech" />
         <arg flag="-layout"  constant="bottom_settings.xml" />

diff --git 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) (-.ned.(2))
+  printf " {%.2f, %.2f, %.2f}, /* ENU in meters  */ \\\n" ned.(1) ned.(0) (float_of_string alt -. !ground_alt)
 
 let convert_angle = fun rad -> Int64.of_float (1e7 *. (Rad>>Deg)rad)