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 05b5cc79f777ea13e5309920fad32ecaec422201..2b1ec119c4ff88f26bb0a86d19a84d79510cf9ac 100644 (file)
--- a/src/FDM/JSBSim/FGDefs.h
+++ b/src/FDM/JSBSim/FGDefs.h
@@ -39,14 +39,12 @@ 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
 #define ECCENTSQRD      0.99330561
 #define INVECCENTSQRD   1.0067395
 #define INVECCENTSQRDM1 0.0067395
-#define EPS             0.081819221
 #define Reng            1716             //Specific Gas Constant,ft^2/(sec^2*R)
 #define SHRATIO         1.4              //Specific Heat Ratio
 #define RADTODEG        57.29578
@@ -54,42 +52,73 @@ SENTRY
 #define KTSTOFPS        1.68781
 #define FPSTOKTS        0.592484
 #define INCHTOFT        0.08333333
-#define NEEDED_CFG_VERSION "1.30"
+#define OMEGA_EARTH .00007272205217  
+#define NEEDED_CFG_VERSION "1.40"
+#define JSBSIM_VERSION  "0.8.6"
 
 #define HPTOFTLBSSEC 550
 #define METERS_TO_FEET 3.2808
 
-#define FG_QBAR           1
-#define FG_WINGAREA       2
-#define FG_WINGSPAN       4
-#define FG_CBAR           8
-#define FG_ALPHA          16
-#define FG_ALPHADOT       32
-#define FG_BETA           64
-#define FG_BETADOT        128
-#define FG_PITCHRATE      256
-#define FG_ROLLRATE       512
-#define FG_YAWRATE        1024
-#define FG_MACH           2048
-#define FG_ALTITUDE       4096
-#define FG_BI2VEL         8192
-#define FG_CI2VEL         16384
-#define FG_ELEVATOR_POS   32768L
-#define FG_AILERON_POS    65536L
-#define FG_RUDDER_POS     131072L
-#define FG_SPDBRAKE_POS   262144L
-#define FG_SPOILERS_POS   524288L
-#define FG_FLAPS_POS      1048576L
-#define FG_ELEVATOR_CMD   2097152L
-#define FG_AILERON_CMD    4194304L
-#define FG_RUDDER_CMD     8388608L
-#define FG_SPDBRAKE_CMD   16777216L
-#define FG_SPOILERS_CMD   33554432L
-#define FG_FLAPS_CMD      67108864L
-#define FG_THROTTLE_CMD   134217728L
-#define FG_THROTTLE_POS   268435456L
-#define FG_HOVERB         536870912L
-#define FG_PITCH_TRIM_CMD  1073741824L
+#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,
+  FG_CBAR,
+  FG_ALPHA,
+  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,
+  FG_CI2VEL,
+  FG_ELEVATOR_POS,
+  FG_AILERON_POS,
+  FG_RUDDER_POS,
+  FG_SPDBRAKE_POS,
+  FG_SPOILERS_POS,
+  FG_FLAPS_POS,
+  FG_ELEVATOR_CMD,
+  FG_AILERON_CMD,
+  FG_RUDDER_CMD,
+  FG_SPDBRAKE_CMD,
+  FG_SPOILERS_CMD,
+  FG_FLAPS_CMD,
+  FG_THROTTLE_CMD,
+  FG_THROTTLE_POS,
+  FG_ACTIVE_ENGINE,
+  FG_HOVERB,
+  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
+};
 
 /******************************************************************************/
 #endif