X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fmag_compass.hxx;h=1d05c302ccffba5066d3ecfa25859827f9f4a251;hb=52fd6986f88051ccc00fc2d01529568d79d5a56c;hp=f16a22287d38eb67d20c9970993225e43679deee;hpb=2119db35c3f596268e2ee21d3cd8c359a85cd1ed;p=flightgear.git

diff --git a/src/Instrumentation/mag_compass.hxx b/src/Instrumentation/mag_compass.hxx
index f16a22287..1d05c302c 100644
--- a/src/Instrumentation/mag_compass.hxx
+++ b/src/Instrumentation/mag_compass.hxx
@@ -12,8 +12,8 @@
 #endif
 
 #include <simgear/props/props.hxx>
-
-#include <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/interpolater.hxx>
 
 
 /**
@@ -21,45 +21,55 @@
  *
  * Input properties:
  *
- * /instrumentation/magnetic-compass/serviceable
- * /orientation/heading-deg
- * /orientation/beta-deg
- * /environment/magnetic-variation-deg
+ * /instrumentation/"name"/serviceable
+ * /instrumentation/"name"/pitch-offset-deg
+ * /instrumentation/"name"/max-pitch-deg
+ * /instrumentation/"name"/max-roll-deg
+ * /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 ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void update (double dt);
 
 private:
 
-    double _error_deg;
     double _rate_degps;
 
+    std::string _name;
+    int _num;
+    SGSharedPtr<SGInterpTable> _deviation_table;
+    SGPropertyNode_ptr _deviation_node;
+
     SGPropertyNode_ptr _serviceable_node;
+    SGPropertyNode_ptr _pitch_offset_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;
 
 };