Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 12:23:23 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

fix node name to get simulation time

Browse Source
This commit is contained in:
Gautier Hattenberger
2010-03-18 10:05:31 +00:00
parent 02804d6fad
commit 1333cd4c97
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/simulator/sim_ac_fw.c
+3 -3
View File
@@ -90,7 +90,7 @@ void autopilot_event_task(void) {
void print(FGFDMExec* FDMExec) { void print(FGFDMExec* FDMExec) {
FGPropertyManager* cur_node; FGPropertyManager* cur_node;
double cur_value, factor=1; 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", /*"position/lat-gc-deg","position/long-gc-deg","position/h-sl-meters",
"ic/lat-gc-deg","ic/long-gc-deg","ic/h-sl-ft", "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",*/ "velocities/v-north-fps","velocities/v-east-fps","velocities/v-down-fps","velocities/vg-fps",*/
@@ -100,7 +100,7 @@ void print(FGFDMExec* FDMExec) {
//"fcs/throttle-cmd-norm","fcs/aileron-cmd-norm","fcs/elevator-cmd-norm"}; //"fcs/throttle-cmd-norm","fcs/aileron-cmd-norm","fcs/elevator-cmd-norm"};
int i=0; 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(); cur_value = cur_node->getDoubleValue();
cout << state[i] << " " << cur_value << endl; cout << state[i] << " " << cur_value << endl;
@@ -175,7 +175,7 @@ void copy_outputs_from_jsbsim(FGFDMExec* FDMExec) {
double course = get_value(FDMExec, "attitude/heading-true-rad"); double course = get_value(FDMExec, "attitude/heading-true-rad");
double gspeed = get_value(FDMExec, "velocities/vg-fps") * FT2M; double gspeed = get_value(FDMExec, "velocities/vg-fps") * FT2M;
double climb = get_value(FDMExec, "velocities/v-down-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_use_gps_pos(lat, lon, alt, course, gspeed, climb, time);
sim_update_sv(); sim_update_sv();
gps_period = 0.; gps_period = 0.;
sw/simulator/sim_ac_jsbsim.c
+2 -2
View File
@@ -184,8 +184,8 @@ void jsbsim_init(void) {
FDMExec = new JSBSim::FGFDMExec(); FDMExec = new JSBSim::FGFDMExec();
/* Set simulation time step */ /* Set simulation time step */
FDMExec->GetState()->Setsim_time(0.); FDMExec->Setsim_time(0.);
FDMExec->GetState()->Setdt(DT); FDMExec->Setdt(DT);
cout << "Simulation delta " << FDMExec->GetDeltaT() << endl; cout << "Simulation delta " << FDMExec->GetDeltaT() << endl;
FDMExec->DisableOutput(); FDMExec->DisableOutput();