Set the runway height in cur_fdm_state as well as base_fdm_state.

[flightgear.git] / FDM / flight.cxx

diff --git a/FDM/flight.cxx b/FDM/flight.cxx
index 3225b32270a7f5ca0e08b1b5ff97374e4fbcc9fa..e2f017cd443ebe8665f78810a5f76e73ff4cf902 100644 (file)
--- a/FDM/flight.cxx
+++ b/FDM/flight.cxx
@@ -32,6 +32,7 @@
 #include <Flight/LaRCsim/ls_interface.h>
 #include <Include/fg_constants.h>
 #include <Math/fg_geodesy.hxx>
+#include <Time/timestamp.hxx>
 
 
 // base_fdm_state is the internal state that is updated in integer
@@ -43,8 +44,33 @@ FGState cur_fdm_state;
 FGState base_fdm_state;
 
 
+// Extrapolate fdm based on time_offset (in usec)
+void FGState::extrapolate( int time_offset ) {
+    double dt = time_offset / 1000000.0;
+    cout << "extrapolating FDM by dt = " << dt << endl;
+
+    double lat = geodetic_position_v[0] + geocentric_rates_v[0] * dt;
+    double lat_geoc = geocentric_position_v[0] + geocentric_rates_v[0] * dt;
+
+    double lon = geodetic_position_v[1] + geocentric_rates_v[1] * dt;
+    double lon_geoc = geocentric_position_v[1] + geocentric_rates_v[1] * dt;
+
+    double alt = geodetic_position_v[2] + geocentric_rates_v[2] * dt;
+    double radius = geocentric_position_v[2] + geocentric_rates_v[2] * dt;
+
+    geodetic_position_v[0] = lat;
+    geocentric_position_v[0] = lat_geoc;
+
+    geodetic_position_v[1] = lon;
+    geocentric_position_v[1] = lon_geoc;
+
+    geodetic_position_v[2] = alt;
+    geocentric_position_v[2] = radius;
+}
+
+
 // Initialize the flight model parameters
-int fgFlightModelInit(int model, FGState& f, double dt) {
+int fgFDMInit(int model, FGState& f, double dt) {
     double save_alt = 0.0;
 
     FG_LOG( FG_FLIGHT ,FG_INFO, "Initializing flight model" );
@@ -78,12 +104,15 @@ int fgFlightModelInit(int model, FGState& f, double dt) {
            base_fdm_state.set_Altitude( save_alt );
        }
     } else if ( model == FGState::FG_EXTERNAL ) {
-       fgExternalInit(base_fdm_state, dt);
+       fgExternalInit(base_fdm_state);
     } else {
        FG_LOG( FG_FLIGHT, FG_WARN,
                  "Unimplemented flight model == " << model );
     }
 
+    // set valid time for this record
+    base_fdm_state.stamp_time();
+       
     f = base_fdm_state;
 
     return 1;
@@ -91,12 +120,13 @@ int fgFlightModelInit(int model, FGState& f, double dt) {
 
 
 // Run multiloop iterations of the flight model
-int fgFlightModelUpdate(int model, FGState& f, int multiloop, int jitter) {
+int fgFDMUpdate(int model, FGState& f, int multiloop, int time_offset) {
     double time_step, start_elev, end_elev;
 
     // printf("Altitude = %.2f\n", FG_Altitude * 0.3048);
 
-    // base_fdm_state = f;
+    // set valid time for this record
+    base_fdm_state.stamp_time();
 
     time_step = (1.0 / DEFAULT_MODEL_HZ) * multiloop;
     start_elev = base_fdm_state.get_Altitude();
@@ -105,8 +135,15 @@ int fgFlightModelUpdate(int model, FGState& f, int multiloop, int jitter) {
        // fgSlewUpdate(f, multiloop);
     } else if ( model == FGState::FG_LARCSIM ) {
        fgLaRCsimUpdate(base_fdm_state, multiloop);
+       // extrapolate position based on actual time
+       // f = extrapolate_fdm( base_fdm_state, time_offset );
+       f = base_fdm_state;
     } else if ( model == FGState::FG_EXTERNAL ) {
        // fgExternalUpdate(f, multiloop);
+       FGTimeStamp current;
+       current.stamp();
+       f = base_fdm_state;
+       f.extrapolate( current - base_fdm_state.get_time_stamp() );
     } else {
        FG_LOG( FG_FLIGHT, FG_WARN,
                "Unimplemented flight model == " <<  model );
@@ -119,14 +156,12 @@ int fgFlightModelUpdate(int model, FGState& f, int multiloop, int jitter) {
        base_fdm_state.set_Climb_Rate( (end_elev - start_elev) / time_step );
     }
 
-    f = base_fdm_state;
-
     return 1;
 }
 
 
 // Set the altitude (force)
-void fgFlightModelSetAltitude(int model, double alt_meters) {
+void fgFDMForceAltitude(int model, double alt_meters) {
     double sea_level_radius_meters;
     double lat_geoc;
 
@@ -146,7 +181,32 @@ void fgFlightModelSetAltitude(int model, double alt_meters) {
 }
 
 
+// Set the local ground elevation
+void fgFDMSetGroundElevation(int model, double ground_meters) {
+    base_fdm_state.set_Runway_altitude( ground_meters * METER_TO_FEET );
+    cur_fdm_state.set_Runway_altitude( ground_meters * METER_TO_FEET );
+}
+
+
 // $Log$
+// Revision 1.13  1999/01/27 04:48:39  curt
+// Set the runway height in cur_fdm_state as well as base_fdm_state.
+//
+// Revision 1.12  1999/01/20 13:42:22  curt
+// Tweaked FDM interface.
+// Testing check sum support for NMEA serial output.
+//
+// Revision 1.11  1999/01/19 17:52:06  curt
+// Working on being able to extrapolate a new position and orientation
+// based on a position, orientation, and time offset.
+//
+// Revision 1.10  1999/01/09 13:37:32  curt
+// Convert fgTIMESTAMP to FGTimeStamp which holds usec instead of ms.
+//
+// Revision 1.9  1999/01/08 19:27:37  curt
+// Fixed AOA reading on HUD.
+// Continued work on time jitter compensation.
+//
 // Revision 1.8  1999/01/08 03:23:51  curt
 // Beginning work on compensating for sim time vs. real world time "jitter".
 //