From dff16b3f8d0ba8dad21a8a48f04d80beeae6e556 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 30 Oct 2001 16:14:51 +0000 Subject: [PATCH] Fix from Dave to get JSBSim engine startups working again. --- src/FDM/JSBSim.cxx | 6 +++++- src/FDM/JSBSim/Makefile.am | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx index 8dbd2eced..e7ff9c291 100644 --- 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 323190afd..c25c62cff 100644 --- 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 -- 2.39.5