Fix initialization order

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

diff --git a/src/Instrumentation/mrg.hxx b/src/Instrumentation/mrg.hxx
index a12df8aaf9820aad7ba8b2544dbb67470abc5230..7f8f9774255fe835d2328c4db6891ef0d3757e23 100644 (file)
--- a/src/Instrumentation/mrg.hxx
+++ b/src/Instrumentation/mrg.hxx
@@ -15,7 +15,7 @@
 
 
 /**
- * Model a vacuum-powered attitude indicator.
+ * Model an electrically-powered master reference gyro.
  *
  * Input properties:
  *
@@ -43,13 +43,16 @@ public:
     virtual ~MasterReferenceGyro ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void bind ();
     virtual void unbind ();
     virtual void update (double dt);
 
 private:
 
-    string _name;
+    static const double gravity; //conversion factor
+
+    std::string _name;
     int _num;
 
     double _last_roll;
@@ -64,6 +67,9 @@ private:
     double _last_roll_rate;
     double _last_pitch_rate;
     double _last_yaw_rate;
+    double _last_g;
+    double _erect_time;
+    double _g_error;
 
     Gyro _gyro;
 
@@ -74,6 +80,7 @@ private:
     SGPropertyNode_ptr _pitch_in_node;
     SGPropertyNode_ptr _roll_in_node;
     SGPropertyNode_ptr _hdg_in_node;
+    SGPropertyNode_ptr _hdg_mag_in_node;
     SGPropertyNode_ptr _g_in_node;
     SGPropertyNode_ptr _electrical_node;
     SGPropertyNode_ptr _pitch_int_node;
@@ -82,6 +89,7 @@ private:
     SGPropertyNode_ptr _pitch_out_node;
     SGPropertyNode_ptr _roll_out_node;
     SGPropertyNode_ptr _hdg_out_node;
+    SGPropertyNode_ptr _hdg_mag_out_node;
     SGPropertyNode_ptr _pitch_rate_out_node;
     SGPropertyNode_ptr _roll_rate_out_node;
     SGPropertyNode_ptr _hdg_rate_out_node;
@@ -90,6 +98,8 @@ private:
     SGPropertyNode_ptr _roll_rate_node;
     SGPropertyNode_ptr _pitch_rate_node;
     SGPropertyNode_ptr _responsiveness_node;
+    SGPropertyNode_ptr _hdg_input_source_node;
+    SGPropertyNode_ptr _fast_erect_node;
 };
 
 #endif // __INSTRUMENTS_MRG_HXX