From 48cad71a702c7db7981f893112cbccdc84428243 Mon Sep 17 00:00:00 2001 From: ehofman Date: Sun, 30 Aug 2009 08:22:03 +0000 Subject: [PATCH] Sync with JSBSim CVS again --- src/FDM/JSBSim/FGFDMExec.cpp | 2 +- src/FDM/JSBSim/FGFDMExec.h | 2 +- src/FDM/JSBSim/FGJSBBase.cpp | 2 +- src/FDM/JSBSim/FGJSBBase.h | 2 +- src/FDM/JSBSim/FGState.cpp | 2 +- src/FDM/JSBSim/FGState.h | 2 +- .../JSBSim/input_output/FGPropertyManager.h | 13 ++++++------ src/FDM/JSBSim/input_output/FGScript.cpp | 2 +- src/FDM/JSBSim/input_output/FGScript.h | 2 +- src/FDM/JSBSim/input_output/FGXMLElement.cpp | 2 +- src/FDM/JSBSim/input_output/FGXMLElement.h | 2 +- src/FDM/JSBSim/input_output/FGXMLFileRead.h | 2 +- src/FDM/JSBSim/input_output/FGXMLParse.cpp | 2 +- src/FDM/JSBSim/input_output/FGXMLParse.h | 2 +- src/FDM/JSBSim/input_output/FGfdmSocket.cpp | 2 +- src/FDM/JSBSim/input_output/FGfdmSocket.h | 2 +- src/FDM/JSBSim/math/FGColumnVector3.cpp | 2 +- src/FDM/JSBSim/math/FGColumnVector3.h | 2 +- src/FDM/JSBSim/math/FGCondition.cpp | 2 +- src/FDM/JSBSim/math/FGFunction.cpp | 2 +- src/FDM/JSBSim/math/FGFunction.h | 2 +- src/FDM/JSBSim/math/FGLocation.cpp | 2 +- src/FDM/JSBSim/math/FGLocation.h | 2 +- src/FDM/JSBSim/math/FGMatrix33.h | 2 +- src/FDM/JSBSim/math/FGParameter.h | 2 +- src/FDM/JSBSim/math/FGPropertyValue.cpp | 2 +- src/FDM/JSBSim/math/FGPropertyValue.h | 2 +- src/FDM/JSBSim/math/FGQuaternion.cpp | 2 +- src/FDM/JSBSim/math/FGQuaternion.h | 2 +- src/FDM/JSBSim/math/FGRealValue.cpp | 2 +- src/FDM/JSBSim/math/FGRealValue.h | 2 +- src/FDM/JSBSim/math/FGTable.cpp | 2 +- src/FDM/JSBSim/math/FGTable.h | 2 +- src/FDM/JSBSim/models/FGAerodynamics.cpp | 2 +- src/FDM/JSBSim/models/FGAerodynamics.h | 2 +- src/FDM/JSBSim/models/FGAircraft.cpp | 2 +- src/FDM/JSBSim/models/FGAircraft.h | 2 +- src/FDM/JSBSim/models/FGAtmosphere.cpp | 2 +- src/FDM/JSBSim/models/FGAtmosphere.h | 2 +- src/FDM/JSBSim/models/FGAuxiliary.cpp | 5 ++++- src/FDM/JSBSim/models/FGAuxiliary.h | 2 +- src/FDM/JSBSim/models/FGBuoyantForces.cpp | 2 +- src/FDM/JSBSim/models/FGBuoyantForces.h | 2 +- src/FDM/JSBSim/models/FGExternalForce.cpp | 2 +- src/FDM/JSBSim/models/FGExternalForce.h | 2 +- src/FDM/JSBSim/models/FGFCS.cpp | 5 ++++- src/FDM/JSBSim/models/FGFCS.h | 2 +- src/FDM/JSBSim/models/FGGroundReactions.cpp | 2 +- src/FDM/JSBSim/models/FGGroundReactions.h | 2 +- src/FDM/JSBSim/models/FGInertial.cpp | 2 +- src/FDM/JSBSim/models/FGInertial.h | 2 +- src/FDM/JSBSim/models/FGInput.cpp | 2 +- src/FDM/JSBSim/models/FGInput.h | 2 +- src/FDM/JSBSim/models/FGLGear.cpp | 11 ++-------- src/FDM/JSBSim/models/FGLGear.h | 2 +- src/FDM/JSBSim/models/FGMassBalance.cpp | 2 +- src/FDM/JSBSim/models/FGMassBalance.h | 2 +- src/FDM/JSBSim/models/FGModel.cpp | 2 +- src/FDM/JSBSim/models/FGModel.h | 2 +- src/FDM/JSBSim/models/FGOutput.cpp | 6 +++--- src/FDM/JSBSim/models/FGOutput.h | 2 +- src/FDM/JSBSim/models/FGPropagate.cpp | 2 +- src/FDM/JSBSim/models/FGPropagate.h | 2 +- src/FDM/JSBSim/models/FGPropulsion.cpp | 2 +- src/FDM/JSBSim/models/FGPropulsion.h | 2 +- src/FDM/JSBSim/models/atmosphere/FGMars.cpp | 2 +- src/FDM/JSBSim/models/atmosphere/FGMars.h | 2 +- .../models/flight_control/FGAccelerometer.cpp | 20 +++++++++++++------ .../models/flight_control/FGAccelerometer.h | 2 ++ .../models/flight_control/FGActuator.cpp | 2 +- .../JSBSim/models/flight_control/FGActuator.h | 2 +- .../models/flight_control/FGFCSComponent.cpp | 2 ++ .../models/flight_control/FGFCSComponent.h | 3 +++ .../JSBSim/models/flight_control/FGFilter.h | 2 +- src/FDM/JSBSim/models/flight_control/FGGain.h | 2 +- .../JSBSim/models/flight_control/FGPID.cpp | 2 +- src/FDM/JSBSim/models/flight_control/FGPID.h | 2 +- .../JSBSim/models/flight_control/FGSensor.cpp | 14 ++++++++++++- .../JSBSim/models/flight_control/FGSensor.h | 2 ++ .../JSBSim/models/flight_control/FGSwitch.h | 2 +- .../JSBSim/models/flight_control/Makefile.am | 4 ++-- src/FDM/JSBSim/models/propulsion/FGEngine.cpp | 2 +- src/FDM/JSBSim/models/propulsion/FGEngine.h | 2 +- src/FDM/JSBSim/models/propulsion/FGNozzle.cpp | 2 +- src/FDM/JSBSim/models/propulsion/FGNozzle.h | 2 +- src/FDM/JSBSim/models/propulsion/FGPiston.cpp | 2 +- src/FDM/JSBSim/models/propulsion/FGPiston.h | 2 +- .../JSBSim/models/propulsion/FGPropeller.cpp | 2 +- .../JSBSim/models/propulsion/FGPropeller.h | 2 +- src/FDM/JSBSim/models/propulsion/FGRocket.cpp | 2 +- src/FDM/JSBSim/models/propulsion/FGRocket.h | 2 +- src/FDM/JSBSim/models/propulsion/FGRotor.cpp | 2 +- src/FDM/JSBSim/models/propulsion/FGRotor.h | 2 +- src/FDM/JSBSim/models/propulsion/FGTank.cpp | 2 +- src/FDM/JSBSim/models/propulsion/FGTank.h | 2 +- .../JSBSim/models/propulsion/FGThruster.cpp | 2 +- src/FDM/JSBSim/models/propulsion/FGThruster.h | 2 +- 97 files changed, 143 insertions(+), 114 deletions(-) diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp index da1b9deb0..c6740b4b6 100644 --- a/src/FDM/JSBSim/FGFDMExec.cpp +++ b/src/FDM/JSBSim/FGFDMExec.cpp @@ -5,7 +5,7 @@ Date started: 11/17/98 Purpose: Schedules and runs the model routines. - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/FGFDMExec.h b/src/FDM/JSBSim/FGFDMExec.h index 904e8e43a..50bffeaf5 100644 --- a/src/FDM/JSBSim/FGFDMExec.h +++ b/src/FDM/JSBSim/FGFDMExec.h @@ -4,7 +4,7 @@ Date started: 11/17/98 file The header file for the JSBSim executive. - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/FGJSBBase.cpp b/src/FDM/JSBSim/FGJSBBase.cpp index d0af549b8..4e02407a4 100644 --- a/src/FDM/JSBSim/FGJSBBase.cpp +++ b/src/FDM/JSBSim/FGJSBBase.cpp @@ -5,7 +5,7 @@ Date started: 07/01/01 Purpose: Encapsulates the JSBBase object - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/FGJSBBase.h b/src/FDM/JSBSim/FGJSBBase.h index 49b0aec9e..e8b60b6d4 100644 --- a/src/FDM/JSBSim/FGJSBBase.h +++ b/src/FDM/JSBSim/FGJSBBase.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 07/01/01 - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/FGState.cpp b/src/FDM/JSBSim/FGState.cpp index a3f51e25b..f9c19d37f 100644 --- a/src/FDM/JSBSim/FGState.cpp +++ b/src/FDM/JSBSim/FGState.cpp @@ -5,7 +5,7 @@ Date started: 11/17/98 Called by: FGFDMExec and accessed by all models. - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/FGState.h b/src/FDM/JSBSim/FGState.h index d1ca3d74f..c1b6f7281 100644 --- a/src/FDM/JSBSim/FGState.h +++ b/src/FDM/JSBSim/FGState.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 11/17/98 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGPropertyManager.h b/src/FDM/JSBSim/input_output/FGPropertyManager.h index aec24c36b..40c173fcd 100644 --- a/src/FDM/JSBSim/input_output/FGPropertyManager.h +++ b/src/FDM/JSBSim/input_output/FGPropertyManager.h @@ -35,17 +35,18 @@ SENTRY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +// This is needed by MSVC9 when included in FlightGear because of +// the new Vec4d class in props.hxx +#if defined( HAVE_CONFIG_H ) +# include +#endif + #include #include +#include #if !PROPS_STANDALONE - // This is needed by MSVC9 when included in FlightGear because of - // the new Vec4d class in props.hxx -# if defined( HAVE_CONFIG_H ) -# include -# endif # include #endif -#include #include "FGJSBBase.h" diff --git a/src/FDM/JSBSim/input_output/FGScript.cpp b/src/FDM/JSBSim/input_output/FGScript.cpp index 5605b615c..e0fff6a13 100755 --- a/src/FDM/JSBSim/input_output/FGScript.cpp +++ b/src/FDM/JSBSim/input_output/FGScript.cpp @@ -5,7 +5,7 @@ Date started: 12/21/01 Purpose: Loads and runs JSBSim scripts. - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGScript.h b/src/FDM/JSBSim/input_output/FGScript.h index 5ae50dfcf..41037c1d9 100644 --- a/src/FDM/JSBSim/input_output/FGScript.h +++ b/src/FDM/JSBSim/input_output/FGScript.h @@ -3,7 +3,7 @@ Author: Jon Berndt Date started: 12/21/2001 - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.cpp b/src/FDM/JSBSim/input_output/FGXMLElement.cpp index 74983440e..f4f628e8b 100755 --- a/src/FDM/JSBSim/input_output/FGXMLElement.cpp +++ b/src/FDM/JSBSim/input_output/FGXMLElement.cpp @@ -5,7 +5,7 @@ Purpose: XML element class Called by: FGXMLParse - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.h b/src/FDM/JSBSim/input_output/FGXMLElement.h index 90bfa58f7..f8a85bbcd 100755 --- a/src/FDM/JSBSim/input_output/FGXMLElement.h +++ b/src/FDM/JSBSim/input_output/FGXMLElement.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 9/28/04 - ------------- Copyright (C) 2004 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2004 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGXMLFileRead.h b/src/FDM/JSBSim/input_output/FGXMLFileRead.h index b9e250600..ce33d8c5b 100755 --- a/src/FDM/JSBSim/input_output/FGXMLFileRead.h +++ b/src/FDM/JSBSim/input_output/FGXMLFileRead.h @@ -5,7 +5,7 @@ Date started: 02/04/07 Purpose: Shared base class that wraps the XML file reading logic - ------------- Copyright (C) 2007 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2007 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGXMLParse.cpp b/src/FDM/JSBSim/input_output/FGXMLParse.cpp index b8923225f..ffc3d173b 100755 --- a/src/FDM/JSBSim/input_output/FGXMLParse.cpp +++ b/src/FDM/JSBSim/input_output/FGXMLParse.cpp @@ -6,7 +6,7 @@ Purpose: Config file read-in class and XML parser Called by: Various - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGXMLParse.h b/src/FDM/JSBSim/input_output/FGXMLParse.h index c96690243..74580060b 100755 --- a/src/FDM/JSBSim/input_output/FGXMLParse.h +++ b/src/FDM/JSBSim/input_output/FGXMLParse.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 8/20/04 - ------------- Copyright (C) 2004 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2004 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp index 7fa7ae59f..365c1916f 100644 --- a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp +++ b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp @@ -6,7 +6,7 @@ Purpose: Encapsulates a socket Called by: FGOutput, et. al. - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.h b/src/FDM/JSBSim/input_output/FGfdmSocket.h index c8f139103..fc133473d 100644 --- a/src/FDM/JSBSim/input_output/FGfdmSocket.h +++ b/src/FDM/JSBSim/input_output/FGfdmSocket.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 11/08/99 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGColumnVector3.cpp b/src/FDM/JSBSim/math/FGColumnVector3.cpp index 83320b8e5..fc7b80595 100644 --- a/src/FDM/JSBSim/math/FGColumnVector3.cpp +++ b/src/FDM/JSBSim/math/FGColumnVector3.cpp @@ -6,7 +6,7 @@ Date started: 1998 Purpose: FGColumnVector3 class Called by: Various - ------------- Copyright (C) 1998 Tony Peden and Jon S. Berndt (jsb@hal-pc.org) - + ------------- Copyright (C) 1998 Tony Peden and Jon S. Berndt (jon@jsbsim.org) - This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGColumnVector3.h b/src/FDM/JSBSim/math/FGColumnVector3.h index 5fe76e77a..9b16a6df1 100644 --- a/src/FDM/JSBSim/math/FGColumnVector3.h +++ b/src/FDM/JSBSim/math/FGColumnVector3.h @@ -4,7 +4,7 @@ Header: FGColumnVector3.h Author: Originally by Tony Peden [formatted and adapted here by Jon Berndt] Date started: Unknown - ------------- Copyright (C) 2001 by Tony Peden and Jon S. Berndt (jsb@hal-pc.org) + ------------- Copyright (C) 2001 by Tony Peden and Jon S. Berndt (jon@jsbsim.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGCondition.cpp b/src/FDM/JSBSim/math/FGCondition.cpp index cfc4bae91..6f40a72df 100644 --- a/src/FDM/JSBSim/math/FGCondition.cpp +++ b/src/FDM/JSBSim/math/FGCondition.cpp @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 1/2/2003 - -------------- Copyright (C) 2003 Jon S. Berndt (jsb@hal-pc.org) -------------- + -------------- Copyright (C) 2003 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGFunction.cpp b/src/FDM/JSBSim/math/FGFunction.cpp index 6dd1d3d27..7a185ec01 100755 --- a/src/FDM/JSBSim/math/FGFunction.cpp +++ b/src/FDM/JSBSim/math/FGFunction.cpp @@ -5,7 +5,7 @@ Author: Jon Berndt Date started: 8/25/2004 Purpose: Stores various parameter types for functions - ------------- Copyright (C) 2004 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2004 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGFunction.h b/src/FDM/JSBSim/math/FGFunction.h index 97d4fa3c8..a4ba9694b 100755 --- a/src/FDM/JSBSim/math/FGFunction.h +++ b/src/FDM/JSBSim/math/FGFunction.h @@ -4,7 +4,7 @@ Header: FGFunction.h Author: Jon Berndt Date started: August 25 2004 - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGLocation.cpp b/src/FDM/JSBSim/math/FGLocation.cpp index 8aee82863..d740d01b1 100644 --- a/src/FDM/JSBSim/math/FGLocation.cpp +++ b/src/FDM/JSBSim/math/FGLocation.cpp @@ -5,7 +5,7 @@ Date started: 04/04/2004 Purpose: Store an arbitrary location on the globe - ------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------------ + ------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------------ ------- (C) 2004 Mathias Froehlich (Mathias.Froehlich@web.de) ---- This program is free software; you can redistribute it and/or modify it under diff --git a/src/FDM/JSBSim/math/FGLocation.h b/src/FDM/JSBSim/math/FGLocation.h index 2ad5b87bf..e55f31c81 100644 --- a/src/FDM/JSBSim/math/FGLocation.h +++ b/src/FDM/JSBSim/math/FGLocation.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt, Mathias Froehlich Date started: 04/04/2004 - ------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------------ + ------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------------ ------- (C) 2004 Mathias Froehlich (Mathias.Froehlich@web.de) ---- This program is free software; you can redistribute it and/or modify it under diff --git a/src/FDM/JSBSim/math/FGMatrix33.h b/src/FDM/JSBSim/math/FGMatrix33.h index 4e8234bfd..98babfcd0 100644 --- a/src/FDM/JSBSim/math/FGMatrix33.h +++ b/src/FDM/JSBSim/math/FGMatrix33.h @@ -4,7 +4,7 @@ Header: FGMatrix33.h Author: Tony Peden, Jon Berndt, Mathias Frolich Date started: Unknown - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGParameter.h b/src/FDM/JSBSim/math/FGParameter.h index 3e235affa..f1f42a8ed 100755 --- a/src/FDM/JSBSim/math/FGParameter.h +++ b/src/FDM/JSBSim/math/FGParameter.h @@ -4,7 +4,7 @@ Header: FGParameter.h Author: Jon Berndt Date started: August 25 2004 - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGPropertyValue.cpp b/src/FDM/JSBSim/math/FGPropertyValue.cpp index dd24aaa93..111b078c8 100755 --- a/src/FDM/JSBSim/math/FGPropertyValue.cpp +++ b/src/FDM/JSBSim/math/FGPropertyValue.cpp @@ -5,7 +5,7 @@ Author: Jon Berndt Date started: 12/10/2004 Purpose: Stores property values - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGPropertyValue.h b/src/FDM/JSBSim/math/FGPropertyValue.h index b9bc6e2b6..60ad5f5ce 100755 --- a/src/FDM/JSBSim/math/FGPropertyValue.h +++ b/src/FDM/JSBSim/math/FGPropertyValue.h @@ -4,7 +4,7 @@ Header: FGPropertyValue.h Author: Jon Berndt Date started: December 10 2004 - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGQuaternion.cpp b/src/FDM/JSBSim/math/FGQuaternion.cpp index 6ab1c3954..74b63d888 100644 --- a/src/FDM/JSBSim/math/FGQuaternion.cpp +++ b/src/FDM/JSBSim/math/FGQuaternion.cpp @@ -4,7 +4,7 @@ Author: Jon Berndt, Mathias Froehlich Date started: 12/02/98 - ------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------------ + ------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------------ ------- (C) 2004 Mathias Froehlich (Mathias.Froehlich@web.de) ---- This program is free software; you can redistribute it and/or modify it under diff --git a/src/FDM/JSBSim/math/FGQuaternion.h b/src/FDM/JSBSim/math/FGQuaternion.h index a17008fd6..3607c2064 100644 --- a/src/FDM/JSBSim/math/FGQuaternion.h +++ b/src/FDM/JSBSim/math/FGQuaternion.h @@ -4,7 +4,7 @@ Author: Jon Berndt, Mathis Froehlich Date started: 12/02/98 - ------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------------ + ------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------------ ------- (C) 2004 Mathias Froehlich (Mathias.Froehlich@web.de) ---- This program is free software; you can redistribute it and/or modify it under diff --git a/src/FDM/JSBSim/math/FGRealValue.cpp b/src/FDM/JSBSim/math/FGRealValue.cpp index 313d5d646..9d3deec3b 100755 --- a/src/FDM/JSBSim/math/FGRealValue.cpp +++ b/src/FDM/JSBSim/math/FGRealValue.cpp @@ -5,7 +5,7 @@ Author: Jon Berndt Date started: 12/10/2004 Purpose: Stores real values - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGRealValue.h b/src/FDM/JSBSim/math/FGRealValue.h index 36b3408ae..626770c26 100755 --- a/src/FDM/JSBSim/math/FGRealValue.h +++ b/src/FDM/JSBSim/math/FGRealValue.h @@ -4,7 +4,7 @@ Header: FGRealValue.h Author: Jon Berndt Date started: December 10 2004 - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGTable.cpp b/src/FDM/JSBSim/math/FGTable.cpp index e3c9fcf5c..079631db5 100644 --- a/src/FDM/JSBSim/math/FGTable.cpp +++ b/src/FDM/JSBSim/math/FGTable.cpp @@ -5,7 +5,7 @@ Date started: 1/9/2001 Purpose: Models a lookup table - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/math/FGTable.h b/src/FDM/JSBSim/math/FGTable.h index e3bafc322..a90654a18 100644 --- a/src/FDM/JSBSim/math/FGTable.h +++ b/src/FDM/JSBSim/math/FGTable.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 1/9/2001 - ------------- Copyright (C) 2001 Jon S. Berndt (jsb@hal-pc.org) -------------- + ------------- Copyright (C) 2001 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGAerodynamics.cpp b/src/FDM/JSBSim/models/FGAerodynamics.cpp index 2721fbf09..829697024 100644 --- a/src/FDM/JSBSim/models/FGAerodynamics.cpp +++ b/src/FDM/JSBSim/models/FGAerodynamics.cpp @@ -5,7 +5,7 @@ Date started: 09/13/00 Purpose: Encapsulates the aerodynamic forces - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGAerodynamics.h b/src/FDM/JSBSim/models/FGAerodynamics.h index 0f5c6c145..9e2e47b22 100644 --- a/src/FDM/JSBSim/models/FGAerodynamics.h +++ b/src/FDM/JSBSim/models/FGAerodynamics.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 09/13/00 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGAircraft.cpp b/src/FDM/JSBSim/models/FGAircraft.cpp index 0d8c3ed79..9c6ffef85 100644 --- a/src/FDM/JSBSim/models/FGAircraft.cpp +++ b/src/FDM/JSBSim/models/FGAircraft.cpp @@ -6,7 +6,7 @@ Purpose: Encapsulates an aircraft Called by: FGFDMExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGAircraft.h b/src/FDM/JSBSim/models/FGAircraft.h index 616da6cf0..bc32b1afb 100644 --- a/src/FDM/JSBSim/models/FGAircraft.h +++ b/src/FDM/JSBSim/models/FGAircraft.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 12/12/98 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGAtmosphere.cpp b/src/FDM/JSBSim/models/FGAtmosphere.cpp index a1bdb89b6..b8946ac47 100644 --- a/src/FDM/JSBSim/models/FGAtmosphere.cpp +++ b/src/FDM/JSBSim/models/FGAtmosphere.cpp @@ -7,7 +7,7 @@ Purpose: Models the atmosphere Called by: FGSimExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGAtmosphere.h b/src/FDM/JSBSim/models/FGAtmosphere.h index 75e65a8e0..fef92c7b6 100644 --- a/src/FDM/JSBSim/models/FGAtmosphere.h +++ b/src/FDM/JSBSim/models/FGAtmosphere.h @@ -5,7 +5,7 @@ Implementation of 1959 Standard Atmosphere added by Tony Peden Date started: 11/24/98 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGAuxiliary.cpp b/src/FDM/JSBSim/models/FGAuxiliary.cpp index 697d5f9a7..be578ae1c 100755 --- a/src/FDM/JSBSim/models/FGAuxiliary.cpp +++ b/src/FDM/JSBSim/models/FGAuxiliary.cpp @@ -6,7 +6,7 @@ Purpose: Calculates additional parameters needed by the visual system, etc. Called by: FGSimExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software @@ -377,6 +377,9 @@ void FGAuxiliary::bind(void) PropertyManager->Tie("position/distance-from-start-lon-mt", this, &FGAuxiliary::GetLongitudeRelativePosition); PropertyManager->Tie("position/distance-from-start-lat-mt", this, &FGAuxiliary::GetLatitudeRelativePosition); PropertyManager->Tie("position/distance-from-start-mag-mt", this, &FGAuxiliary::GetDistanceRelativePosition); + PropertyManager->Tie("position/vrp-gc-latitude_deg", &vLocationVRP, &FGLocation::GetLatitudeDeg); + PropertyManager->Tie("position/vrp-longitude_deg", &vLocationVRP, &FGLocation::GetLongitudeDeg); + PropertyManager->Tie("position/vrp-radius-ft", &vLocationVRP, &FGLocation::GetRadius); } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/FDM/JSBSim/models/FGAuxiliary.h b/src/FDM/JSBSim/models/FGAuxiliary.h index c7e066bf4..6420e3b97 100644 --- a/src/FDM/JSBSim/models/FGAuxiliary.h +++ b/src/FDM/JSBSim/models/FGAuxiliary.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 01/26/99 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGBuoyantForces.cpp b/src/FDM/JSBSim/models/FGBuoyantForces.cpp index 4803195ed..129797549 100644 --- a/src/FDM/JSBSim/models/FGBuoyantForces.cpp +++ b/src/FDM/JSBSim/models/FGBuoyantForces.cpp @@ -6,7 +6,7 @@ Purpose: Encapsulates the buoyant forces ------------- Copyright (C) 2008 - 2009 Anders Gidenstam ------------- - ------------- Copyright (C) 2008 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2008 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGBuoyantForces.h b/src/FDM/JSBSim/models/FGBuoyantForces.h index 7ef94b088..f03a00df2 100644 --- a/src/FDM/JSBSim/models/FGBuoyantForces.h +++ b/src/FDM/JSBSim/models/FGBuoyantForces.h @@ -5,7 +5,7 @@ Date started: 01/21/08 ------------- Copyright (C) 2008 Anders Gidenstam ------------- - ------------- Copyright (C) 2008 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2008 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGExternalForce.cpp b/src/FDM/JSBSim/models/FGExternalForce.cpp index 349f28db3..48884c4d1 100755 --- a/src/FDM/JSBSim/models/FGExternalForce.cpp +++ b/src/FDM/JSBSim/models/FGExternalForce.cpp @@ -4,7 +4,7 @@ Author: Jon Berndt, Dave Culp Date started: 9/21/07 - ------------- Copyright (C) 2007 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2007 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGExternalForce.h b/src/FDM/JSBSim/models/FGExternalForce.h index 3ba6641e3..c65739248 100755 --- a/src/FDM/JSBSim/models/FGExternalForce.h +++ b/src/FDM/JSBSim/models/FGExternalForce.h @@ -4,7 +4,7 @@ Author: Jon Berndt, Dave Culp Date started: 9/21/07 - ------------- Copyright (C) 2007 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2007 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGFCS.cpp b/src/FDM/JSBSim/models/FGFCS.cpp index 47213f900..e1b7b9fb4 100644 --- a/src/FDM/JSBSim/models/FGFCS.cpp +++ b/src/FDM/JSBSim/models/FGFCS.cpp @@ -6,7 +6,7 @@ Purpose: Model the flight controls Called by: FDMExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software @@ -55,6 +55,7 @@ INCLUDES #include #include #include +#include namespace JSBSim { @@ -642,6 +643,8 @@ bool FGFCS::Load(Element* el, SystemType systype) Components->push_back(new FGSensor(this, component_element)); } else if (component_element->GetName() == string("accelerometer")) { Components->push_back(new FGAccelerometer(this, component_element)); + } else if (component_element->GetName() == string("gyro")) { + Components->push_back(new FGGyro(this, component_element)); } else { cerr << "Unknown FCS component: " << component_element->GetName() << endl; } diff --git a/src/FDM/JSBSim/models/FGFCS.h b/src/FDM/JSBSim/models/FGFCS.h index b026e4b1a..79535f261 100644 --- a/src/FDM/JSBSim/models/FGFCS.h +++ b/src/FDM/JSBSim/models/FGFCS.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 12/12/98 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGGroundReactions.cpp b/src/FDM/JSBSim/models/FGGroundReactions.cpp index 1068d81e5..4a430144d 100644 --- a/src/FDM/JSBSim/models/FGGroundReactions.cpp +++ b/src/FDM/JSBSim/models/FGGroundReactions.cpp @@ -5,7 +5,7 @@ Date started: 09/13/00 Purpose: Encapsulates the ground reaction forces (gear and collision) - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGGroundReactions.h b/src/FDM/JSBSim/models/FGGroundReactions.h index a7870f167..9ad5ae836 100644 --- a/src/FDM/JSBSim/models/FGGroundReactions.h +++ b/src/FDM/JSBSim/models/FGGroundReactions.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 09/13/00 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGInertial.cpp b/src/FDM/JSBSim/models/FGInertial.cpp index 9f6373399..6db0555e0 100644 --- a/src/FDM/JSBSim/models/FGInertial.cpp +++ b/src/FDM/JSBSim/models/FGInertial.cpp @@ -5,7 +5,7 @@ Date started: 09/13/00 Purpose: Encapsulates the inertial frame forces (coriolis and centrifugal) - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGInertial.h b/src/FDM/JSBSim/models/FGInertial.h index adf46d359..f17d0c7ff 100644 --- a/src/FDM/JSBSim/models/FGInertial.h +++ b/src/FDM/JSBSim/models/FGInertial.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 09/13/00 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGInput.cpp b/src/FDM/JSBSim/models/FGInput.cpp index d7e2a2a51..e36abc271 100755 --- a/src/FDM/JSBSim/models/FGInput.cpp +++ b/src/FDM/JSBSim/models/FGInput.cpp @@ -6,7 +6,7 @@ Purpose: Manage output of sim parameters to file or stdout Called by: FGSimExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGInput.h b/src/FDM/JSBSim/models/FGInput.h index 6ccaddfbb..2344c3a79 100755 --- a/src/FDM/JSBSim/models/FGInput.h +++ b/src/FDM/JSBSim/models/FGInput.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 12/2/98 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGLGear.cpp b/src/FDM/JSBSim/models/FGLGear.cpp index e8df4370a..c7a7534c7 100644 --- a/src/FDM/JSBSim/models/FGLGear.cpp +++ b/src/FDM/JSBSim/models/FGLGear.cpp @@ -8,7 +8,7 @@ Purpose: Encapsulates the landing gear elements Called by: FGAircraft - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software @@ -280,7 +280,7 @@ FGColumnVector3& FGLGear::Force(void) vLocalGear = Propagate->GetTb2l() * vWhlBodyVec; // Get local frame wheel location gearLoc = Propagate->GetLocation().LocalToLocation(vLocalGear); - // Compute the height of the theoritical location of the wheel (if struct was not compressed) with + // Compute the height of the theoretical location of the wheel (if strut is not compressed) with // respect to the ground level double height = Exec->GetGroundCallback()->GetAGLevel(t, gearLoc, contact, normal, cvel); vGroundNormal = -1. * Propagate->GetTec2b() * normal; @@ -392,13 +392,6 @@ FGColumnVector3& FGLGear::Force(void) void FGLGear::ComputeGroundCoordSys(void) { - if( fabs(vGroundNormal(eZ)) < 1e-3 ) { - cout << "BOMB: "; - cout << vGroundNormal(eX) << "/" << vGroundNormal(eY) << "/" << - vGroundNormal(eZ) << " - " << SteerAngle << endl; - return; - } - // Compute the rolling direction projected on the ground // It consists in finding a vector 'r' such that 'r' lies in the plane (w,z) and r.n = 0 (scalar // product) where: diff --git a/src/FDM/JSBSim/models/FGLGear.h b/src/FDM/JSBSim/models/FGLGear.h index 09a143873..b7e2f1b83 100644 --- a/src/FDM/JSBSim/models/FGLGear.h +++ b/src/FDM/JSBSim/models/FGLGear.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 11/18/99 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGMassBalance.cpp b/src/FDM/JSBSim/models/FGMassBalance.cpp index fd2fad3d5..2b599ffcc 100644 --- a/src/FDM/JSBSim/models/FGMassBalance.cpp +++ b/src/FDM/JSBSim/models/FGMassBalance.cpp @@ -5,7 +5,7 @@ Date started: 09/12/2000 Purpose: This module models weight and balance - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) -------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGMassBalance.h b/src/FDM/JSBSim/models/FGMassBalance.h index c77400f37..9abb19172 100644 --- a/src/FDM/JSBSim/models/FGMassBalance.h +++ b/src/FDM/JSBSim/models/FGMassBalance.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 09/12/2000 - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) -------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGModel.cpp b/src/FDM/JSBSim/models/FGModel.cpp index 6ddf5ed37..bb41c22f8 100644 --- a/src/FDM/JSBSim/models/FGModel.cpp +++ b/src/FDM/JSBSim/models/FGModel.cpp @@ -6,7 +6,7 @@ Purpose: Base class for all models Called by: FGSimExec, et. al. - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGModel.h b/src/FDM/JSBSim/models/FGModel.h index cef01d5e3..1464296aa 100644 --- a/src/FDM/JSBSim/models/FGModel.h +++ b/src/FDM/JSBSim/models/FGModel.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 11/21/98 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp index cb48ab554..4a34a5c22 100644 --- a/src/FDM/JSBSim/models/FGOutput.cpp +++ b/src/FDM/JSBSim/models/FGOutput.cpp @@ -6,7 +6,7 @@ Purpose: Manage output of sim parameters to file or stdout Called by: FGSimExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software @@ -333,7 +333,7 @@ void FGOutput::DelimitedOutput(string fname) outstream << "ECEF X (ft)" + delimeter + "ECEF Y (ft)" + delimeter + "ECEF Z (ft)" + delimeter; outstream << "EPA (deg)" + delimeter; outstream << "Distance AGL (ft)" + delimeter; - outstream << "Terrain Radius (ft)"; + outstream << "Terrain Elevation (ft)"; } if (SubSystems & ssCoefficients) { scratch = Aerodynamics->GetCoefficientStrings(delimeter); @@ -445,7 +445,7 @@ void FGOutput::DelimitedOutput(string fname) outstream.precision(14); outstream << Inertial->GetEarthPositionAngleDeg() << delimeter; outstream << Propagate->GetDistanceAGL() << delimeter; - outstream << Propagate->GetLocalTerrainRadius(); + outstream << Propagate->GetTerrainElevation(); outstream.precision(10); } if (SubSystems & ssCoefficients) { diff --git a/src/FDM/JSBSim/models/FGOutput.h b/src/FDM/JSBSim/models/FGOutput.h index 2aeef3ea6..1646dadb0 100644 --- a/src/FDM/JSBSim/models/FGOutput.h +++ b/src/FDM/JSBSim/models/FGOutput.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 12/2/98 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGPropagate.cpp b/src/FDM/JSBSim/models/FGPropagate.cpp index 0b7d7f78a..d665c3062 100644 --- a/src/FDM/JSBSim/models/FGPropagate.cpp +++ b/src/FDM/JSBSim/models/FGPropagate.cpp @@ -6,7 +6,7 @@ Purpose: Integrate the EOM to determine instantaneous position Called by: FGFDMExec - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGPropagate.h b/src/FDM/JSBSim/models/FGPropagate.h index a4ecd6c91..6de7d11c4 100644 --- a/src/FDM/JSBSim/models/FGPropagate.h +++ b/src/FDM/JSBSim/models/FGPropagate.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 1/5/99 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGPropulsion.cpp b/src/FDM/JSBSim/models/FGPropulsion.cpp index 04ff6b40c..ed066b26c 100644 --- a/src/FDM/JSBSim/models/FGPropulsion.cpp +++ b/src/FDM/JSBSim/models/FGPropulsion.cpp @@ -6,7 +6,7 @@ Purpose: Encapsulates the set of engines and tanks associated with this aircraft - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/FGPropulsion.h b/src/FDM/JSBSim/models/FGPropulsion.h index b812f1968..e356c0b15 100644 --- a/src/FDM/JSBSim/models/FGPropulsion.h +++ b/src/FDM/JSBSim/models/FGPropulsion.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 08/20/00 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/atmosphere/FGMars.cpp b/src/FDM/JSBSim/models/atmosphere/FGMars.cpp index d110437dd..3bd737926 100755 --- a/src/FDM/JSBSim/models/atmosphere/FGMars.cpp +++ b/src/FDM/JSBSim/models/atmosphere/FGMars.cpp @@ -6,7 +6,7 @@ Purpose: Models the Martian atmosphere very simply Called by: FGFDMExec - ------------- Copyright (C) 2004 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2004 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/atmosphere/FGMars.h b/src/FDM/JSBSim/models/atmosphere/FGMars.h index 4841e71ec..c07a78965 100755 --- a/src/FDM/JSBSim/models/atmosphere/FGMars.h +++ b/src/FDM/JSBSim/models/atmosphere/FGMars.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 01/05/2004 - ------------- Copyright (C) 2004 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2004 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp index af9ca54b2..b2c3ca573 100755 --- a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.cpp @@ -48,11 +48,11 @@ static const char *IdHdr = ID_ACCELEROMETER; CLASS IMPLEMENTATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ - FGAccelerometer::FGAccelerometer(FGFCS* fcs, Element* element) : FGSensor(fcs, element) { Propagate = fcs->GetExec()->GetPropagate(); MassBalance = fcs->GetExec()->GetMassBalance(); + Inertial = fcs->GetExec()->GetInertial(); Element* location_element = element->FindElement("location"); if (location_element) vLocation = location_element->FindElementTripletConvertTo("IN"); @@ -98,11 +98,18 @@ bool FGAccelerometer::Run(void ) // There is no input assumed. This is a dedicated acceleration sensor. vRadius = MassBalance->StructuralToBody(vLocation); + + //gravitational forces + vAccel = Propagate->GetTl2b() * FGColumnVector3(0, 0, Inertial->gravity()); + + //aircraft forces + vAccel += (Propagate->GetUVWdot() + + Propagate->GetPQRdot() * vRadius + + Propagate->GetPQR() * (Propagate->GetPQR() * vRadius)); + + // transform to the specified orientation + vAccel = mT * vAccel; - vAccel = mT * (Propagate->GetUVWdot() - + Propagate->GetPQRdot() * vRadius - + Propagate->GetPQR() * (Propagate->GetPQR() * vRadius)); - Input = vAccel(axis); Output = Input; // perfect accelerometer @@ -118,6 +125,7 @@ bool FGAccelerometer::Run(void ) if (noise_variance != 0.0) Noise(); // models noise if (drift_rate != 0.0) Drift(); // models drift over time if (bias != 0.0) Bias(); // models a finite bias + if (gain != 0.0) Gain(); // models a gain if (fail_low) Output = -HUGE_VAL; if (fail_high) Output = HUGE_VAL; @@ -150,7 +158,7 @@ void FGAccelerometer::CalculateTransformMatrix(void) mT(3,1) = cr*sp*cy + sr*sy; mT(3,2) = cr*sp*sy - sr*cy; mT(3,3) = cr*cp; - + // This transform is different than for FGForce, where we want a native nozzle // force in body frame. Here we calculate the body frame accel and want it in // the transformed accelerometer frame. So, the next line is commented out. diff --git a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h index 9bdcece7d..bf3a58c6e 100755 --- a/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h +++ b/src/FDM/JSBSim/models/flight_control/FGAccelerometer.h @@ -41,6 +41,7 @@ INCLUDES #include #include "models/FGPropagate.h" #include "models/FGMassBalance.h" +#include "models/FGInertial.h" #include "math/FGColumnVector3.h" #include "math/FGMatrix33.h" @@ -126,6 +127,7 @@ public: private: FGPropagate* Propagate; FGMassBalance* MassBalance; + FGInertial* Inertial; FGColumnVector3 vLocation; FGColumnVector3 vOrient; FGColumnVector3 vRadius; diff --git a/src/FDM/JSBSim/models/flight_control/FGActuator.cpp b/src/FDM/JSBSim/models/flight_control/FGActuator.cpp index 3b36b3a92..9b0a3cc8a 100755 --- a/src/FDM/JSBSim/models/flight_control/FGActuator.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGActuator.cpp @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 21 February 2006 - ------------- Copyright (C) 2007 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2007 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/FGActuator.h b/src/FDM/JSBSim/models/flight_control/FGActuator.h index e7407f333..79571fbe6 100755 --- a/src/FDM/JSBSim/models/flight_control/FGActuator.h +++ b/src/FDM/JSBSim/models/flight_control/FGActuator.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 21 February 2007 - ------------- Copyright (C) 2006 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2006 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp index 7af390ef5..954be2354 100644 --- a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.cpp @@ -91,6 +91,8 @@ FGFCSComponent::FGFCSComponent(FGFCS* _fcs, Element* element) : fcs(_fcs) Type = "SENSOR"; } else if (element->GetName() == string("accelerometer")) { Type = "ACCELEROMETER"; + } else if (element->GetName() == string("gyro")) { + Type = "GYRO"; } else if (element->GetName() == string("actuator")) { Type = "ACTUATOR"; } else { // illegal component in this channel diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h index 3ce2f4154..fa8506131 100644 --- a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h +++ b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h @@ -78,6 +78,9 @@ CLASS DOCUMENTATION - FGSensor - FGFCSFunction - FGPID + - FGAccelerometer + - FGGyro + - FGActuator @author Jon S. Berndt @version $Id$ diff --git a/src/FDM/JSBSim/models/flight_control/FGFilter.h b/src/FDM/JSBSim/models/flight_control/FGFilter.h index 587687caa..c7c0a4143 100644 --- a/src/FDM/JSBSim/models/flight_control/FGFilter.h +++ b/src/FDM/JSBSim/models/flight_control/FGFilter.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 4/2000 - ------------- Copyright (C) 2000 Jon S. Berndt jsb@hal-pc.org ------------- + ------------- Copyright (C) 2000 Jon S. Berndt jon@jsbsim.org ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/FGGain.h b/src/FDM/JSBSim/models/flight_control/FGGain.h index 7ab7925c3..faf535c69 100644 --- a/src/FDM/JSBSim/models/flight_control/FGGain.h +++ b/src/FDM/JSBSim/models/flight_control/FGGain.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 1998 ? - ------------- Copyright (C) 1998 by Jon S. Berndt, jsb@hal-pc.org ------------- + ------------- Copyright (C) 1998 by Jon S. Berndt, jon@jsbsim.org ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.cpp b/src/FDM/JSBSim/models/flight_control/FGPID.cpp index b8cced697..da1b4b0cd 100755 --- a/src/FDM/JSBSim/models/flight_control/FGPID.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGPID.cpp @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 6/17/2006 - ------------- Copyright (C) 2006 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2006 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.h b/src/FDM/JSBSim/models/flight_control/FGPID.h index b31e984f4..5839b238a 100755 --- a/src/FDM/JSBSim/models/flight_control/FGPID.h +++ b/src/FDM/JSBSim/models/flight_control/FGPID.h @@ -4,7 +4,7 @@ Author: Jon Berndt Date started: 6/17/2006 - ------------- Copyright (C) 2006 by Jon S. Berndt, jsb@hal-pc.org ------------- + ------------- Copyright (C) 2006 by Jon S. Berndt, jon@jsbsim.org ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/FGSensor.cpp b/src/FDM/JSBSim/models/flight_control/FGSensor.cpp index 824f0ea5c..bd6a38417 100755 --- a/src/FDM/JSBSim/models/flight_control/FGSensor.cpp +++ b/src/FDM/JSBSim/models/flight_control/FGSensor.cpp @@ -58,7 +58,7 @@ FGSensor::FGSensor(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, element) bits = quantized = divisions = index = delay = 0; PreviousInput = PreviousOutput = 0.0; - min = max = bias = noise_variance = lag = drift_rate = drift = span = 0.0; + min = max = bias = gain = noise_variance = lag = drift_rate = drift = span = 0.0; granularity = 0.0; noise_type = 0; fail_low = fail_high = fail_stuck = false; @@ -82,6 +82,9 @@ FGSensor::FGSensor(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, element) if ( element->FindElement("bias") ) { bias = element->FindElementValueAsNumber("bias"); } + if ( element->FindElement("gain") ) { + gain = element->FindElementValueAsNumber("gain"); + } if ( element->FindElement("drift_rate") ) { drift_rate = element->FindElementValueAsNumber("drift_rate"); } @@ -152,6 +155,7 @@ bool FGSensor::Run(void ) if (noise_variance != 0.0) Noise(); // models noise if (drift_rate != 0.0) Drift(); // models drift over time if (bias != 0.0) Bias(); // models a finite bias + if (gain != 0.0) Gain(); // models a finite gain if (delay != 0.0) Delay(); // models system signal transport latencies @@ -196,6 +200,13 @@ void FGSensor::Bias(void) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +void FGSensor::Gain(void) +{ + Output *= gain; +} + +//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + void FGSensor::Drift(void) { drift += drift_rate*dt; @@ -304,6 +315,7 @@ void FGSensor::Debug(int from) cout << " (span: " << span << ", granularity: " << granularity << ")" << endl; } if (bias != 0.0) cout << " Bias: " << bias << endl; + if (gain != 0.0) cout << " Gain: " << gain << endl; if (drift_rate != 0) cout << " Sensor drift rate: " << drift_rate << endl; if (lag != 0) cout << " Sensor lag: " << lag << endl; if (noise_variance != 0) { diff --git a/src/FDM/JSBSim/models/flight_control/FGSensor.h b/src/FDM/JSBSim/models/flight_control/FGSensor.h index 63c217e20..1e8701c90 100755 --- a/src/FDM/JSBSim/models/flight_control/FGSensor.h +++ b/src/FDM/JSBSim/models/flight_control/FGSensor.h @@ -139,6 +139,7 @@ protected: double min, max; double span; double bias; + double gain; double drift_rate; double drift; double noise_variance; @@ -166,6 +167,7 @@ protected: void Quantize(void); void Lag(void); void Delay(void); + void Gain(void); void bind(void); diff --git a/src/FDM/JSBSim/models/flight_control/FGSwitch.h b/src/FDM/JSBSim/models/flight_control/FGSwitch.h index ee379583e..4efec9dfb 100644 --- a/src/FDM/JSBSim/models/flight_control/FGSwitch.h +++ b/src/FDM/JSBSim/models/flight_control/FGSwitch.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 12/23/2002 - ------------- Copyright (C) 2002 jsb@hal-pc.org ------------- + ------------- Copyright (C) 2002 jon@jsbsim.org ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/flight_control/Makefile.am b/src/FDM/JSBSim/models/flight_control/Makefile.am index 376761b5a..ca5c43ff9 100644 --- a/src/FDM/JSBSim/models/flight_control/Makefile.am +++ b/src/FDM/JSBSim/models/flight_control/Makefile.am @@ -3,10 +3,10 @@ noinst_LIBRARIES = libFlightControl.a libFlightControl_a_SOURCES = FGPID.cpp FGDeadBand.cpp FGFCSComponent.cpp \ FGFilter.cpp FGGain.cpp FGGradient.cpp FGKinemat.cpp \ FGSummer.cpp FGSwitch.cpp FGFCSFunction.cpp FGSensor.cpp \ - FGActuator.cpp FGAccelerometer.cpp + FGActuator.cpp FGAccelerometer.cpp FGGyro.cpp noinst_HEADERS = FGPID.h FGDeadBand.h FGFCSComponent.h FGFilter.h \ FGGain.h FGGradient.h FGKinemat.h FGSummer.h FGSwitch.h FGFCSFunction.h \ - FGSensor.h FGActuator.h FGAccelerometer.h + FGSensor.h FGActuator.h FGAccelerometer.h FGGyro.h INCLUDES = -I$(top_srcdir)/src/FDM/JSBSim diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp index d79f12c92..edddc11fa 100644 --- a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp @@ -5,7 +5,7 @@ Date started: 01/21/99 Called by: FGAircraft - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.h b/src/FDM/JSBSim/models/propulsion/FGEngine.h index 783fbc0fe..0e79e3a72 100644 --- a/src/FDM/JSBSim/models/propulsion/FGEngine.h +++ b/src/FDM/JSBSim/models/propulsion/FGEngine.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 01/21/99 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp b/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp index dc397cd7f..78059bd2b 100644 --- a/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGNozzle.cpp @@ -5,7 +5,7 @@ Date started: 08/24/00 Purpose: Encapsulates the nozzle object - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGNozzle.h b/src/FDM/JSBSim/models/propulsion/FGNozzle.h index c9549126b..5f1d070bf 100644 --- a/src/FDM/JSBSim/models/propulsion/FGNozzle.h +++ b/src/FDM/JSBSim/models/propulsion/FGNozzle.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 08/24/00 - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp index cd24bfbab..23c62efe5 100644 --- a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp @@ -7,7 +7,7 @@ Date started: 09/12/2000 Purpose: This module models a Piston engine - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) -------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGPiston.h b/src/FDM/JSBSim/models/propulsion/FGPiston.h index 56e5e8b5f..4c40565a4 100644 --- a/src/FDM/JSBSim/models/propulsion/FGPiston.h +++ b/src/FDM/JSBSim/models/propulsion/FGPiston.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 09/12/2000 - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) -------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp b/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp index f59846801..2f5b39523 100644 --- a/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGPropeller.cpp @@ -5,7 +5,7 @@ Date started: 08/24/00 Purpose: Encapsulates the propeller object - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGPropeller.h b/src/FDM/JSBSim/models/propulsion/FGPropeller.h index 65b344e53..a2ddc9f41 100644 --- a/src/FDM/JSBSim/models/propulsion/FGPropeller.h +++ b/src/FDM/JSBSim/models/propulsion/FGPropeller.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 08/24/00 - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGRocket.cpp b/src/FDM/JSBSim/models/propulsion/FGRocket.cpp index 479dc1cc5..1f4ca5a6f 100644 --- a/src/FDM/JSBSim/models/propulsion/FGRocket.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGRocket.cpp @@ -5,7 +5,7 @@ Date started: 09/12/2000 Purpose: This module models a rocket engine - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) -------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGRocket.h b/src/FDM/JSBSim/models/propulsion/FGRocket.h index afefb5884..4e6e8120a 100644 --- a/src/FDM/JSBSim/models/propulsion/FGRocket.h +++ b/src/FDM/JSBSim/models/propulsion/FGRocket.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 09/12/2000 - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) -------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) -------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGRotor.cpp b/src/FDM/JSBSim/models/propulsion/FGRotor.cpp index e8d47ee17..7c3de71a6 100644 --- a/src/FDM/JSBSim/models/propulsion/FGRotor.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGRotor.cpp @@ -5,7 +5,7 @@ Date started: 08/24/00 Purpose: Encapsulates the rotor object - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGRotor.h b/src/FDM/JSBSim/models/propulsion/FGRotor.h index c876abaac..6188f40d9 100644 --- a/src/FDM/JSBSim/models/propulsion/FGRotor.h +++ b/src/FDM/JSBSim/models/propulsion/FGRotor.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 08/24/00 - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.cpp b/src/FDM/JSBSim/models/propulsion/FGTank.cpp index cbf81329f..289fbb197 100644 --- a/src/FDM/JSBSim/models/propulsion/FGTank.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGTank.cpp @@ -5,7 +5,7 @@ Date started: 01/21/99 Called by: FGAircraft - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.h b/src/FDM/JSBSim/models/propulsion/FGTank.h index a6b574a06..479fcb6c6 100644 --- a/src/FDM/JSBSim/models/propulsion/FGTank.h +++ b/src/FDM/JSBSim/models/propulsion/FGTank.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 01/21/99 - ------------- Copyright (C) 1999 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 1999 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGThruster.cpp b/src/FDM/JSBSim/models/propulsion/FGThruster.cpp index 48fb0692a..9a5c38340 100644 --- a/src/FDM/JSBSim/models/propulsion/FGThruster.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGThruster.cpp @@ -5,7 +5,7 @@ Date started: 08/23/00 Purpose: Encapsulates the thruster object - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software diff --git a/src/FDM/JSBSim/models/propulsion/FGThruster.h b/src/FDM/JSBSim/models/propulsion/FGThruster.h index d37a73ad8..860db5a55 100644 --- a/src/FDM/JSBSim/models/propulsion/FGThruster.h +++ b/src/FDM/JSBSim/models/propulsion/FGThruster.h @@ -4,7 +4,7 @@ Author: Jon S. Berndt Date started: 08/23/00 - ------------- Copyright (C) 2000 Jon S. Berndt (jsb@hal-pc.org) ------------- + ------------- Copyright (C) 2000 Jon S. Berndt (jon@jsbsim.org) ------------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software