NavDisplay - custom symbol support enabled.

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

diff --git a/src/Network/opengc_data.hxx b/src/Network/opengc_data.hxx
index c0d39a1e08bffb33b3c01eb6330ca9b5bc6aecf3..c7dc80e5b25d5c520db6413e8edc71b7ee1a8348 100644 (file)
--- a/src/Network/opengc_data.hxx
+++ b/src/Network/opengc_data.hxx
@@ -24,7 +24,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
 #ifndef _OPENGC_DATA_HXX
@@ -34,7 +34,7 @@
 # error This library requires C++
 #endif
 
-#include <string>
+const int OGC_VERSION = 4;
 
 class ogcFGData {
 
@@ -43,14 +43,16 @@ public:
     // defines msg types and contents. The msg_content is used as a 'pointer' to
     // a predefined set of msg strings
  
-    unsigned int       version_id;
-    unsigned int       msg_type;
-    unsigned int       msg_content;
+    int        version_id;
+    int        msg_type;
+    int        msg_content;
+    int  reserved;
 
     // position
 
     double     latitude;
     double     longitude;
+    double     elevation;
     double     magvar;
 
     // flight parameters
@@ -60,11 +62,11 @@ public:
     double     heading;
     double     altitude;
     double     altitude_agl;  // this can also be the radar altimeter
-    double     v_kcas;
+    double  v_kcas;
     double     groundspeed;
     double     vvi;
     double  mach;
-    double     v_tas;  // true airspeed in knots
+    double     v_keas;  // equivalent airspeed in knots
 
   // Data used by the FMC and autopilots
 
@@ -79,33 +81,46 @@ public:
 
   // Control surface positions
 
-    double     aileron;
+    double     left_aileron;
+    double  right_aileron;
     double     aileron_trim;
     double     elevator;
     double     elevator_trim;
     double     rudder;
     double     rudder_trim;
     double     flaps;
+    double  flaps_cmd;
 
-  // Gear positions 0 = UP and 1 = DOWN
+  // gear positions 0 = up and 1 = down  The 747 has 5 wheel bogey assemblies
 
     double     gear_nose;
     double     gear_left;
     double     gear_right;
-
+    double  gear_left_rear;
+    double  gear_right_rear;
+    double     parking_brake;
+    bool               wow_main;  // logical and of main gear
+               bool            wow_nose;       
     // engine data
 
     double     rpm[4];  // this is for pistons, jets see below
-    double     n1_turbine[4];
+    double     n1_turbine[4];
     double     epr[4];
     double     egt[4];
-    double     n2_turbine[4];
+    double  n2_turbine[4];
     double     fuel_flow[4];
     double  man_pressure[4];
     double     oil_pressure[4];
+    double     oil_temp[4];
+    double     oil_quantity[4];
+    double     hyd_pressure[4];
     double     throttle[4];
     double     mixture[4];
     double     prop_advance[4];
+    
+    // fuel system
+    int num_tanks;
+    double fuel_tank[9];
    
     // Pressures and temperatures
 
@@ -114,7 +129,11 @@ public:
     double     static_pressure;
     double     total_pressure;
     double     dynamic_pressure;
-       
+    
+    // more environmental data
+               double wind;
+               double wind_dir;
+               double sea_level_pressure;
 };
 
 #endif // _OPENGC_HXX