ignore resets for now because every z/Z key press would trigger a call to NOAA. We...

[flightgear.git] / src / Instrumentation / slip_skid_ball.cxx

diff --git a/src/Instrumentation/slip_skid_ball.cxx b/src/Instrumentation/slip_skid_ball.cxx
index 4132027136beafe17b847fe9be3c72ffe1354327..9ebff9ba73d9aafe2828f1d561685b17d1ab73c5 100644 (file)
--- a/src/Instrumentation/slip_skid_ball.cxx
+++ b/src/Instrumentation/slip_skid_ball.cxx
@@ -19,22 +19,27 @@ SlipSkidBall::~SlipSkidBall ()
 void
 SlipSkidBall::init ()
 {
-    _y_accel_node = fgGetNode("/orientation/roll-rate-degps", true);
-    _z_accel_node = fgGetNode("/orientation/yaw-rate-degps", true);
+    _serviceable_node =
+        fgGetNode("/instrumentation/slip-skid-ball/serviceable", true);
+    _y_accel_node = fgGetNode("/accelerations/pilot/y-accel-fps_sec", true);
+    _z_accel_node = fgGetNode("/accelerations/pilot/z-accel-fps_sec", true);
     _out_node =
         fgGetNode("/instrumentation/slip-skid-ball/indicated-slip-skid", true);
+    _override_node =
+        fgGetNode("/instrumentation/slip-skid-ball/override", true);
 }
 
 void
-SlipSkidBall::update (double dt)
+SlipSkidBall::update (double delta_time_sec)
 {
-    double d = -_z_accel_node->getDoubleValue();
-    if (d < 60.0)               // originally 1 radian
-        d = 60.0;
-    double pos = _y_accel_node->getDoubleValue()/d;
-    pos = fgGetLowPass(_last_pos, pos, dt);
-    _last_pos = pos;
-    _out_node->setDoubleValue(pos);
+    if (_serviceable_node->getBoolValue() && !_override_node->getBoolValue()) {
+        double d = -_z_accel_node->getDoubleValue();
+        if (d < 1.0)
+            d = 1.0;
+        double pos = _y_accel_node->getDoubleValue() / d * 10.0;
+        pos = fgGetLowPass(_out_node->getDoubleValue(), pos, delta_time_sec);
+        _out_node->setDoubleValue(pos);
+    }
 }
 
 // end of slip_skid_ball.cxx