[paparazzi-commits] [4711] fix node name to get simulation time

[Gautier Hattenberger]

Revision: 4711
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4711
Author:   gautier
Date:     2010-03-18 10:05:31 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
fix node name to get simulation time

Modified Paths:
--------------
    paparazzi3/trunk/sw/simulator/sim_ac_fw.c
    paparazzi3/trunk/sw/simulator/sim_ac_jsbsim.c

Modified: paparazzi3/trunk/sw/simulator/sim_ac_fw.c
===================================================================
--- paparazzi3/trunk/sw/simulator/sim_ac_fw.c   2010-03-18 07:42:37 UTC (rev 
4710)
+++ paparazzi3/trunk/sw/simulator/sim_ac_fw.c   2010-03-18 10:05:31 UTC (rev 
4711)
@@ -90,7 +90,7 @@
 void print(FGFDMExec* FDMExec) {
   FGPropertyManager* cur_node;
   double cur_value, factor=1;
-  const char* state[] = {"sim-time-sec",
+  const char* state[] = {"simulation/sim-time-sec",
                         
/*"position/lat-gc-deg","position/long-gc-deg","position/h-sl-meters",
                         "ic/lat-gc-deg","ic/long-gc-deg","ic/h-sl-ft",
                         
"velocities/v-north-fps","velocities/v-east-fps","velocities/v-down-fps","velocities/vg-fps",*/
@@ -100,7 +100,7 @@
                         
//"fcs/throttle-cmd-norm","fcs/aileron-cmd-norm","fcs/elevator-cmd-norm"};
   int i=0;
 
-  cur_node = FDMExec->GetPropertyManager()->GetNode("sim-time-sec");
+  cur_node = FDMExec->GetPropertyManager()->GetNode("simulation/sim-time-sec");
   cur_value = cur_node->getDoubleValue();
   cout << state[i] << " " << cur_value << endl;
   
@@ -175,7 +175,7 @@
     double course = get_value(FDMExec, "attitude/heading-true-rad");
     double gspeed = get_value(FDMExec, "velocities/vg-fps") * FT2M;
     double climb  = get_value(FDMExec, "velocities/v-down-fps") * (-FT2M);
-    double time   = get_value(FDMExec, "sim-time-sec");
+    double time   = get_value(FDMExec, "simulation/sim-time-sec");
     sim_use_gps_pos(lat, lon, alt, course, gspeed, climb, time);
     sim_update_sv();
     gps_period = 0.;

Modified: paparazzi3/trunk/sw/simulator/sim_ac_jsbsim.c
===================================================================
--- paparazzi3/trunk/sw/simulator/sim_ac_jsbsim.c       2010-03-18 07:42:37 UTC 
(rev 4710)
+++ paparazzi3/trunk/sw/simulator/sim_ac_jsbsim.c       2010-03-18 10:05:31 UTC 
(rev 4711)
@@ -184,8 +184,8 @@
   FDMExec = new JSBSim::FGFDMExec();
 
   /* Set simulation time step */
-  FDMExec->GetState()->Setsim_time(0.);
-  FDMExec->GetState()->Setdt(DT);
+  FDMExec->Setsim_time(0.);
+  FDMExec->Setdt(DT);
   cout << "Simulation delta " << FDMExec->GetDeltaT() << endl;
 
   FDMExec->DisableOutput();