Tweak #includes to use double quotes for local files not <>

[flightgear.git] / src / Cockpit / steam.cxx

diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx
index 3f162dc23ed27685295a3281cfa9a22a8aac1030..6b4a2a86ab5c1ffa196cf5f77bd43956bd32a2c9 100644 (file)
--- a/src/Cockpit/steam.cxx
+++ b/src/Cockpit/steam.cxx
@@ -31,7 +31,6 @@
 #include <simgear/math/sg_types.hxx>
 #include <simgear/misc/props.hxx>
 #include <Aircraft/aircraft.hxx>
-#include <NetworkOLK/features.hxx>
 
 SG_USING_NAMESPACE(std);
 
@@ -57,7 +56,7 @@ void FGSteam::set_ALT_datum_mb ( double datum_mb ) {
     the_ALT_datum_mb = datum_mb;
 }
 
-double FGSteam::get_ASI_kias() { return fgGetDouble("/velocities/airspeed"); }
+double FGSteam::get_ASI_kias() { return fgGetDouble("/velocities/airspeed-kt"); }
 
 double FGSteam::the_VSI_case = 29.92;
 double FGSteam::the_VSI_fps = 0.0;
@@ -103,20 +102,30 @@ void FGSteam::update ( int timesteps )
 {
     if (!isTied) {
         isTied = true;
-        fgTie("/steam/airspeed", FGSteam::get_ASI_kias);
-        fgTie("/steam/altitude", FGSteam::get_ALT_ft);
+        fgTie("/steam/airspeed-kt", FGSteam::get_ASI_kias);
+       fgSetArchivable("/steam/airspeed-kt");
+        fgTie("/steam/altitude-ft", FGSteam::get_ALT_ft);
+       fgSetArchivable("/steam/altitude-ft");
         fgTie("/steam/altimeter-datum-mb",
               FGSteam::get_ALT_datum_mb, FGSteam::set_ALT_datum_mb,
               false);  /* don't modify the value */
+       fgSetArchivable("/steam/altimeter-datum-mb");
         fgTie("/steam/turn-rate", FGSteam::get_TC_std);
+       fgSetArchivable("/steam/turn-rate");
         fgTie("/steam/slip-skid", FGSteam::get_TC_rad);
-        fgTie("/steam/vertical-speed", FGSteam::get_VSI_fps);
-        fgTie("/steam/gyro-compass", FGSteam::get_DG_deg);
-        fgTie("/steam/adf", FGSteam::get_HackADF_deg);
-        fgTie("/steam/gyro-compass-error",
+       fgSetArchivable("/steam/slip-skid");
+        fgTie("/steam/vertical-speed-fpm", FGSteam::get_VSI_fps);
+       fgSetArchivable("/steam/vertical-speed-fpm");
+        fgTie("/steam/gyro-compass-deg", FGSteam::get_DG_deg);
+       fgSetArchivable("/steam/gyro-compass-deg");
+        fgTie("/steam/adf-deg", FGSteam::get_HackADF_deg);
+       fgSetArchivable("/steam/adf-deg");
+        fgTie("/steam/gyro-compass-error-deg",
               FGSteam::get_DG_err, FGSteam::set_DG_err,
               false);  /* don't modify the value */
-        fgTie("/steam/mag-compass", FGSteam::get_MH_deg);
+       fgSetArchivable("/steam/gyro-compass-error-deg");
+        fgTie("/steam/mag-compass-deg", FGSteam::get_MH_deg);
+       fgSetArchivable("/steam/mag-compass-deg");
     }
     _UpdatesPending += timesteps;
 }
@@ -269,16 +278,16 @@ void FGSteam::_CatchUp()
        if ( fabs(the_TC_rad) > 0.2 )
        {       /* Massive sideslip jams it; it stops turning */
                the_MH_degps = 0.0;
-               the_MH_err   = fgGetDouble("/orientation/heading") - the_MH_deg;
+               the_MH_err   = fgGetDouble("/orientation/heading-deg") - the_MH_deg;
        } else
        {       double MagDip, MagVar, CosDip;
                double FrcN, FrcE, FrcU, AccTot;
                double EdgN, EdgE, EdgU;
                double TrqN, TrqE, TrqU, Torque;
                /* Find a force vector towards exact magnetic north */
-               MagVar = fgGetDouble("/environment/magnetic-variation") 
+               MagVar = fgGetDouble("/environment/magnetic-variation-deg") 
                     / SGD_RADIANS_TO_DEGREES;
-               MagDip = fgGetDouble("/environment/magnetic-dip")
+               MagDip = fgGetDouble("/environment/magnetic-dip-deg")
                     / SGD_RADIANS_TO_DEGREES;
                CosDip = cos ( MagDip );
                FrcN = CosDip * cos ( MagVar );
@@ -309,7 +318,7 @@ void FGSteam::_CatchUp()
                }
                if ( the_MH_err >  180.0 ) the_MH_err -= 360.0; else
                if ( the_MH_err < -180.0 ) the_MH_err += 360.0;
-               the_MH_deg  = fgGetDouble("/orientation/heading") - the_MH_err;
+               the_MH_deg  = fgGetDouble("/orientation/heading-deg") - the_MH_err;
        }
 
        /**************************
@@ -317,7 +326,7 @@ void FGSteam::_CatchUp()
        scaling capability for the vacuum pump later on.
        When we have a real engine model, we can ask it.
        */
