- eliminated all references to BFI; use properties instead

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

diff --git a/src/Cockpit/steam.hxx b/src/Cockpit/steam.hxx
index b68941b755c94038685925518ddb2b99a23cee36..862433ffa5af67a13133e4beffa4c0d224104f43 100644 (file)
--- a/src/Cockpit/steam.hxx
+++ b/src/Cockpit/steam.hxx
@@ -34,21 +34,20 @@
 #include <time.h>
 #include STL_STRING
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 
 /**
  * STEAM GAUGES
  *
- * This class is a mapping layer, which retrieves information from
- * the BFI (which reports truthful and ideal values) and generates
- * all the instrument errors and inaccuracies that pilots (err)
- * love, of course.  Please report any missing flaws (!).
+ * This class is a mapping layer, which retrieves information from the
+ * property manager (which reports truthful and ideal values) and
+ * generates all the instrument errors and inaccuracies that pilots
+ * (err) love, of course.  Please report any missing flaws (!).
  *
  * These should be used to operate cockpit instruments, 
  * and autopilot features where these are slaved thus.
  * They should not be used for other simulation purposes.
- *
  */
 class FGSteam
 {
@@ -58,9 +57,11 @@ public:
 
                                // Position
   static double get_ALT_ft ();
+  static double get_TC_rad ();
   static double get_MH_deg ();
   static double get_DG_deg ();
-  static double get_TC_rad ();
+  static double get_DG_err ();
+  static void set_DG_err(double approx_magvar);
 
                                // Velocities
   static double get_ASI_kias ();
@@ -70,22 +71,27 @@ public:
                                // Engine Gauges
   static double get_VACUUM_inhg ();
 
+                               // Atmosphere
+  static double get_ALT_datum_mb ();
+  static void set_ALT_datum_mb(double datum_mb);
+
                                // Hacks ... temporary stuff
-  static double get_HackVOR1_deg ();
+  // static double get_HackVOR1_deg ();
   static double get_HackOBS1_deg ();
-  static double get_HackGS_deg ();
-  static double get_HackVOR2_deg ();
+  // static double get_HackGS_deg ();
+  // static double get_HackVOR2_deg ();
   static double get_HackOBS2_deg ();
   static double get_HackADF_deg ();
 
 
 private:
        static double   the_ALT_ft;
+        static double  the_ALT_datum_mb;
         static double   the_TC_rad, the_TC_std;
        static double   the_STATIC_inhg, the_VACUUM_inhg;
        static double   the_VSI_fps, the_VSI_case;
         static double   the_MH_deg, the_MH_degps, the_MH_err;
-        static double   the_DG_deg, the_DG_degps, the_DG_inhg;
+        static double   the_DG_deg, the_DG_degps, the_DG_inhg, the_DG_err;
 
        static int      _UpdatesPending;
        static void     _CatchUp ();