#endif
#include <simgear/compiler.h>
+#include <simgear/sg_inlines.h>
#include <stdio.h> // size_t
#include <string>
}
}
- resetPropertyState();
-
fdmex = new FGFDMExec( (FGPropertyManager*)globals->get_props() );
// Register ground callback.
// Set initial fuel levels if provided.
for (unsigned int i = 0; i < Propulsion->GetNumTanks(); i++) {
+ double d;
SGPropertyNode * node = fgGetNode("/consumables/fuel/tank", i, true);
- if (node->getChild("level-gal_us", 0, false) != 0) {
- Propulsion->GetTank(i)->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
+ FGTank* tank = Propulsion->GetTank(i);
+
+ d = node->getNode( "density-ppg", true )->getDoubleValue();
+ if( d > 0.0 ) {
+ tank->SetDensity( d );
+ } else {
+ node->getNode( "density-ppg", true )->setDoubleValue( SG_MAX2<double>(tank->GetDensity(), 0.1) );
+ }
+
+ d = node->getNode( "level-lbs", true )->getDoubleValue();
+ if( d > 0.0 ) {
+ tank->SetContents( d );
} else {
- node->setDoubleValue("level-lbs", Propulsion->GetTank(i)->GetContents());
- node->setDoubleValue("level-gal_us", Propulsion->GetTank(i)->GetContents() / 6.6);
+ node->getNode( "level-lbs", true )->setDoubleValue( tank->GetContents() );
}
- node->setDoubleValue("capacity-gal_us",
- Propulsion->GetTank(i)->GetCapacity() / 6.6);
+ /* Capacity is read-only in FGTank and can't be overwritten from FlightGear */
+ node->getNode("capacity-gal_us", true )->setDoubleValue( tank->GetCapacityGallons() );
}
Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-offset-x-in", 196),
fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-offset-y-in", 0),
fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-offset-z-in", -16));
+ last_hook_tip[0] = 0; last_hook_tip[1] = 0; last_hook_tip[2] = 0;
+ last_hook_root[0] = 0; last_hook_root[1] = 0; last_hook_root[2] = 0;
crashed = false;
}
/******************************************************************************/
+void FGJSBsim::unbind()
+{
+ fdmex->Unbind();
+ FGInterface::unbind();
+}
+
+/******************************************************************************/
+
// Run an iteration of the EOM (equations of motion)
void FGJSBsim::update( double dt )
}
FGJSBBase::Message* msg;
- while (msg = fdmex->ProcessNextMessage()) {
+ while ((msg = fdmex->ProcessNextMessage()) != NULL) {
// msg = fdmex->ProcessNextMessage();
switch (msg->type) {
case FGJSBBase::Message::eText:
} // 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:
for (i = 0; i < Propulsion->GetNumTanks(); i++) {
SGPropertyNode * node = fgGetNode("/consumables/fuel/tank", i, true);
FGTank * tank = Propulsion->GetTank(i);
- tank->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
-// tank->SetContents(node->getDoubleValue("level-lbs"));
+ double fuelDensity = node->getDoubleValue("density-ppg");
+
+ if (fuelDensity < 0.1)
+ fuelDensity = 6.0; // Use average fuel value
+
+ tank->SetDensity(fuelDensity);
+ tank->SetContents(node->getDoubleValue("level-lbs"));
}
Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
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:
FGTank* tank = Propulsion->GetTank(i);
double contents = tank->GetContents();
double temp = tank->GetTemperature_degC();
- node->setDoubleValue("level-gal_us", contents/6.6);
+ double fuelDensity = tank->GetDensity();
+
+ if (fuelDensity < 0.1)
+ fuelDensity = 6.0; // Use average fuel value
+
+ node->setDoubleValue("density-ppg" , fuelDensity);
node->setDoubleValue("level-lbs", contents);
if (temp != -9999.0) node->setDoubleValue("temperature_degC", temp);
}
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());
fgSetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-deg", fi);
}
-void FGJSBsim::resetPropertyState()
-{
-// this code works-around bug #222:
-// http://code.google.com/p/flightgear-bugs/issues/detail?id=222
-// for whatever reason, having an existing value for the WOW
-// property causes the NaNs. Should that be fixed, this code can die
- SGPropertyNode* gear = fgGetNode("/fdm/jsbsim/gear", false);
- if (!gear) {
- return;
- }
-
- int index = 0;
- SGPropertyNode* unitNode = NULL;
- for (; (unitNode = gear->getChild("unit", index)) != NULL; ++index) {
- unitNode->removeChild("WOW", 0, false);
- }
-}
-