Added manifold pressure to the property manager.

[flightgear.git] / src / Main / bfi.cxx

diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx
index 3b4ec8c92704a49c00191f72ab2086f977346371..ba599925dc690201d3532dbcfa38b202f87d34e0 100644 (file)
--- a/src/Main/bfi.cxx
+++ b/src/Main/bfi.cxx
@@ -55,7 +55,6 @@
 #endif
 
 #include "globals.hxx"
-#include "options.hxx"
 #include "save.hxx"
 #include "fg_init.hxx"
 #include <simgear/misc/props.hxx>
@@ -104,12 +103,15 @@ FGBFI::init ()
                             getPanelVisible, setPanelVisible);
 
                                // Position
+  current_properties.tieString("/position/airport-id",
+                               getTargetAirport, setTargetAirport);
   current_properties.tieDouble("/position/latitude",
                                getLatitude, setLatitude);
   current_properties.tieDouble("/position/longitude",
                               getLongitude, setLongitude);
   current_properties.tieDouble("/position/altitude",
-                              getAltitude, setAltitude);
+                              // getAltitude, setAltitude);
+                              getAltitude, setAltitude, false);
   current_properties.tieDouble("/position/altitude-agl",
                               getAGL, 0);
 
@@ -128,6 +130,10 @@ FGBFI::init ()
                               getRPM, 0);
   current_properties.tieDouble("/engines/engine0/egt",
                               getEGT, 0);
+  current_properties.tieDouble("/engines/engine0/cht",
+                              getCHT, 0);
+  current_properties.tieDouble("/engines/engine0/mp",
+                              getMP, 0);
 
                                // Velocities
   current_properties.tieDouble("/velocities/airspeed",
@@ -232,6 +238,8 @@ FGBFI::init ()
   current_properties.tieDouble("/environment/visibility",
                               getVisibility, setVisibility);
 
+  _needReinit = false;
+
   FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
 }
 
@@ -283,7 +291,7 @@ FGBFI::reinit ()
   double gpsLongitude = getGPSTargetLongitude();
 
   setTargetAirport("");
-  cout << "Target airport is " << current_options.get_airport_id() << endl;
+  cout << "Target airport is " << globals->get_options()->get_airport_id() << endl;
 
   fgReInitSubsystems();
 
@@ -312,8 +320,6 @@ FGBFI::reinit ()
   setAPAltitude(apAltitude);
   setTargetAirport(targetAirport);
   setGPSLock(gpsLock);
-  setGPSTargetLatitude(gpsLatitude);
-  setGPSTargetLongitude(gpsLongitude);
 
   _needReinit = false;
 
@@ -335,7 +341,7 @@ FGBFI::reinit ()
 int
 FGBFI::getFlightModel ()
 {
-  return current_options.get_flight_model();
+  return globals->get_options()->get_flight_model();
 }
 
 
@@ -345,7 +351,7 @@ FGBFI::getFlightModel ()
 const string
 FGBFI::getAircraft ()
 {
-  return current_options.get_aircraft();
+  return globals->get_options()->get_aircraft();
 }
 
 
@@ -368,7 +374,7 @@ void
 FGBFI::setFlightModel (int model)
 {
   if (getFlightModel() != model) {
-    current_options.set_flight_model(model);
+    globals->get_options()->set_flight_model(model);
     needReinit();
   }
 }
@@ -381,7 +387,7 @@ void
 FGBFI::setAircraft (const string &aircraft)
 {
   if (getAircraft() != aircraft) {
-    current_options.set_aircraft(aircraft);
+    globals->get_options()->set_aircraft(aircraft);
     needReinit();
   }
 }
