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 4a6d98c3d298bc08daeb0328e005fde068db2875..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:
   
@@ -839,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]; }