Encapsulate the interpolstion version of FGEnvironment and fix some bugs

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

diff --git a/src/FDM/JSBSim/FGFCS.cpp b/src/FDM/JSBSim/FGFCS.cpp
index c6ee9bd831788338d6bafc9eda2d540bc31e542c..bf7778d4d70b98ed897231419e2469a677cef915 100644 (file)
--- a/src/FDM/JSBSim/FGFCS.cpp
+++ b/src/FDM/JSBSim/FGFCS.cpp
@@ -57,6 +57,8 @@ INCLUDES
 #include "filtersjb/FGSummer.h"
 #include "filtersjb/FGKinemat.h"
 
+namespace JSBSim {
+
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_FCS;
 
@@ -78,6 +80,7 @@ FGFCS::FGFCS(FGFDMExec* fdmex) : FGModel(fdmex)
   PTrimCmd = YTrimCmd = RTrimCmd = 0.0;
   GearCmd = GearPos = 1; // default to gear down
   LeftBrake = RightBrake = CenterBrake = 0.0;
+  APAttitudeSetPt = APAltitudeSetPt = APHeadingSetPt = APAirspeedSetPt = 0.0;
   DoNormalize=true;
   
   eMode = mNone;
@@ -108,7 +111,6 @@ FGFCS::~FGFCS()
   PropAdvanceCmd.clear();
   PropAdvance.clear();
 
-
   unsigned int i;
 
   for (i=0;i<APComponents.size();i++) delete APComponents[i];
@@ -600,13 +602,13 @@ void FGFCS::bind(void)
                        &FGFCS::SetPitchTrimCmd,
                        true);
   PropertyManager->Tie("fcs/roll-trim-cmd-norm", this,
-                       &FGFCS::GetYawTrimCmd,
-                       &FGFCS::SetYawTrimCmd,
-                       true);
-  PropertyManager->Tie("fcs/yaw-trim-cmd-norm", this,
                        &FGFCS::GetRollTrimCmd,
                        &FGFCS::SetRollTrimCmd,
                        true);
+  PropertyManager->Tie("fcs/yaw-trim-cmd-norm", this,
+                       &FGFCS::GetYawTrimCmd,
+                       &FGFCS::SetYawTrimCmd,
+                       true);
   PropertyManager->Tie("gear/gear-cmd-norm", this,
                        &FGFCS::GetGearCmd,
                        &FGFCS::SetGearCmd,
@@ -896,3 +898,4 @@ void FGFCS::Debug(int from)
   }
 }
 
+}