Fix from Dave to get JSBSim engine startups working again.

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 8dbd2eced1eb18e850a77ee74c4aa829df90179a..e7ff9c2916c2ba5b0f5d192867bce2c5246a2742 100644 (file)
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -64,7 +64,7 @@ FGJSBsim::FGJSBsim( double dt )
 {
     bool result;
    
-    fdmex=new FGFDMExec;
+    fdmex = new FGFDMExec;
     
     State        = fdmex->GetState();
     Atmosphere   = fdmex->GetAtmosphere();
@@ -267,11 +267,15 @@ bool FGJSBsim::update( int multiloop ) {
       FGEngInterface * e = get_engine(i);
       FGEngine * eng = Propulsion->GetEngine(i);
       FGThruster * thrust = Propulsion->GetThruster(i);
+      eng->SetMagnetos( globals->get_controls()->get_magnetos(i) );
+      eng->SetStarter( globals->get_controls()->get_starter(i) );
       e->set_Manifold_Pressure( eng->getManifoldPressure_inHg() );
       e->set_RPM( thrust->GetRPM() );
       e->set_EGT( eng->getExhaustGasTemp_degF() );
       e->set_CHT( eng->getCylinderHeadTemp_degF() );
       e->set_Oil_Temp( eng->getOilTemp_degF() );
+      e->set_Running_Flag( eng->GetRunning() );
+      e->set_Cranking_Flag( eng->GetCranking() );
       e->set_Throttle( globals->get_controls()->get_throttle(i) );
     }
 

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 323190afd7cc26ae9a01ed785979d4b2e6ce8ae0..c25c62cffca6445eee618323391ef93b985c00e7 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -56,12 +56,16 @@ libJSBSim_a_SOURCES = \
        FGTank.cpp FGTank.h \
        FGfdmSocket.cpp FGfdmSocket.h
 
-noinst_PROGRAMS = testJSBsim
+noinst_PROGRAMS = testJSBsim # demo
 
 testJSBsim_SOURCES = JSBSim.cpp
 
 testJSBsim_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
 
+# demo_SOURCES = demo.cxx
+
+# demo_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
+
 INCLUDES += -I$(top_srcdir)/src
 
 DEFS += -DFGFS