[paparazzi-commits] [6155] get geodetic latitude from jsbsim and use that for flightgear gui

[Felix Ruess]

Revision: 6155
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6155
Author:   flixr
Date:     2010-10-13 19:53:12 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
get geodetic latitude from jsbsim and use that for flightgear gui

Modified Paths:
--------------
    paparazzi3/trunk/sw/simulator/nps/nps_fdm_jsbsim.c

Modified: paparazzi3/trunk/sw/simulator/nps/nps_fdm_jsbsim.c
===================================================================
--- paparazzi3/trunk/sw/simulator/nps/nps_fdm_jsbsim.c  2010-10-13 19:53:04 UTC 
(rev 6154)
+++ paparazzi3/trunk/sw/simulator/nps/nps_fdm_jsbsim.c  2010-10-13 19:53:12 UTC 
(rev 6155)
@@ -23,7 +23,7 @@
 static void jsbsimloc_to_loc(EcefCoor_d* fdm_location, const FGLocation* 
jsb_location);
 static void jsbsimquat_to_quat(DoubleQuat* fdm_quat, const FGQuaternion* 
jsb_quat);
 static void jsbsimvec_to_rate(DoubleRates* fdm_rate, const FGColumnVector3* 
jsb_vector);
-//static void jsbsimloc_to_lla(LlaCoor_d* fdm_lla, FGLocation* jsb_location);
+static void jsbsimloc_to_lla(LlaCoor_d* fdm_lla, FGPropagate* propagate);
 //static void rate_to_vec(DoubleVect3* vector, DoubleRates* rate);
 static void test123(LlaCoor_d* fdm_lla, FGPropagate* propagate);
 
@@ -115,8 +115,8 @@
   ned_of_ecef_vect_d(&fdm.ltpprz_ecef_accel, &ltpdef, &fdm.ecef_ecef_accel);
 
   /* lla */
-  //jsbsimloc_to_lla(&fdm.lla_pos, &VState->vLocation);
-  test123(&fdm.lla_pos, propagate);
+  jsbsimloc_to_lla(&fdm.lla_pos, propagate);
+  //test123(&fdm.lla_pos, propagate);
 
 
   /*
@@ -249,12 +249,16 @@
   vector->z = rate->r;
 
 }
+#endif
 
-void jsbsimloc_to_lla(LlaCoor_d* fdm_lla, FGLocation* jsb_location) {
+void jsbsimloc_to_lla(LlaCoor_d* fdm_lla, FGPropagate* propagate) {
 
-  fdm_lla->lat = jsb_location->GetGeodLatitudeRad();
-  fdm_lla->lon = jsb_location->GetLongitude();
-  fdm_lla->alt = MetersOfFeet(jsb_location->GetGeodeticAltitude());
-  //  printf("%f\n", jsb_location->GetGeodAltitude());
+  fdm_lla->lat = propagate->GetGeodLatitudeRad();
+  fdm_lla->lon = propagate->GetLongitude();
+  fdm_lla->alt = MetersOfFeet(propagate->GetDistanceAGL());
+  //printf("geodetic alt: %f\n", 
MetersOfFeet(propagate->GetGeodeticAltitude()));
+  //printf("ground alt: %f\n", MetersOfFeet(propagate->GetDistanceAGL()));
+  //printf("ASL alt: %f\n", MetersOfFeet(propagate->GetAltitudeASLmeters()));
+
 }
-#endif
+