First steps in a weather reorganization. Note especially that

[flightgear.git] / src / FDM / JSBSim / FGFCS.h

diff --git a/src/FDM/JSBSim/FGFCS.h b/src/FDM/JSBSim/FGFCS.h
index b960ed1e7d8c01bd619c0e7d62ff17d6944d3e45..7835fd581c1aadd2bb60cf23b18c60a3c8e73789 100644 (file)
--- a/src/FDM/JSBSim/FGFCS.h
+++ b/src/FDM/JSBSim/FGFCS.h
@@ -146,7 +146,6 @@ CLASS DOCUMENTATION
     @see FGSwitch
     @see FGGradient
     @see FGFilter
-    @see FGFlaps
     @see FGDeadBand
 */
 
@@ -170,27 +169,27 @@ public:
   /// @name Pilot input command retrieval
   //@{
   /** Gets the aileron command.
-      @return aileron command in radians */
+      @return aileron command in percent */
   inline double GetDaCmd(void) { return DaCmd; }
 
   /** Gets the elevator command.
-      @return elevator command in radians */
+      @return elevator command in percent */
   inline double GetDeCmd(void) { return DeCmd; }
 
   /** Gets the rudder command.
-      @return rudder command in radians */
+      @return rudder command in percent */
   inline double GetDrCmd(void) { return DrCmd; }
 
   /** Gets the flaps command.
-      @return flaps command in radians */
+      @return flaps command in percent */
   inline double GetDfCmd(void) { return DfCmd; }
 
   /** Gets the speedbrake command.
-      @return speedbrake command in radians */
+      @return speedbrake command in percent */
   inline double GetDsbCmd(void) { return DsbCmd; }
 
   /** Gets the spoiler command.
-      @return spoiler command in radians */
+      @return spoiler command in percent */
   inline double GetDspCmd(void) { return DspCmd; }
 
   /** Gets the throttle command.
@@ -209,9 +208,17 @@ public:
   inline double GetPropAdvanceCmd(int engine) { return PropAdvanceCmd[engine]; }
 
   /** Gets the pitch trim command.
-      @return pitch trim command in radians */
+      @return pitch trim command in percent */
   inline double GetPitchTrimCmd(void) { return PTrimCmd; }
   
+  /** Gets the rudder trim command.
+      @return rudder trim command in percent */
+  inline double GetYawTrimCmd(void) { return YTrimCmd; }
+  
+  /** Gets the aileron trim command.
+      @return aileron trim command in percent */
+  inline double GetRollTrimCmd(void) { return RTrimCmd; }
+  
   /** 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*/
@@ -288,33 +295,41 @@ public:
   /// @name Pilot input command setting
   //@{
   /** Sets the aileron command
-      @param cmd aileron command in radians*/
+      @param cmd aileron command in percent*/
   inline void SetDaCmd(double cmd) { DaCmd = cmd; }
 
   /** Sets the elevator command
-      @param cmd elevator command in radians*/
+      @param cmd elevator command in percent*/
   inline void SetDeCmd(double cmd) { DeCmd = cmd; }
 
   /** Sets the rudder command
-      @param cmd rudder command in radians*/
+      @param cmd rudder command in percent*/
   inline void SetDrCmd(double cmd) { DrCmd = cmd; }
 
   /** Sets the flaps command
-      @param cmd flaps command in radians*/
+      @param cmd flaps command in percent*/
   inline void SetDfCmd(double cmd) { DfCmd = cmd; }
 
   /** Sets the speedbrake command
-      @param cmd speedbrake command in radians*/
+      @param cmd speedbrake command in percent*/
   inline void SetDsbCmd(double cmd) { DsbCmd = cmd; }
 
   /** Sets the spoilers command
-      @param cmd spoilers command in radians*/
+      @param cmd spoilers command in percent*/
   inline void SetDspCmd(double cmd) { DspCmd = cmd; }
 
   /** Sets the pitch trim command
-      @param cmd pitch trim command in radians*/
+      @param cmd pitch trim command in percent*/
   inline void SetPitchTrimCmd(double cmd) { PTrimCmd = cmd; }
 
+  /** Sets the rudder trim command
+      @param cmd rudder trim command in percent*/
+  inline void SetYawTrimCmd(double cmd) { YTrimCmd = cmd; }
+
+  /** Sets the aileron trim command
+      @param cmd aileron trim command in percent*/
+  inline void SetRollTrimCmd(double cmd) { RTrimCmd = cmd; }
+
   /** Sets the throttle command for the specified engine
       @param engine engine ID number
       @param cmd throttle command in percent (0 - 100)*/
@@ -415,7 +430,7 @@ public:
 private:
   double DaCmd, DeCmd, DrCmd, DfCmd, DsbCmd, DspCmd;
   double DaPos, DePos, DrPos, DfPos, DsbPos, DspPos;
-  double PTrimCmd;
+  double PTrimCmd, YTrimCmd, RTrimCmd;
   vector <double> ThrottleCmd;
   vector <double> ThrottlePos;
   vector <double> MixtureCmd;