TACAN: fix distance calculations and some other problems.

[flightgear.git] / src / Systems / pitot.hxx

diff --git a/src/Systems/pitot.hxx b/src/Systems/pitot.hxx
index 80be710f09f3ca4be89623f3dae99e334bee01d6..f694439d906eb70425df762d4e941d1ce6ac90d1 100644 (file)
--- a/src/Systems/pitot.hxx
+++ b/src/Systems/pitot.hxx
@@ -1,6 +1,7 @@
 // pitot.hxx - the pitot air system.
 // Written by David Megginson, started 2002.
 //
+// Last modified by Eric van den Berg, 01 Nov 2013
 // This file is in the Public Domain and comes with no warranty.
 
 
@@ -11,6 +12,11 @@
 # error This library requires C++
 #endif
 
+#include <simgear/compiler.h>
+
+#include <string>
+using std::string;
+
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
@@ -23,21 +29,21 @@
  *
  * Input properties:
  *
- * /systems/pitot[0]/serviceable
- * /environment/pressure-slugft3
- * /environment/density-slugft3
- * /velocities/airspeed-kt
+ * /systems/"name"/serviceable
+ * /environment/pressure-inhg
+ * /velocities/mach
  *
  * Output properties:
  *
- * /systems/pitot[0]/total-pressure-inhg
+ * /systems/"name"/total-pressure-inhg
+ * /systems/"name"/measured-total-pressure-inhg
  */
 class PitotSystem : public SGSubsystem
 {
 
 public:
 
-    PitotSystem ();
+    PitotSystem ( SGPropertyNode *node );
     virtual ~PitotSystem ();
 
     virtual void init ();
@@ -47,12 +53,16 @@ public:
 
 private:
 
+    std::string _name;
+    int _num;
+    double _stall_factor;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _pressure_node;
-    SGPropertyNode_ptr _density_node;
-    SGPropertyNode_ptr _velocity_node;
+    SGPropertyNode_ptr _mach_node;
     SGPropertyNode_ptr _total_pressure_node;
-    
+    SGPropertyNode_ptr _measured_total_pressure_node;
+    SGPropertyNode_ptr _alpha_deg_node;
+    SGPropertyNode_ptr _beta_deg_node;
 };
 
 #endif // __SYSTEMS_PITOT_HXX