Latest JSBSim changes, including some gear tweaking from Jon and some

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

diff --git a/src/FDM/JSBSim/FGAuxiliary.h b/src/FDM/JSBSim/FGAuxiliary.h
index d8f1dec49301657da8c1f6899c919ad9c1f9acc3..e0b8a575a0408e1430eda51fad4185a0fb71c4ec 100644 (file)
--- a/src/FDM/JSBSim/FGAuxiliary.h
+++ b/src/FDM/JSBSim/FGAuxiliary.h
@@ -85,26 +85,26 @@ public:
   bool Run(void);
 
   // Use FGInitialCondition to set these speeds
-  inline float GetVcalibratedFPS(void) { return vcas; }
-  inline float GetVcalibratedKTS(void) { return vcas*FPSTOKTS; }
-  inline float GetVequivalentFPS(void) { return veas; }
-  inline float GetVequivalentKTS(void) { return veas*FPSTOKTS; }
+  inline double GetVcalibratedFPS(void) { return vcas; }
+  inline double GetVcalibratedKTS(void) { return vcas*fpstokts; }
+  inline double GetVequivalentFPS(void) { return veas; }
+  inline double GetVequivalentKTS(void) { return veas*fpstokts; }
   
   inline FGColumnVector3& GetPilotAccel(void) { return vPilotAccel; }
-  inline float GetPilotAccel(int idx) { return vPilotAccel(idx); }
-  inline FGColumnVector3 GetNpilot(void) { return vPilotAccel*INVGRAVITY; }
-  inline float GetNpilot(int idx) { return (vPilotAccel*INVGRAVITY)(idx); }
+  inline double GetPilotAccel(int idx) { return vPilotAccel(idx); }
+  FGColumnVector3 GetNpilot(void);
+  double GetNpilot(int idx);
 
-  inline float GetEarthPositionAngle(void) { return earthPosAngle; }
+  inline double GetEarthPositionAngle(void) { return earthPosAngle; }
   
-  float GetHeadWind(void);
-  float GetCrossWind(void);
+  double GetHeadWind(void);
+  double GetCrossWind(void);
  
 private:
-  float vcas;
-  float veas;
-  float mach;
-  float qbar,rhosl,rho,p,psl,pt;
+  double vcas;
+  double veas;
+  double mach;
+  double qbar,rhosl,rho,p,psl,pt;
 
   // Don't add a getter for pt!
   // pt above is freestream total pressure for subsonic only
@@ -116,10 +116,10 @@ private:
   FGColumnVector3 vPilotAccel;
   FGColumnVector3 vToEyePt;
   
-  float earthPosAngle;
+  double earthPosAngle;
 
   void GetState(void);
-  void Debug(void);
+  void Debug(int from);
 };
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%