@@ -419,8 +425,8 @@ FGBFI::setTimeGMT (time_t time)
   if (getTimeGMT() != time) {
                                // FIXME: need to update lighting
                                // and solar system
-    current_options.set_time_offset(time);
-    current_options.set_time_offset_type(fgOPTIONS::FG_TIME_GMT_ABSOLUTE);
+    globals->get_options()->set_time_offset(time);
+    globals->get_options()->set_time_offset_type(FGOptions::FG_TIME_GMT_ABSOLUTE);
     globals->get_time_params()->update( cur_fdm_state->get_Longitude(),
                                        cur_fdm_state->get_Latitude(),
                                        globals->get_warp() );
@@ -451,7 +457,7 @@ FGBFI::getGMTString ()
 bool
 FGBFI::getHUDVisible ()
 {
-  return current_options.get_hud_status();
+  return globals->get_options()->get_hud_status();
 }
 
 
@@ -461,7 +467,7 @@ FGBFI::getHUDVisible ()
 void
 FGBFI::setHUDVisible (bool visible)
 {
-  current_options.set_hud_status(visible);
+  globals->get_options()->set_hud_status(visible);
 }
 
 
@@ -471,7 +477,7 @@ FGBFI::setHUDVisible (bool visible)
 bool
 FGBFI::getPanelVisible ()
 {
-  return current_options.get_panel_status();
+  return globals->get_options()->get_panel_status();
 }
 
 
@@ -481,8 +487,8 @@ FGBFI::getPanelVisible ()
 void
 FGBFI::setPanelVisible (bool visible)
 {
-  if (current_options.get_panel_status() != visible) {
-    current_options.toggle_panel();
+  if (globals->get_options()->get_panel_status() != visible) {
+    globals->get_options()->toggle_panel();
   }
 }
 
@@ -510,7 +516,7 @@ void
 FGBFI::setLatitude (double latitude)
 {
   if (getLatitude() != latitude) {
-    current_options.set_lat(latitude);
+    globals->get_options()->set_lat(latitude);
     current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
     needReinit();
   }
@@ -534,7 +540,7 @@ void
 FGBFI::setLongitude (double longitude)
 {
   if (getLongitude() != longitude) {
-    current_options.set_lon(longitude);
+    globals->get_options()->set_lon(longitude);
     current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
     needReinit();
   }
@@ -571,7 +577,7 @@ FGBFI::setAltitude (double altitude)
 {
   if (getAltitude() != altitude) {
     fgFDMForceAltitude(getFlightModel(), altitude);
-    current_options.set_altitude(altitude);
+    globals->get_options()->set_altitude(altitude);
     current_aircraft.fdm_state->set_Altitude(altitude);
   }
 }
@@ -610,7 +616,7 @@ void
 FGBFI::setHeading (double heading)
 {
   if (getHeading() != heading) {
-    current_options.set_heading(heading);
+    globals->get_options()->set_heading(heading);
     current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
                                                 getPitch() * DEG_TO_RAD,
                                                 heading * DEG_TO_RAD);
@@ -636,7 +642,7 @@ void
 FGBFI::setPitch (double pitch)
 {
   if (getPitch() != pitch) {
-    current_options.set_pitch(pitch);
+    globals->get_options()->set_pitch(pitch);
     current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
                                                 pitch * DEG_TO_RAD,
                                                 getHeading() * DEG_TO_RAD);
@@ -662,7 +668,7 @@ void
 FGBFI::setRoll (double roll)
 {
   if (getRoll() != roll) {
-    current_options.set_roll(roll);
+    globals->get_options()->set_roll(roll);
     current_aircraft.fdm_state->set_Euler_Angles(roll * DEG_TO_RAD,
                                                 getPitch() * DEG_TO_RAD,
                                                 getHeading() * DEG_TO_RAD);
@@ -691,8 +697,11 @@ FGBFI::getRPM ()
 void
 FGBFI::setRPM (double rpm)
 {
-  if (getRPM() != rpm)
-    current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+    if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+       if (getRPM() != rpm) {
+           current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+       }
+    }
 }
 
 
@@ -702,7 +711,33 @@ FGBFI::setRPM (double rpm)
 double
 FGBFI::getEGT ()
 {
-  return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+  }
+}
+
+
+/**
+ * Return the current engine0 CHT.
+ */
+double
+FGBFI::getCHT ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_CHT();
+  }
+}
+
+
+/**
+ * Return the current engine0 CHT.
+ */
+double
+FGBFI::getMP ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_Manifold_Pressure();
+  }
 }
 
 
@@ -761,7 +796,6 @@ void
 FGBFI::setSpeedNorth (double speed)
 {
   if (getSpeedNorth() != speed) {
-    current_options.set_uBody(speed);
     current_aircraft.fdm_state->set_Velocities_Local(speed,
                                                     getSpeedEast(),
                                                     getSpeedDown());
@@ -787,7 +821,6 @@ void
 FGBFI::setSpeedEast (double speed)
 {
   if (getSpeedEast() != speed) {
-    current_options.set_vBody(speed);
     current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
                                                     speed,
                                                     getSpeedDown());
@@ -813,7 +846,6 @@ void
 FGBFI::setSpeedDown (double speed)
 {
   if (getSpeedDown() != speed) {
-    current_options.set_wBody(speed);
     current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
                                                     getSpeedEast(),
                                                     speed);
@@ -1517,10 +1549,14 @@ FGBFI::setGPSLock (bool lock)
 /**
  * Get the GPS target airport code.
  */
-const string
+const string &
 FGBFI::getTargetAirport ()
 {
-  return current_options.get_airport_id();
+  // FIXME: not thread-safe
+  static string out;
+  out = globals->get_options()->get_airport_id();
+
+  return out;
 }
 
 
@@ -1530,7 +1566,8 @@ FGBFI::getTargetAirport ()
 void
 FGBFI::setTargetAirport (const string &airportId)
 {
-  current_options.set_airport_id(airportId);
+  // cout << "setting target airport id = " << airportId << endl;
+  globals->get_options()->set_airport_id(airportId);
 }
 
 
@@ -1544,16 +1581,6 @@ FGBFI::getGPSTargetLatitude ()
 }
 
 
-/**
- * Set the GPS target latitude in degrees (negative for south).
- */
-void
-FGBFI::setGPSTargetLatitude (double latitude)
-{
-  current_autopilot->set_TargetLatitude( latitude );
-}
-
-
 /**
  * Get the GPS target longitude in degrees (negative for west).
  */
@@ -1563,7 +1590,7 @@ FGBFI::getGPSTargetLongitude ()
   return current_autopilot->get_TargetLongitude();
 }
 
-
+#if 0
 /**
  * Set the GPS target longitude in degrees (negative for west).
  */
@@ -1572,6 +1599,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 {
   current_autopilot->set_TargetLongitude( longitude );
 }
+#endif
 
 
 \f
@@ -1600,7 +1628,7 @@ FGBFI::getVisibility ()
 bool
 FGBFI::getClouds ()
 {
-  return current_options.get_clouds();
+  return globals->get_options()->get_clouds();
 }
 
 
@@ -1610,7 +1638,7 @@ FGBFI::getClouds ()
 double
 FGBFI::getCloudsASL ()
 {
-  return current_options.get_clouds_asl();
+  return globals->get_options()->get_clouds_asl();
 }
 
 
@@ -1636,7 +1664,7 @@ FGBFI::setClouds (bool clouds)
 {
   if (getClouds() != clouds) {
     cout << "Set clouds to " << clouds << endl;
-    current_options.set_clouds(clouds);
+    globals->get_options()->set_clouds(clouds);
     needReinit();
   }
 }
@@ -1649,7 +1677,7 @@ void
 FGBFI::setCloudsASL (double cloudsASL)
 {
   if (getCloudsASL() != cloudsASL) {
-    current_options.set_clouds_asl(cloudsASL);
+    globals->get_options()->set_clouds_asl(cloudsASL);
     needReinit();
   }
 }