-       the_ENGINE_rpm = controls.get_throttle(0) * 26.0;
+       the_ENGINE_rpm = globals->get_controls()->get_throttle(0) * 26.0;
 
        /**************************
        First, we need to know what the static line is reporting,
@@ -326,7 +335,7 @@ void FGSteam::_CatchUp()
        account for the line impedance of the plumbing.
        */
        double static_inhg
-            = altFtToPressInHg(fgGetDouble("/position/altitude"));
+            = altFtToPressInHg(fgGetDouble("/position/altitude-ft"));
        set_lowpass ( & the_STATIC_inhg, static_inhg, dt ); 
 
        /*
@@ -386,10 +395,10 @@ void FGSteam::_CatchUp()
 > put in those insidious turning errors ... for now anyway.
 */
        if ( _UpdatesPending > 999999 )
-           the_DG_err = fgGetDouble("/environment/magnetic-variation");
+           the_DG_err = fgGetDouble("/environment/magnetic-variation-deg");
        the_DG_degps = 0.01; /* HACK! */
        if (dt<1.0) the_DG_err += dt * the_DG_degps;
-       the_DG_deg = fgGetDouble("/orientation/heading") - the_DG_err;
+       the_DG_deg = fgGetDouble("/orientation/heading-deg") - the_DG_err;
 
        /**************************
        Finished updates, now clear the timer 
@@ -413,7 +422,7 @@ double FGSteam::get_HackGS_deg () {
         current_radiostack->get_nav1_has_gs() )
     {
        double x = current_radiostack->get_nav1_gs_dist();
-       double y = (fgGetDouble("/position/altitude")
+       double y = (fgGetDouble("/position/altitude-ft")
                     - current_radiostack->get_nav1_elev())
            * SG_FEET_TO_METER;
        double angle = atan2( y, x ) * SGD_RADIANS_TO_DEGREES;
@@ -485,7 +494,7 @@ double FGSteam::get_HackADF_deg () {
 
     if ( current_radiostack->get_adf_inrange() ) {
        double r = current_radiostack->get_adf_heading()
-            - fgGetDouble("orientation/heading");
+            - fgGetDouble("/orientation/heading-deg");
        last_r = r;
        // cout << "Radial = " << current_radiostack->get_adf_heading() 
        //      << "  Heading = " << FGBFI::getHeading() << endl;