This set of changes touches a *lot* of files. The main goal here is to

[flightgear.git] / src / FDM / flight.hxx

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index a09520f2d44148b147b76bd20a317f4b4e471d90..e01fc43cf20d97fb8a63517dc0bf25ea854383b4 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -110,16 +110,22 @@ private:
     double Throttle;
     double Mixture;
     double Prop_Advance;
+//    int Magnetos;                    // 0=off, 1=left, 2=right, 3=both
+//    bool Starter;                    // flag to indicate the starter switch is on    
 
     // outputs
     double RPM;
-    double Manifold_Pressure;     //inches
+    double Manifold_Pressure;   //inches
     double MaxHP;
-    double Percentage_Power;      //HP
-    double EGT;                   //deg F
-    double CHT;                   //deg F
-    double prop_thrust;           //lbs
-    double Fuel_Flow;             //Gals/hr
+    double Percentage_Power;    //HP
+    double EGT;                 //deg F
+    double CHT;                 //deg F
+    double prop_thrust;         //lbs
+    double Fuel_Flow;           //Gals/hr
+    double Oil_Temp;           //deg F
+    double Oil_Pressure;       //PSI
+    bool running;              //flag to indicate the engine is running self-sustained
+    bool cranking;             //flag to indicate the engine is being turned by the starter
     
     /* others...
     double PercentN1,N1;  //GE,CFM
@@ -147,6 +153,10 @@ public:
     inline double get_CHT() const { return CHT; }
     inline double get_prop_thrust() const { return prop_thrust; }
     inline double get_Fuel_Flow() const { return Fuel_Flow; }
+    inline double get_Oil_Temp() const { return Oil_Temp; }
+    inline double get_Oil_Pressure() const { return Oil_Pressure; }
+    inline bool get_Running_Flag() const { return running; }
+    inline bool get_Cranking_Flag() const { return cranking; }
 
     inline void set_Throttle( double t ) { Throttle = t; }
     inline void set_Mixture( double m ) { Mixture = m; }
@@ -159,6 +169,9 @@ public:
     inline void set_CHT( double c ) { CHT = c; }
     inline void set_prop_thrust( double t ) { prop_thrust = t; }
     inline void set_Fuel_Flow( double f ) { Fuel_Flow = f; }
+    inline void set_Oil_Temp (double o) { Oil_Temp = o; }
+    inline void set_Running_Flag (bool r) { running = r; }
+    inline void set_Cranking_Flag (bool c) { cranking = c; }
 
 };
 
@@ -170,6 +183,14 @@ class FGInterface : public FGSubsystem {
 
 private:
   
+    // Has the init() method been called.  This is used to delay
+    // initialization until scenery can be loaded and we know the true
+    // ground elevation.
+    bool inited;
+
+    // Have we bound to the property system
+    bool bound; 
+
     // periodic update management variable.  This is a scheme to run
     // the fdm with a fixed delta-t.  We control how many iteration of
     // the fdm to run with the fixed dt based on the elapsed time from
@@ -285,7 +306,8 @@ private:
     // SGTimeStamp valid_stamp;          // time this record is valid
     // SGTimeStamp next_stamp;           // time this record is valid
 
-protected:
+// protected:
+public:
 
                                // deliberately not virtual so that
                                // FGInterface constructor will call
@@ -493,6 +515,12 @@ public:
        FG_EXTERNAL = 10
     };
 
+    // initialization
+    inline bool get_inited() const { return inited; }
+    inline void set_inited( bool value ) { inited = value; }
+
+    inline bool get_bound() const { return bound; }
+
     // time and update management values
     inline double get_delta_t() const { return delta_t; }
     inline void set_delta_t( double dt ) { delta_t = dt; }
@@ -783,18 +811,21 @@ public:
     inline double get_vBody () const { return v_wind_body_v[1]; }
     inline double get_wBody () const { return v_wind_body_v[2]; }
 
-    // inline double * get_V_local_rel_ground_v() {
-    //     return v_local_rel_ground_v;
-    // }
-    // inline double get_V_north_rel_ground() const {
-    //     return v_local_rel_ground_v[0];
-    // }
-    // inline double get_V_east_rel_ground() const {
-    //     return v_local_rel_ground_v[1];
-    // }
-    // inline double get_V_down_rel_ground() const {
-    //    return v_local_rel_ground_v[2];
-    // }
+    // Please dont comment these out. fdm=ada uses these (see
+    // cockpit.cxx) --->
+    inline double * get_V_local_rel_ground_v() {
+        return v_local_rel_ground_v;
+    }
+    inline double get_V_north_rel_ground() const {
+        return v_local_rel_ground_v[0];
+    }
+    inline double get_V_east_rel_ground() const {
+        return v_local_rel_ground_v[1];
+    }
+    inline double get_V_down_rel_ground() const {
+        return v_local_rel_ground_v[2];
+    }
+    // <--- fdm=ada uses these (see cockpit.cxx)
 
     // inline double * get_V_local_airmass_v() { return v_local_airmass_v; }
     inline double get_V_north_airmass() const { return v_local_airmass_v[0]; }