X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fattitude_indicator.hxx;h=2e8bdf128c6bb68cbd38cd03bf7ed33cf3e998f6;hb=c6045147544badd6daefdcab9d4de1ed6936533b;hp=81ad86aee97c12d0bbed94ba1951098db054f498;hpb=682feb8f2d4803444b5a95d956de3979a7a7fcc7;p=flightgear.git

diff --git a/src/Instrumentation/attitude_indicator.hxx b/src/Instrumentation/attitude_indicator.hxx
index 81ad86aee..2e8bdf128 100644
--- a/src/Instrumentation/attitude_indicator.hxx
+++ b/src/Instrumentation/attitude_indicator.hxx
@@ -11,33 +11,37 @@
 # 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>
+
+#include "gyro.hxx"
 
 
 /**
  * Model a vacuum-powered attitude indicator.
  *
- * This first, simple draft is hard-wired to vacuum pump #1.
- *
  * Input properties:
  *
- * /instrumentation/attitude-indicator/serviceable
+ * /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/"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 ();
@@ -47,12 +51,20 @@ public:
 
 private:
 
-    double _spin;
+    string _name;
+    int _num;
+    string _suction;
+
+    Gyro _gyro;
 
-    SGPropertyNode_ptr _serviceable_node;
+    SGPropertyNode_ptr _tumble_flag_node;
+    SGPropertyNode_ptr _caged_node;
+    SGPropertyNode_ptr _tumble_node;
     SGPropertyNode_ptr _pitch_in_node;
     SGPropertyNode_ptr _roll_in_node;
     SGPropertyNode_ptr _suction_node;
+    SGPropertyNode_ptr _pitch_int_node;
+    SGPropertyNode_ptr _roll_int_node;
     SGPropertyNode_ptr _pitch_out_node;
     SGPropertyNode_ptr _roll_out_node;