Attempt #1 to sort out confusion between left / right / parking brake

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

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 7f61f21490237f41abe2683453519ce08c54704b..6ecd8730c6eba2c0ab0804bdf869ced099ea0138 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -81,20 +81,15 @@
  */
 
 
-#include <simgear/compiler.h>
-
 #include <math.h>
 
 #include <list>
 #include <vector>
 #include <string>
 
+#include <simgear/compiler.h>
 #include <simgear/constants.h>
-// #include <simgear/timing/timestamp.hxx>
-
-#include <Main/fgfs.hxx>
-#include <Model/model.hxx>
-#include <Main/location.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 
 SG_USING_STD(list);
 SG_USING_STD(vector);
@@ -106,7 +101,7 @@ class FGAircraftModel;
 typedef double FG_VECTOR_3[3];
 
 // This is based heavily on LaRCsim/ls_generic.h
-class FGInterface : public FGSubsystem {
+class FGInterface : public SGSubsystem {
 
 private:
   
@@ -512,11 +507,15 @@ public:
     virtual void set_Psi (double psi) { 
       set_Euler_Angles(get_Phi(), get_Theta(), psi);
     }
-    virtual void set_Phi_deg (double phi) { set_Phi(phi * SGD_DEGREES_TO_RADIANS); }
+    virtual void set_Phi_deg (double phi) {
+      set_Phi(phi * SGD_DEGREES_TO_RADIANS);
+    }
     virtual void set_Theta_deg (double theta) {
       set_Theta(theta * SGD_DEGREES_TO_RADIANS); 
     }
-    virtual void set_Psi_deg (double psi) { set_Psi(psi * SGD_DEGREES_TO_RADIANS); }
+    virtual void set_Psi_deg (double psi) {
+      set_Psi(psi * SGD_DEGREES_TO_RADIANS);
+    }
     
     // Flight Path
     virtual void set_Climb_Rate( double roc);
@@ -835,6 +834,9 @@ public:
     inline double get_Phi_dot() const { return euler_rates_v[0]; }
     inline double get_Theta_dot() const { return euler_rates_v[1]; }
     inline double get_Psi_dot() const { return euler_rates_v[2]; }
+    inline double get_Phi_dot_degps() const { return euler_rates_v[0] * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Theta_dot_degps() const { return euler_rates_v[1] * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Psi_dot_degps() const { return euler_rates_v[2] * SGD_RADIANS_TO_DEGREES; }
 
     // inline double * get_Geocentric_rates_v() { return geocentric_rates_v; }
     inline double get_Latitude_dot() const { return geocentric_rates_v[0]; }