[paparazzi-commits] [4992] nps: correctly convert feet to meters for ecef data

[Felix Ruess]

Revision: 4992
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4992
Author:   flixr
Date:     2010-06-20 22:03:25 +0000 (Sun, 20 Jun 2010)
Log Message:
-----------
nps: correctly convert feet to meters for ecef data

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-06-20 18:05:01 UTC 
(rev 4991)
+++ paparazzi3/trunk/sw/simulator/nps/nps_fdm_jsbsim.c  2010-06-20 22:03:25 UTC 
(rev 4992)
@@ -189,13 +189,9 @@
 
 static void init_ltp(void) {
 
-  FGPropagate* propagate;
-  FGPropagate::VehicleState* VState;
+  FGPropagate* propagate = FDMExec->GetPropagate();
 
-  propagate = FDMExec->GetPropagate();
-  VState = propagate->GetVState();
-
-  jsbsimloc_to_loc(&fdm.ecef_pos,&VState->vLocation);
+  jsbsimloc_to_loc(&fdm.ecef_pos,&propagate->GetLocation());
   ltp_def_from_ecef_d(&ltpdef,&fdm.ecef_pos);
 
   fdm.ltp_g.x = 0.;
@@ -205,23 +201,21 @@
   fdm.ltp_h.x = 0.4912;
   fdm.ltp_h.y = 0.1225;
   fdm.ltp_h.z = 0.8624;
-
-
 }
 
 static void jsbsimloc_to_loc(EcefCoor_d* fdm_location, const FGLocation* 
jsb_location){
 
-  fdm_location->x = jsb_location->Entry(1);
-  fdm_location->y = jsb_location->Entry(2);
-  fdm_location->z = jsb_location->Entry(3);
+  fdm_location->x = MetersOfFeet(jsb_location->Entry(1));
+  fdm_location->y = MetersOfFeet(jsb_location->Entry(2));
+  fdm_location->z = MetersOfFeet(jsb_location->Entry(3));
 
 }
 
 static void jsbsimvec_to_vec(DoubleVect3* fdm_vector, const FGColumnVector3* 
jsb_vector) {
 
-  fdm_vector->x = jsb_vector->Entry(1);
-  fdm_vector->y = jsb_vector->Entry(2);
-  fdm_vector->z = jsb_vector->Entry(3);
+  fdm_vector->x = MetersOfFeet(jsb_vector->Entry(1));
+  fdm_vector->y = MetersOfFeet(jsb_vector->Entry(2));
+  fdm_vector->z = MetersOfFeet(jsb_vector->Entry(3));
 
 }