X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fattitude_indicator.hxx;h=14453511d21e651b3ee5a57dd0f6a62869087051;hb=ccb890447ae2f950b8032649ca8b8190bdafaf90;hp=db68dd98bda7ba75e96fd4b26620a3fcc06bd073;hpb=2119db35c3f596268e2ee21d3cd8c359a85cd1ed;p=flightgear.git

diff --git a/src/Instrumentation/attitude_indicator.hxx b/src/Instrumentation/attitude_indicator.hxx
index db68dd98b..14453511d 100644
--- a/src/Instrumentation/attitude_indicator.hxx
+++ b/src/Instrumentation/attitude_indicator.hxx
@@ -12,8 +12,7 @@
 #endif
 
 #include <simgear/props/props.hxx>
-
-#include <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 
 #include "gyro.hxx"
 
@@ -21,39 +20,42 @@
 /**
  * Model a vacuum-powered attitude indicator.
  *
- * This first, simple draft is hard-wired to vacuum pump #1.
- *
  * Input properties:
  *
- * /instrumentation/attitude-indicator/config/tumble-flag
- * /instrumentation/attitude-indicator/serviceable
- * /instrumentation/attitude-indicator/caged-flag
- * /instrumentation/attitude-indicator/tumble-norm
+ * /instrumentation/"name"/config/tumble-flag
+ * /instrumentation/"name"/serviceable
+ * /instrumentation/"name"/caged-flag
+ * /instrumentation/"name"/tumble-norm
  * /orientation/pitch-deg
  * /orientation/roll-deg
- * /systems/vacuum[0]/suction-inhg
+ * "vacuum-system"/suction-inhg
  *
  * Output properties:
  *
- * /instrumentation/attitude-indicator/indicated-pitch-deg
- * /instrumentation/attitude-indicator/indicated-roll-deg
- * /instrumentation/attitude-indicator/tumble-norm
+ * /instrumentation/"name"/indicated-pitch-deg
+ * /instrumentation/"name"/indicated-roll-deg
+ * /instrumentation/"name"/tumble-norm
  */
-class AttitudeIndicator : public FGSubsystem
+class AttitudeIndicator : public SGSubsystem
 {
 
 public:
 
-    AttitudeIndicator ();
+    AttitudeIndicator ( SGPropertyNode *node );
     virtual ~AttitudeIndicator ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void bind ();
     virtual void unbind ();
     virtual void update (double dt);
 
 private:
 
+    std::string _name;
+    int _num;
+    std::string _suction;
+
     Gyro _gyro;
 
     SGPropertyNode_ptr _tumble_flag_node;
@@ -67,6 +69,9 @@ private:
     SGPropertyNode_ptr _pitch_out_node;
     SGPropertyNode_ptr _roll_out_node;
     
+    double spin_thresh;
+    double max_roll_error;
+    double max_pitch_error;
 };
 
 #endif // __INSTRUMENTS_ATTITUDE_INDICATOR_HXX