Beginning to add support for multiple flight models.

diff --git a/FDM/flight.c b/FDM/flight.c
index 8263dbff091859fa45f2a452d3fc99456e6eba83..591f9e8250ebecd43b0e42a60fc03589a6263a10 100644 (file)
--- a/FDM/flight.c
+++ b/FDM/flight.c
@@ -41,13 +41,16 @@ int fgFlightModelInit(int model, fgFLIGHT *f, double dt) {
 
     fgPrintf(FG_FLIGHT,FG_INFO,"Initializing flight model\n");
 
-    if ( model == FG_LARCSIM ) {
+    if ( model == FG_SLEW ) {
+       // fgSlewInit(dt);
+    } else if ( model == FG_LARCSIM ) {
        fgFlight_2_LaRCsim(f);  /* translate FG to LaRCsim structure */
        fgLaRCsimInit(dt);
-       fgPrintf(FG_FLIGHT,FG_INFO,"FG pos = %.2f\n", FG_Latitude);
+       fgPrintf( FG_FLIGHT, FG_INFO, "FG pos = %.2f\n", FG_Latitude );
        fgLaRCsim_2_Flight(f);  /* translate LaRCsim back to FG structure */
     } else {
-       fgPrintf(FG_FLIGHT,FG_WARN,"Unimplemented flight model == %d\n", model);
+       fgPrintf( FG_FLIGHT, FG_WARN,
+                 "Unimplemented flight model == %d\n", model );
     }
 
     result = 1;
@@ -62,10 +65,13 @@ int fgFlightModelUpdate(int model, fgFLIGHT *f, int multiloop) {
 
     // printf("Altitude = %.2f\n", FG_Altitude * 0.3048);
 
-    if ( model == FG_LARCSIM ) {
+    if ( model == FG_SLEW ) {
+       // fgSlewUpdate(f, multiloop);
+    } else if ( model == FG_LARCSIM ) {
        fgLaRCsimUpdate(f, multiloop);
     } else {
-       fgPrintf(FG_FLIGHT,FG_WARN,"Unimplemented flight model == %d\n", model);
+       fgPrintf( FG_FLIGHT, FG_WARN,
+                 "Unimplemented flight model == %d\n", model );
     }
 
     result = 1;
@@ -86,22 +92,23 @@ int fgFlightModelSetAltitude(int model, fgFLIGHT *f, double alt_meters) {
     FG_Radius_to_vehicle = FG_Altitude + 
        (sea_level_radius_meters * METER_TO_FEET);
 
+    /* additional work needed for some flight models */
     if ( model == FG_LARCSIM ) {
        ls_ForceAltitude(FG_Altitude);
-    } else {
-       fgPrintf( FG_FLIGHT, FG_WARN, 
-                 "Unimplemented flight model == %d\n", model );
     }
 
 }
 
 
 /* $Log$
-/* Revision 1.14  1998/07/12 03:08:27  curt
-/* Added fgFlightModelSetAltitude() to force the altitude to something
-/* other than the current altitude.  LaRCsim doesn't let you do this by just
-/* changing FG_Altitude.
+/* Revision 1.15  1998/07/30 23:44:36  curt
+/* Beginning to add support for multiple flight models.
 /*
+ * Revision 1.14  1998/07/12 03:08:27  curt
+ * Added fgFlightModelSetAltitude() to force the altitude to something
+ * other than the current altitude.  LaRCsim doesn't let you do this by just
+ * changing FG_Altitude.
+ *
  * Revision 1.13  1998/04/25 22:06:28  curt
  * Edited cvs log messages in source files ... bad bad bad!
  *

diff --git a/FDM/flight.h b/FDM/flight.h
index 8848fb5d20cb8f10579614cc82ec74a7501dd266..6535a1ab745d2b2467d16ddea24ce4c22297bacf 100644 (file)
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -37,14 +37,15 @@ extern "C" {
 
 
 /* Define the various supported flight models (most not yet implemented) */
-#define FG_LARCSIM     0   /* The only one that is currently implemented */
-#define FG_ACM         1
-#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_SLEW        0    /* Slew (in MS terminology) */
+#define FG_LARCSIM     1    /* The only "real" model  that is currently 
+                              implemented */
+#define FG_ACM         2
+#define FG_SUPER_SONIC 3
+#define FG_HELICOPTER  4
+#define FG_AUTOGYRO    5
+#define FG_BALLOON     6
+#define FG_PARACHUTE   7
 #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 ? */
@@ -413,11 +414,14 @@ int fgFlightModelSetAltitude(int model, fgFLIGHT *f, double alt_meters);
 
 
 /* $Log$
-/* Revision 1.17  1998/07/12 03:08:28  curt
-/* Added fgFlightModelSetAltitude() to force the altitude to something
-/* other than the current altitude.  LaRCsim doesn't let you do this by just
-/* changing FG_Altitude.
+/* Revision 1.18  1998/07/30 23:44:36  curt
+/* Beginning to add support for multiple flight models.
 /*
+ * Revision 1.17  1998/07/12 03:08:28  curt
+ * Added fgFlightModelSetAltitude() to force the altitude to something
+ * other than the current altitude.  LaRCsim doesn't let you do this by just
+ * changing FG_Altitude.
+ *
  * Revision 1.16  1998/04/22 13:26:20  curt
  * C++ - ifing the code a bit.
  *