ignore resets for now because every z/Z key press would trigger a call to NOAA. We...

[flightgear.git] / src / Controls / controls.hxx

diff --git a/src/Controls/controls.hxx b/src/Controls/controls.hxx
index 2f70b38f0d554b98759d2b30239affb506362d8f..e55c4c38bffb431c82988e2bb7586a6a7b839e56 100644 (file)
--- a/src/Controls/controls.hxx
+++ b/src/Controls/controls.hxx
@@ -86,6 +86,23 @@ public:
        MAX_AUTOPILOTS = 3
     };
 
+    enum {
+       ALL_EJECTION_SEATS = -1,
+       MAX_EJECTION_SEATS = 10
+    };
+   
+    enum {
+       SEAT_SAFED = -1,
+       SEAT_ARMED = 0,
+       SEAT_FAIL = 1
+    };
+   
+    enum { 
+       CMD_SEL_NORM = -1,
+       CMD_SEL_AFT = 0,
+       CMD_SEL_SOLO = 1
+    };
+    
 private:
     // controls/flight/
     double aileron;
@@ -137,7 +154,9 @@ private:
     bool boost_pump[MAX_TANKS * MAX_BOOSTPUMPS];
 
     // controls/gear/
-    double parking_brake;
+    double brake_left;
+    double brake_right;
+    double brake_parking;
     double steering;
     bool gear_down;
     bool antiskid;
@@ -145,7 +164,6 @@ private:
     bool tailwheel_lock;
 
     // controls/gear/wheel[n]/
-    double brake[MAX_WHEELS];
     bool alternate_extension[MAX_WHEELS];
 
     // controls/anti-ice/
@@ -211,7 +229,9 @@ private:
     // controls/seat/
     double vertical_adjust;
     double fore_aft_adjust;
-    bool eject;
+    bool eject[MAX_EJECTION_SEATS];
+    int eseat_status[MAX_EJECTION_SEATS];
+    int cmd_selector_valve;
 
     // controls/APU/
     int off_start_run;
@@ -314,7 +334,9 @@ public:
     }
 
     // controls/gear/
-    inline double get_parking_brake() const { return parking_brake; }
+    inline double get_brake_left() const { return brake_left; }
+    inline double get_brake_right() const { return brake_right; }
+    inline double get_brake_parking() const { return brake_parking; }
     inline double get_steering() const { return steering; }
     inline bool get_gear_down() const { return gear_down; }
     inline bool get_antiskid() const { return antiskid; }
@@ -322,7 +344,6 @@ public:
     inline bool get_tailwheel_lock() const { return tailwheel_lock; }
 
     // controls/gear/wheel[n]/
-    inline double get_brake(int wheel) const { return brake[wheel]; }
     inline bool get_alternate_extension(int wheel) const {
         return alternate_extension[wheel];
     }
@@ -394,7 +415,14 @@ public:
     // controls/seat/
     inline double get_vertical_adjust() const { return vertical_adjust; }
     inline double get_fore_aft_adjust() const { return fore_aft_adjust; }
-    inline bool get_eject() const { return eject; }
+    inline bool get_ejection_seat( int which_seat ) const {
+        return eject[which_seat];
+    }
+    inline int get_eseat_status( int which_seat ) const {
+        return eseat_status[which_seat];
+    }
+    inline int get_cmd_selector_valve() const { return cmd_selector_valve; }
+    
 
     // controls/APU/
     inline int get_off_start_run() const { return off_start_run; }
@@ -487,7 +515,11 @@ public:
     void set_boost_pump( int index, bool val );
 
     // controls/gear/
-    void set_parking_brake( double pos );
+    void set_brake_left( double pos );
+    void move_brake_left( double amt );
+    void set_brake_right( double pos );
+    void move_brake_right( double amt );
+    void set_brake_parking( double pos );
     void set_steering( double pos );
     void move_steering( double amt );
     void set_gear_down( bool gear );
@@ -496,8 +528,6 @@ public:
     void set_tailwheel_lock( bool val );
 
     // controls/gear/wheel[n]/
-    void set_brake( int wheel, double pos );
-    void move_brake( int wheel, double amt );
     void set_alternate_extension( int wheel, bool val );
 
     // controls/anti-ice/
@@ -571,7 +601,9 @@ public:
     void move_vertical_adjust( double amt );
     void set_fore_aft_adjust( double pos );
     void move_fore_aft_adjust( double amt );
-    void set_eject( bool val );
+    void set_ejection_seat( int which_seat, bool val );
+    void set_eseat_status( int which_seat, int val );
+    void set_cmd_selector_valve( int val );
 
     // controls/APU/
     void set_off_start_run( int pos );