From: Tony P. <ap...@us...> - 2001-12-02 15:54:51
|
Update of /cvsroot/jsbsim/JSBSim In directory usw-pr-cvs1:/tmp/cvs-serv4425 Modified Files: FGFCS.h FGFCS.cpp Log Message: Added support for landing gear control. Index: FGFCS.h =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGFCS.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** FGFCS.h 2001/12/01 21:20:04 1.37 --- FGFCS.h 2001/12/02 15:54:48 1.38 *************** *** 212,215 **** --- 212,220 ---- @return pitch trim command in radians */ inline double GetPitchTrimCmd(void) { return PTrimCmd; } + + /** Get the gear extend/retract command. 0 commands gear up, 1 down. + defaults to down. + @return the current value of the gear extend/retract command*/ + inline double GetGearCmd(void) { return GearCmd; } //@} *************** *** 249,252 **** --- 254,261 ---- @return mixture position for the given engine in percent ( 0 - 100)*/ inline double GetMixturePos(int engine) { return MixturePos[engine]; } + + /** Gets the gear position (0 up, 1 down), defaults to down + @return gear position (0 up, 1 down) */ + inline double GetGearPos(void) { return GearPos; } /** Gets the prop pitch position. *************** *** 316,319 **** --- 325,332 ---- @param cmd mixture command in percent (0 - 100)*/ void SetMixtureCmd(int engine, double cmd); + + /** Set the gear extend/retract command, defaults to down + @param gear command 0 for up, 1 for down */ + void SetGearCmd(double gearcmd) { GearCmd = gearcmd; } /** Sets the propeller pitch command for the specified engine *************** *** 358,362 **** --- 371,380 ---- @param cmd mixture setting in percent (0 - 100)*/ void SetMixturePos(int engine, double cmd); + + /** Set the gear extend/retract position, defaults to down + @param gear position 0 up, 1 down */ + void SetGearPos(double gearpos) { GearPos = gearpos; } + /** Sets the actual prop pitch setting for the specified engine @param engine engine ID number *************** *** 406,409 **** --- 424,428 ---- vector <double> PropPitchPos; double LeftBrake, RightBrake, CenterBrake; // Brake settings + double GearCmd,GearPos; vector <FGFCSComponent*> Components; Index: FGFCS.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGFCS.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** FGFCS.cpp 2001/12/01 21:20:03 1.62 --- FGFCS.cpp 2001/12/02 15:54:48 1.63 *************** *** 55,59 **** #include "filtersjb/FGSwitch.h" #include "filtersjb/FGSummer.h" ! #include "filtersjb/FGFlaps.h" static const char *IdSrc = "$Id$"; --- 55,59 ---- #include "filtersjb/FGSwitch.h" #include "filtersjb/FGSummer.h" ! #include "filtersjb/FGKinemat.h" static const char *IdSrc = "$Id$"; *************** *** 70,73 **** --- 70,74 ---- DaCmd = DeCmd = DrCmd = DfCmd = DsbCmd = DspCmd = PTrimCmd = 0.0; DaPos = DePos = DrPos = DfPos = DsbPos = DspPos = 0.0; + GearCmd = GearPos = 1; // default to gear down LeftBrake = RightBrake = CenterBrake = 0.0; *************** *** 278,283 **** } else if (token == "SWITCH") { Components.push_back(new FGSwitch(this, AC_cfg)); ! } else if (token == "FLAPS") { ! Components.push_back(new FGFlaps(this, AC_cfg)); } else { cerr << "Unknown token [" << token << "] in FCS portion of config file" << endl; --- 279,284 ---- } else if (token == "SWITCH") { Components.push_back(new FGSwitch(this, AC_cfg)); ! } else if (token == "KINEMAT") { ! Components.push_back(new FGKinemat(this, AC_cfg)); } else { cerr << "Unknown token [" << token << "] in FCS portion of config file" << endl; |