[paparazzi-commits] [4221] add generation of NAV_HMSL0 (from EGM96 precomputed model)

[Pascal Brisset]

Revision: 4221
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4221
Author:   hecto
Date:     2009-10-02 15:43:29 +0000 (Fri, 02 Oct 2009)
Log Message:
-----------
 add generation of NAV_HMSL0 (from EGM96 precomputed model)

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-10-01 19:00:31 UTC 
(rev 4220)
+++ paparazzi3/trunk/sw/tools/gen_flight_plan.ml        2009-10-02 15:43:29 UTC 
(rev 4221)
@@ -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 */ \\\n" (convert_angle 
wgs84.posn_lat) (convert_angle wgs84.posn_long) (100. *. float_of_string alt)
+  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)
 
 
 let index_of_blocks = ref []
@@ -752,8 +752,9 @@
       Xml2h.define "NAV_UTM_ZONE0" (sprintf "%d" utm0.utm_zone);
       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 hmsl */" (100. *. 
!ground_alt));
-
+      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 "QFU" (sprintf "%.1f" qfu);
       
       let waypoints = dummy_waypoint :: waypoints in