Fix a segfault on exit. Introduces a small memory leak if the instrument

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

diff --git a/src/FDM/JSBSim/FGDefs.h b/src/FDM/JSBSim/FGDefs.h
index 132b7470a52230a2d85bb2f1797119a37d8e606f..2b1ec119c4ff88f26bb0a86d19a84d79510cf9ac 100644 (file)
--- a/src/FDM/JSBSim/FGDefs.h
+++ b/src/FDM/JSBSim/FGDefs.h
@@ -39,7 +39,6 @@ SENTRY
 #define GRAVITY         32.174
 #define INVGRAVITY      0.031081
 #define EARTHRAD        20925650.00       // feet, equatorial
-#define OMEGAEARTH      7.2685E-3         // rad/sec
 #define EARTHRADSQRD    437882827922500.0
 #define ONESECOND       4.848136811E-6
 #define ECCENT          0.996647186
@@ -54,13 +53,19 @@ SENTRY
 #define FPSTOKTS        0.592484
 #define INCHTOFT        0.08333333
 #define OMEGA_EARTH .00007272205217  
-#define NEEDED_CFG_VERSION "1.36"
+#define NEEDED_CFG_VERSION "1.40"
+#define JSBSIM_VERSION  "0.8.6"
 
 #define HPTOFTLBSSEC 550
 #define METERS_TO_FEET 3.2808
 
+#if defined ( sgi ) && !defined( __GNUC__ )
+#define __STL_FUNCTION_TMPL_PARTIAL_ORDER
+#endif
+
 enum eParam {
   FG_UNDEF = 0,
+  FG_TIME,
   FG_QBAR,
   FG_WINGAREA,
   FG_WINGSPAN,
@@ -69,9 +74,13 @@ enum eParam {
   FG_ALPHADOT,
   FG_BETA,
   FG_BETADOT,
+  FG_PHI,
+  FG_THT,
+  FG_PSI,
   FG_PITCHRATE,
   FG_ROLLRATE,
   FG_YAWRATE,
+  FG_CL_SQRD,
   FG_MACH,
   FG_ALTITUDE,
   FG_BI2VEL,
@@ -90,8 +99,25 @@ enum eParam {
   FG_FLAPS_CMD,
   FG_THROTTLE_CMD,
   FG_THROTTLE_POS,
+  FG_ACTIVE_ENGINE,
   FG_HOVERB,
-  FG_PITCH_TRIM_CMD
+  FG_PITCH_TRIM_CMD,
+  FG_LEFT_BRAKE_CMD,
+  FG_CENTER_BRAKE_CMD,
+  FG_RIGHT_BRAKE_CMD,
+  FG_SET_LOGGING
+};
+
+enum eAction {
+  FG_RAMP  = 1,
+  FG_STEP  = 2,
+  FG_EXP   = 3
+};
+
+enum eType {
+  FG_VALUE = 1,
+  FG_DELTA = 2,
+  FG_BOOL  = 3
 };
 
 /******************************************************************************/