misc. tweaks.

[flightgear.git] / FDM / flight.h

diff --git a/FDM/flight.h b/FDM/flight.h
index c06d1d99c8e5b52564ee314a4ecd770313b405f5..a8ea7075caaf9913c0e162575d68adca6ed99aff 100644 (file)
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -24,30 +24,32 @@
  **************************************************************************/
 
 
-#ifndef FLIGHT_H
-#define FLIGHT_H
+#ifndef _FLIGHT_H
+#define _FLIGHT_H
 
 
-#include "Slew/slew.h"
-#include "LaRCsim/ls_interface.h"
+#include <Flight/Slew/slew.h>
+/* #include <Flight/LaRCsim/ls_interface.h> */
 
 
 /* Define the various supported flight models (most not yet implemented) */
-#define FG_LARCSIM     0
+#define FG_LARCSIM     0   /* The only one that is currently implemented */
 #define FG_ACM         1
-#define FG_HELICOPTER  2
-#define FG_AUTOGYRO    3
-#define FG_BALLOON     4
-#define FG_PARACHUTE   5
-#define FG_SLEW        6
-#define FG_EXTERN_GPS  7
-#define FG_EXTERN_NET  8
+#define FG_SUPER_SONIC 2
+#define FG_HELICOPTER  3
+#define FG_AUTOGYRO    4
+#define FG_BALLOON     5
+#define FG_PARACHUTE   6
+#define FG_SLEW        7    /* Slew (in MS terminology) */
+#define FG_EXTERN_GPS  8    /* Driven via a serially connected GPS */
+#define FG_EXTERN_NET  9    /* Driven externally via the net */
+#define FG_EXTERN_NASA 10   /* Track the space shuttle ? */
 
 
 typedef double FG_VECTOR_3[3];
 
 /* This is based heavily on LaRCsim/ls_generic.h */
-struct FLIGHT {
+struct fgFLIGHT {
 
 /*================== Mass properties and geometry values ==================*/
 
@@ -386,19 +388,33 @@ struct FLIGHT {
 /* General interface to the flight model routines */
 
 /* Initialize the flight model parameters */
-int fgFlightModelInit(int model, struct FLIGHT *f, double dt);
+int fgFlightModelInit(int model, struct fgFLIGHT *f, double dt);
 
 /* Run multiloop iterations of the flight model */
-int fgFlightModelUpdate(int model, struct FLIGHT *f, int multiloop);
+int fgFlightModelUpdate(int model, struct fgFLIGHT *f, int multiloop);
 
 
-#endif /* FLIGHT_H */
+#endif /* _FLIGHT_H */
 
 
 /* $Log$
-/* Revision 1.9  1997/09/04 02:17:33  curt
-/* Shufflin' stuff.
+/* Revision 1.13  1998/01/24 00:04:59  curt
+/* misc. tweaks.
 /*
+ * Revision 1.12  1998/01/22 02:59:32  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.11  1998/01/19 19:27:03  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.10  1997/12/10 22:37:43  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
+ * Revision 1.9  1997/09/04 02:17:33  curt
+ * Shufflin' stuff.
+ *
  * Revision 1.8  1997/08/27 03:30:06  curt
  * Changed naming scheme of basic shared structures.
  *