Starting to build generic flight model interface.

diff --git a/FDM/Makefile b/FDM/Makefile
index 7971ee044cff78783b409d517cbd1f8450a52a69..718a73b4790cd286919ba57b5779ac6a233efe9b 100644 (file)
--- a/FDM/Makefile
+++ b/FDM/Makefile
@@ -26,7 +26,7 @@
 
 TARGET=libflight.a
 
-CFILES = slew.c
+CFILES = flight.c
 OFILES = $(CFILES:.c=.o)
 
 CC = gcc
@@ -57,15 +57,18 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-flight.h: slew.h
+flight.h:  slew/slew.h LaRCsim/ls_interface.h
        touch flight.h
 
-slew.o: slew.c slew.h flight.h ../aircraft/aircraft.h ../controls/controls.h
-       $(CC) $(CFLAGS) $(INCLUDES) -c slew.c
+flight.o: flight.c flight.h
+       $(CC) $(CFLAGS) $(INCLUDES) -c flight.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.3  1997/05/29 02:32:25  curt
+# Starting to build generic flight model interface.
+#
 # Revision 1.2  1997/05/23 15:40:36  curt
 # Added GNU copyright headers.
 #

diff --git a/FDM/flight.h b/FDM/flight.h
index 810792d8557246513bbd1a64befd48bfe1716cf4..2cc7233b05dd95ba220681e83c611f52990bef72 100644 (file)
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -28,11 +28,20 @@
 #define FLIGHT_H
 
 
-#include "slew.h"
+#include "slew/slew.h"
+#include "LaRCsim/ls_interface.h"
 
 
-/* Define a structure containing the shared flight model parameters */
+/* Define the various supported flight models (not all implemented) */
+#define FG_SLEW      0
+#define FG_LARCSIM   1
+#define FG_ACM       2
+#define FG_HELO      3
+#define FG_BALLOON   4
+#define FG_PARACHUTE 5
+
 
+/* Define a structure containing the shared flight model parameters */
 struct flight_params {
     double pos_x, pos_y, pos_z;   /* temporary position variables */
     double vel_x, vel_y, vel_z;   /* temporary velocity variables */
@@ -46,13 +55,25 @@ struct flight_params {
 };
 
 
+/* General interface to the flight model routines */
+
+/* Initialize the flight model parameters */
+int fgFlightModelInit(int model);
+
+/* Run an iteration of the flight model */
+int fgFlightModelUpdate(int model);
+
+
 #endif FLIGHT_H
 
 
 /* $Log$
-/* Revision 1.2  1997/05/23 15:40:37  curt
-/* Added GNU copyright headers.
+/* Revision 1.3  1997/05/29 02:32:25  curt
+/* Starting to build generic flight model interface.
 /*
+ * Revision 1.2  1997/05/23 15:40:37  curt
+ * Added GNU copyright headers.
+ *
  * Revision 1.1  1997/05/16 16:04:45  curt
  * Initial revision.
  *