Merge branch 'work4' into next

[flightgear.git] / src / Network / net_fdm.hxx

diff --git a/src/Network/net_fdm.hxx b/src/Network/net_fdm.hxx
index e25b9b1ed1d0b5680625a7bd2a2fe079f6d409a0..d5a12454ebd0974f94ccc68bed6be6f14ce239d2 100644 (file)
--- a/src/Network/net_fdm.hxx
+++ b/src/Network/net_fdm.hxx
@@ -1,7 +1,8 @@
 // net_fdm.hxx -- defines a common net I/O interface to the flight
 //                dynamics model
 //
-// Written by Curtis Olson - curt@flightgear.com, started September 2001.
+// Written by Curtis Olson - http://www.flightgear.org/~curt
+// Started September 2001.
 //
 // This file is in the Public Domain, and comes with no warranty.
 //
@@ -12,13 +13,16 @@
 #define _NET_FDM_HXX
 
 
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
 #include <time.h> // time_t
+#include <simgear/misc/stdint.hxx>
+
+// NOTE: this file defines an external interface structure.  Due to
+// variability between platforms and architectures, we only used fixed
+// length types here.  Specifically, integer types can vary in length.
+// I am not aware of any platforms that don't use 4 bytes for float
+// and 8 bytes for double.
 
-const int FG_NET_FDM_VERSION = 19;
+const uint32_t FG_NET_FDM_VERSION = 24;
 
 
 // Define a structure containing the top level flight dynamics model
@@ -28,18 +32,15 @@ class FGNetFDM {
 
 public:
 
-    int version;               // increment when data values change
-    int pad;                    // keep doubles 64-bit aligned for some
-                                // hardware platforms, such as the Sun
-                                // SPARC, which don't like misaligned
-                                // data
-
     enum {
         FG_MAX_ENGINES = 4,
         FG_MAX_WHEELS = 3,
         FG_MAX_TANKS = 4
     };
 
+    uint32_t version;          // increment when data values change
+    uint32_t padding;          // padding
+
     // Positions
     double longitude;          // geodetic (radians)
     double latitude;           // geodetic (radians)
@@ -79,30 +80,34 @@ public:
     // Pressure
     
     // Engine status
-    int num_engines;                // Number of valid engines
-    int eng_state[FG_MAX_ENGINES];   // Engine state (off, cranking, running)
+    uint32_t num_engines;           // Number of valid engines
+    uint32_t eng_state[FG_MAX_ENGINES];// Engine state (off, cranking, running)
     float rpm[FG_MAX_ENGINES];      // Engine RPM rev/min
     float fuel_flow[FG_MAX_ENGINES]; // Fuel flow gallons/hr
+    float fuel_px[FG_MAX_ENGINES];   // Fuel pressure psi
     float egt[FG_MAX_ENGINES];      // Exhuast gas temp deg F
+    float cht[FG_MAX_ENGINES];      // Cylinder head temp deg F
     float mp_osi[FG_MAX_ENGINES];    // Manifold pressure
+    float tit[FG_MAX_ENGINES];      // Turbine Inlet Temperature
     float oil_temp[FG_MAX_ENGINES];  // Oil temp deg F
     float oil_px[FG_MAX_ENGINES];    // Oil pressure psi
 
     // Consumables
-    int num_tanks;             // Max number of fuel tanks
+    uint32_t num_tanks;                // Max number of fuel tanks
     float fuel_quantity[FG_MAX_TANKS];
 
     // Gear status
-    int num_wheels;
-    bool wow[FG_MAX_WHEELS];
+    uint32_t num_wheels;
+    uint32_t wow[FG_MAX_WHEELS];
     float gear_pos[FG_MAX_WHEELS];
     float gear_steer[FG_MAX_WHEELS];
     float gear_compression[FG_MAX_WHEELS];
 
     // Environment
-    time_t cur_time;            // current unix time
-    long int warp;              // offset in seconds to unix time
-    float visibility;           // visibility in meters (for env. effects)
+    uint32_t cur_time;           // current unix time
+                                 // FIXME: make this uint64_t before 2038
+    int32_t warp;                // offset in seconds to unix time
+    float visibility;            // visibility in meters (for env. effects)
 
     // Control surface positions (normalized values)
     float elevator;