From: Bertrand <bco...@us...> - 2016-05-16 18:20:00
|
Update of /cvsroot/jsbsim/JSBSim/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18420/src Modified Files: FGFDMExec.cpp Log Message: The steering angle of each landing gear is now managed by FGGroundReactions and FGLGear. FGFCS no longer needs to know how many gears there are, which ones are steerable, which are not, etc. The steering angle was also stored in 3 different locations FGFCS::SteerPosDeg, FGLGear::in::SteerPosDeg and FGLGear::SteerAngle. Now the data is stored in FGLGear::SteerAngle only. This results in a better encapsulation of the landing gears code. The code is also simpler since information no longer need to be exchanged back and forth between FGLGear and FGFCS. Index: FGFDMExec.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/FGFDMExec.cpp,v retrieving revision 1.190 retrieving revision 1.191 diff -C2 -r1.190 -r1.191 *** FGFDMExec.cpp 1 May 2016 18:25:57 -0000 1.190 --- FGFDMExec.cpp 16 May 2016 18:19:57 -0000 1.191 *************** *** 447,451 **** GroundReactions->in.Temperature = Atmosphere->GetTemperature(); GroundReactions->in.TakeoffThrottle = (FCS->GetThrottlePos().size() > 0) ? (FCS->GetThrottlePos(0) > 0.90) : false; - GroundReactions->in.SteerPosDeg = FCS->GetSteerPosDeg(); GroundReactions->in.BrakePos = FCS->GetBrakePos(); GroundReactions->in.FCSGearPos = FCS->GetGearPos(); --- 447,450 ---- *************** *** 752,759 **** result = ((FGGroundReactions*)Models[eGroundReactions])->Load(element); if (!result) { ! cerr << endl << "Aircraft ground_reactions element has problems in file " << aircraftCfgFileName << endl; return result; } - ((FGFCS*)Models[eSystems])->AddGear(((FGGroundReactions*)Models[eGroundReactions])->GetNumGearUnits()); } else { cerr << endl << "No ground_reactions element was found in the aircraft config file." << endl; --- 751,759 ---- result = ((FGGroundReactions*)Models[eGroundReactions])->Load(element); if (!result) { ! cerr << endl << element->ReadFrom() ! << "Aircraft ground_reactions element has problems in file " ! << aircraftCfgFileName << endl; return result; } } else { cerr << endl << "No ground_reactions element was found in the aircraft config file." << endl; |