fix trx and rx heights and improve calculations

[flightgear.git] / src / Instrumentation / mag_compass.hxx

diff --git a/src/Instrumentation/mag_compass.hxx b/src/Instrumentation/mag_compass.hxx
index 61fb0064097d8c75ecfce23c9cf1a40b39a349ee..919f26bc93269ab36402e0cc1e65bd27f73f8ffb 100644 (file)
--- a/src/Instrumentation/mag_compass.hxx
+++ b/src/Instrumentation/mag_compass.hxx
@@ -11,8 +11,8 @@
 # error This library requires C++
 #endif
 
-#include <simgear/misc/props.hxx>
-#include <Main/fgfs.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 
 
 /**
@@ -20,24 +20,26 @@
  *
  * Input properties:
  *
- * /instrumentation/magnetic-compass/serviceable
- * /orientation/heading-deg
- * /orientation/beta-deg
- * /environment/magnetic-variation-deg
+ * /instrumentation/"name"/serviceable
+ * /orientation/roll-deg
+ * /orientation/pitch-deg
+ * /orientation/heading-magnetic-deg
+ * /orientation/side-slip-deg
  * /environment/magnetic-dip-deg
- * /accelerations/ned/north-accel-fps_sec
- * /accelerations/ned/east-accel-fps_sec
- * /accelerations/ned/down-accel-fps_sec
+ * /accelerations/pilot/north-accel-fps_sec
+ * /accelerations/pilot/east-accel-fps_sec
+ * /accelerations/pilot/down-accel-fps_sec
  *
  * Output properties:
  *
- * /instrumentation/magnetic-compass/indicated-heading-deg
+ * /instrumentation/"name"/indicated-heading-deg
  */
-class MagCompass : public FGSubsystem
+class MagCompass : public SGSubsystem
 {
 
 public:
 
+    MagCompass ( SGPropertyNode *node);
     MagCompass ();
     virtual ~MagCompass ();
 
@@ -49,16 +51,18 @@ private:
     double _error_deg;
     double _rate_degps;
 
+    string _name;
+    int _num;
+
     SGPropertyNode_ptr _serviceable_node;
+    SGPropertyNode_ptr _roll_node;
+    SGPropertyNode_ptr _pitch_node;
     SGPropertyNode_ptr _heading_node;
     SGPropertyNode_ptr _beta_node;
-    SGPropertyNode_ptr _variation_node;
     SGPropertyNode_ptr _dip_node;
+    SGPropertyNode_ptr _x_accel_node;
     SGPropertyNode_ptr _y_accel_node;
     SGPropertyNode_ptr _z_accel_node;
-    SGPropertyNode_ptr _north_accel_node;
-    SGPropertyNode_ptr _east_accel_node;
-    SGPropertyNode_ptr _down_accel_node;
     SGPropertyNode_ptr _out_node;
 
 };