[paparazzi-commits] [4338] EGM96 model moved tonew module

[Pascal Brisset]

Revision: 4338
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4338
Author:   hecto
Date:     2009-11-16 17:30:04 +0000 (Mon, 16 Nov 2009)
Log Message:
-----------
 EGM96 model moved tonew module

Modified Paths:
--------------
    paparazzi3/trunk/sw/tools/gen_flight_plan.ml

Modified: paparazzi3/trunk/sw/tools/gen_flight_plan.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_flight_plan.ml        2009-11-16 16:42:55 UTC 
(rev 4337)
+++ paparazzi3/trunk/sw/tools/gen_flight_plan.ml        2009-11-16 17:30:04 UTC 
(rev 4338)
@@ -125,7 +125,7 @@
   and y = float_attrib waypoint "y"
   and alt = try Xml.attrib waypoint "alt" with _ -> default_alt in
   let wgs84 = Latlong.of_utm Latlong.WGS84 (Latlong.utm_add utm0 (x, y)) in
-  printf " {%d, %d, %.0f}, /* 1e7deg, 1e7deg, cm (hmsl=%.2fm) */ \\\n" 
(convert_angle wgs84.posn_lat) (convert_angle wgs84.posn_long) (100. *. 
float_of_string alt) (egm96 wgs84)
+  printf " {%d, %d, %.0f}, /* 1e7deg, 1e7deg, cm (hmsl=%.2fm) */ \\\n" 
(convert_angle wgs84.posn_lat) (convert_angle wgs84.posn_long) (100. *. 
float_of_string alt) (Egm96.of_wgs84 wgs84)
 
 
 let index_of_blocks = ref []
@@ -753,7 +753,7 @@
       Xml2h.define "NAV_LAT0" (sprintf "%d /* 1e7deg */" (convert_angle 
wgs84.posn_lat));
       Xml2h.define "NAV_LON0" (sprintf "%d /* 1e7deg */" (convert_angle 
wgs84.posn_long));
       Xml2h.define "NAV_ALT0" (sprintf "%.0f /* cm from msl */" (100. *. 
!ground_alt));
-      Xml2h.define "NAV_HMSL0" (sprintf "%.0f /* cm, msl from ellipsoid 
(EGM96) */" (100. *. Latlong.egm96 wgs84));
+      Xml2h.define "NAV_HMSL0" (sprintf "%.0f /* cm, msl from ellipsoid 
(EGM96) */" (100. *. Egm96.of_wgs84 wgs84));
       
       Xml2h.define "QFU" (sprintf "%.1f" qfu);