}
FGJSBBase::Message* msg;
- while (msg = fdmex->ProcessNextMessage()) {
+ while ((msg = fdmex->ProcessNextMessage()) != NULL) {
// msg = fdmex->ProcessNextMessage();
switch (msg->type) {
case FGJSBBase::Message::eText:
/******************************************************************************/
+void FGJSBsim::suspend()
+{
+ fdmex->Hold();
+ SGSubsystem::suspend();
+}
+
+/******************************************************************************/
+
+void FGJSBsim::resume()
+{
+ fdmex->Resume();
+ SGSubsystem::resume();
+}
+
+/******************************************************************************/
+
// Convert from the FGInterface struct to the JSBsim generic_ struct
bool FGJSBsim::copy_to_JSBsim()
} // end FGTurbine code block
case FGEngine::etRocket:
{ // FGRocket code block
- FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
+// FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
break;
} // end FGRocket code block
case FGEngine::etTurboprop:
break;
case FGEngine::etRocket:
{ // FGRocket code block
- FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
+// FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
} // end FGRocket code block
break;
case FGEngine::etTurbine:
node->setDoubleValue("egt-degf", 32 + eng->GetEGT()*9/5);
node->setBoolValue("augmentation", eng->GetAugmentation());
node->setBoolValue("water-injection", eng->GetInjection());
- node->setBoolValue("ignition", eng->GetIgnition());
+ node->setBoolValue("ignition", eng->GetIgnition() != 0);
node->setDoubleValue("nozzle-pos-norm", eng->GetNozzle());
node->setDoubleValue("inlet-pos-norm", eng->GetInlet());
node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
node->setDoubleValue("n1", eng->GetN1());
//node->setDoubleValue("n2", eng->GetN2());
node->setDoubleValue("itt_degf", 32 + eng->GetITT()*9/5);
- node->setBoolValue("ignition", eng->GetIgnition());
+ node->setBoolValue("ignition", eng->GetIgnition() != 0);
node->setDoubleValue("nozzle-pos-norm", eng->GetNozzle());
node->setDoubleValue("inlet-pos-norm", eng->GetInlet());
node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
node->setBoolValue("cutoff", eng->GetCutoff());
node->setBoolValue("starting", eng->GetEngStarting());
node->setBoolValue("generator-power", eng->GetGeneratorPower());
- node->setBoolValue("damaged", eng->GetCondition());
+ node->setBoolValue("damaged", eng->GetCondition() != 0);
node->setBoolValue("ielu-intervent", eng->GetIeluIntervent());
node->setDoubleValue("oil-temperature-degf", eng->getOilTemp_degF());
// node->setBoolValue("onfire", eng->GetFire());
switch (thruster->GetType()) {
case FGThruster::ttNozzle:
{ // FGNozzle code block
- FGNozzle* noz = (FGNozzle*)thruster;
+// FGNozzle* noz = (FGNozzle*)thruster;
} // end FGNozzle code block
break;
case FGThruster::ttPropeller:
break;
case FGThruster::ttRotor:
{ // FGRotor code block
- FGRotor* rotor = (FGRotor*)thruster;
+// FGRotor* rotor = (FGRotor*)thruster;
} // end FGRotor code block
break;
case FGThruster::ttDirect:
_set_Sea_level_radius( sea_level_radius_meters * SG_METER_TO_FEET );
fgic->SetSeaLevelRadiusFtIC( sea_level_radius_meters * SG_METER_TO_FEET );
fgic->SetLatitudeRadIC( lat_geoc );
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
update_ic();
fgic->SetLongitudeRadIC( lon );
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
// Sets the altitude above sea level.
"Terrain elevation: " << FGInterface::get_Runway_altitude() * SG_METER_TO_FEET );
fgic->SetLatitudeRadIC( lat_geoc );
fgic->SetAltitudeASLFtIC(alt);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_V_calibrated_kts(double vc)
update_ic();
fgic->SetVcalibratedKtsIC(vc);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Mach_number(double mach)
update_ic();
fgic->SetMachIC(mach);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Velocities_Local( double north, double east, double down )
fgic->SetVNorthFpsIC(north);
fgic->SetVEastFpsIC(east);
fgic->SetVDownFpsIC(down);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Velocities_Wind_Body( double u, double v, double w)
fgic->SetUBodyFpsIC(u);
fgic->SetVBodyFpsIC(v);
fgic->SetWBodyFpsIC(w);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
//Euler angles
fgic->SetThetaRadIC(theta);
fgic->SetPhiRadIC(phi);
fgic->SetPsiRadIC(psi);
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
//Flight Path
if( !(fabs(roc) > 1 && fabs(fgic->GetFlightPathAngleRadIC()) < 0.01) ) {
fgic->SetClimbRateFpsIC(roc);
}
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::set_Gamma_vert_rad( double gamma)
if( !(fabs(gamma) < 0.01 && fabs(fgic->GetClimbRateFpsIC()) > 1) ) {
fgic->SetFlightPathAngleRadIC(gamma);
}
- needTrim=true;
+
+ if (!fdmex->Holding())
+ needTrim=true;
}
void FGJSBsim::init_gear(void )
globals->get_controls()->set_elevator_trim(FCS->GetPitchTrimCmd());
globals->get_controls()->set_elevator(FCS->GetDeCmd());
- globals->get_controls()->set_throttle(FGControls::ALL_ENGINES,
- FCS->GetThrottleCmd(0));
+ for( unsigned i = 0; i < Propulsion->GetNumEngines(); i++ )
+ globals->get_controls()->set_throttle(i, FCS->GetThrottleCmd(i));
globals->get_controls()->set_aileron(FCS->GetDaCmd());
globals->get_controls()->set_rudder( FCS->GetDrCmd());