Fix initialization order

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

diff --git a/src/Instrumentation/mag_compass.hxx b/src/Instrumentation/mag_compass.hxx
index 8f7aafe275f98957ea71f1876eb574f5bc7faec4..91af5c056cd696d396b9f42549528005caab3d3e 100644 (file)
--- a/src/Instrumentation/mag_compass.hxx
+++ b/src/Instrumentation/mag_compass.hxx
@@ -20,28 +20,31 @@
  *
  * 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 SGSubsystem
 {
 
 public:
 
+    MagCompass ( SGPropertyNode *node);
     MagCompass ();
     virtual ~MagCompass ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void update (double dt);
 
 private:
@@ -49,16 +52,18 @@ private:
     double _error_deg;
     double _rate_degps;
 
+    std::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;
 
 };