]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/bfi.cxx
Added manifold pressure to the property manager.
[flightgear.git] / src / Main / bfi.cxx
index e026f8662ee455f720e894cbf1a121c1a383a20e..ba599925dc690201d3532dbcfa38b202f87d34e0 100644 (file)
@@ -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);
 
@@ -125,7 +127,13 @@ FGBFI::init ()
 
                                // Engine
   current_properties.tieDouble("/engines/engine0/rpm",
-                              getRPM, setRPM);
+                              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",
@@ -144,6 +152,10 @@ FGBFI::init ()
                                // Controls
   current_properties.tieDouble("/controls/throttle",
                               getThrottle, setThrottle);
+  current_properties.tieDouble("/controls/mixture",
+                              getMixture, setMixture);
+  current_properties.tieDouble("/controls/propellor-pitch",
+                              getPropAdvance, setPropAdvance);
   current_properties.tieDouble("/controls/flaps",
                               getFlaps, setFlaps);
   current_properties.tieDouble("/controls/aileron",
@@ -226,6 +238,8 @@ FGBFI::init ()
   current_properties.tieDouble("/environment/visibility",
                               getVisibility, setVisibility);
 
+  _needReinit = false;
+
   FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
 }
 
@@ -259,16 +273,6 @@ FGBFI::reinit ()
 
   cout << "BFI: start reinit\n";
 
-//   setHeading(getHeading());
-//   setPitch(getPitch());
-//   setRoll(getRoll());
-//   setSpeedNorth(getSpeedNorth());
-//   setSpeedEast(getSpeedEast());
-//   setSpeedDown(getSpeedDown());
-//   setLatitude(getLatitude());
-//   setLongitude(getLongitude());
-//   setAltitude(getAltitude());
-
                                // TODO: add more AP stuff
   double elevator = getElevator();
   double aileron = getAileron();
@@ -287,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();
 
@@ -316,8 +320,6 @@ FGBFI::reinit ()
   setAPAltitude(apAltitude);
   setTargetAirport(targetAirport);
   setGPSLock(gpsLock);
-  setGPSTargetLatitude(gpsLatitude);
-  setGPSTargetLongitude(gpsLongitude);
 
   _needReinit = false;
 
@@ -339,7 +341,7 @@ FGBFI::reinit ()
 int
 FGBFI::getFlightModel ()
 {
-  return current_options.get_flight_model();
+  return globals->get_options()->get_flight_model();
 }
 
 
@@ -349,7 +351,7 @@ FGBFI::getFlightModel ()
 const string
 FGBFI::getAircraft ()
 {
-  return current_options.get_aircraft();
+  return globals->get_options()->get_aircraft();
 }
 
 
@@ -371,8 +373,10 @@ FGBFI::getAircraftDir ()
 void
 FGBFI::setFlightModel (int model)
 {
-  current_options.set_flight_model(model);
-  needReinit();
+  if (getFlightModel() != model) {
+    globals->get_options()->set_flight_model(model);
+    needReinit();
+  }
 }
 
 
@@ -382,8 +386,10 @@ FGBFI::setFlightModel (int model)
 void
 FGBFI::setAircraft (const string &aircraft)
 {
-  current_options.set_aircraft(aircraft);
-  needReinit();
+  if (getAircraft() != aircraft) {
+    globals->get_options()->set_aircraft(aircraft);
+    needReinit();
+  }
 }
 
 
@@ -393,8 +399,10 @@ FGBFI::setAircraft (const string &aircraft)
 void
 FGBFI::setAircraftDir (const string &dir)
 {
-  aircraft_dir = dir;
-  needReinit();
+  if (getAircraftDir() != dir) {
+    aircraft_dir = dir;
+    needReinit();
+  }
 }
 
 
@@ -414,14 +422,16 @@ FGBFI::getTimeGMT ()
 void
 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_time_params()->update( cur_fdm_state->get_Longitude(),
-                                     cur_fdm_state->get_Latitude(),
-                                     globals->get_warp() );
-  needReinit();
+    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() );
+    needReinit();
+  }
 }
 
 
@@ -447,7 +457,7 @@ FGBFI::getGMTString ()
 bool
 FGBFI::getHUDVisible ()
 {
-  return current_options.get_hud_status();
+  return globals->get_options()->get_hud_status();
 }
 
 
@@ -457,7 +467,7 @@ FGBFI::getHUDVisible ()
 void
 FGBFI::setHUDVisible (bool visible)
 {
-  current_options.set_hud_status(visible);
+  globals->get_options()->set_hud_status(visible);
 }
 
 
@@ -467,7 +477,7 @@ FGBFI::setHUDVisible (bool visible)
 bool
 FGBFI::getPanelVisible ()
 {
-  return current_options.get_panel_status();
+  return globals->get_options()->get_panel_status();
 }
 
 
@@ -477,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();
   }
 }
 
@@ -505,9 +515,11 @@ FGBFI::getLatitude ()
 void
 FGBFI::setLatitude (double latitude)
 {
-  current_options.set_lat(latitude);
-  current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
-  needReinit();
+  if (getLatitude() != latitude) {
+    globals->get_options()->set_lat(latitude);
+    current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
+    needReinit();
+  }
 }
 
 
@@ -527,9 +539,11 @@ FGBFI::getLongitude ()
 void
 FGBFI::setLongitude (double longitude)
 {
-  current_options.set_lon(longitude);
-  current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
-  needReinit();
+  if (getLongitude() != longitude) {
+    globals->get_options()->set_lon(longitude);
+    current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
+    needReinit();
+  }
 }
 
 
@@ -561,10 +575,11 @@ FGBFI::getAGL ()
 void
 FGBFI::setAltitude (double altitude)
 {
-  fgFDMForceAltitude(getFlightModel(), altitude * FEET_TO_METER);
-  current_options.set_altitude(altitude * FEET_TO_METER);
-  current_aircraft.fdm_state->set_Altitude(altitude);
-//   needReinit();
+  if (getAltitude() != altitude) {
+    fgFDMForceAltitude(getFlightModel(), altitude);
+    globals->get_options()->set_altitude(altitude);
+    current_aircraft.fdm_state->set_Altitude(altitude);
+  }
 }
 
 
@@ -600,11 +615,13 @@ FGBFI::getHeadingMag ()
 void
 FGBFI::setHeading (double heading)
 {
-  current_options.set_heading(heading);
-  current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
-                                              getPitch() * DEG_TO_RAD,
-                                              heading * DEG_TO_RAD);
-  needReinit();
+  if (getHeading() != 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);
+    needReinit();
+  }
 }
 
 
@@ -624,12 +641,13 @@ FGBFI::getPitch ()
 void
 FGBFI::setPitch (double pitch)
 {
-
-  current_options.set_pitch(pitch);
-  current_aircraft.fdm_state->set_Euler_Angles(getRoll() * DEG_TO_RAD,
-                                              pitch * DEG_TO_RAD,
-                                              getHeading() * DEG_TO_RAD);
-  needReinit();
+  if (getPitch() != 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);
+    needReinit();
+  }
 }
 
 
@@ -649,11 +667,13 @@ FGBFI::getRoll ()
 void
 FGBFI::setRoll (double roll)
 {
-  current_options.set_roll(roll);
-  current_aircraft.fdm_state->set_Euler_Angles(roll * DEG_TO_RAD,
-                                              getPitch() * DEG_TO_RAD,
-                                              getHeading() * DEG_TO_RAD);
-  needReinit();
+  if (getRoll() != 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);
+    needReinit();
+  }
 }
 
 
@@ -676,9 +696,47 @@ FGBFI::getRPM ()
  */
 void
 FGBFI::setRPM (double rpm)
+{
+    if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+       if (getRPM() != rpm) {
+           current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+       }
+    }
+}
+
+
+/**
+ * Return the current engine0 EGT.
+ */
+double
+FGBFI::getEGT ()
 {
   if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
-      current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+      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();
   }
 }
 
@@ -737,11 +795,12 @@ FGBFI::getSpeedNorth ()
 void
 FGBFI::setSpeedNorth (double speed)
 {
-  current_options.set_uBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(speed,
-                                                  getSpeedEast(),
-                                                  getSpeedDown());
-  needReinit();
+  if (getSpeedNorth() != speed) {
+    current_aircraft.fdm_state->set_Velocities_Local(speed,
+                                                    getSpeedEast(),
+                                                    getSpeedDown());
+    needReinit();
+  }
 }
 
 
@@ -761,11 +820,12 @@ FGBFI::getSpeedEast ()
 void
 FGBFI::setSpeedEast (double speed)
 {
-  current_options.set_vBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-                                                  speed,
-                                                  getSpeedDown());
-  needReinit();
+  if (getSpeedEast() != speed) {
+    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
+                                                    speed,
+                                                    getSpeedDown());
+    needReinit();
+  }
 }
 
 
@@ -785,11 +845,12 @@ FGBFI::getSpeedDown ()
 void
 FGBFI::setSpeedDown (double speed)
 {
-  current_options.set_wBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-                                                  getSpeedEast(),
-                                                  speed);
-  needReinit();
+  if (getSpeedDown() != speed) {
+    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
+                                                    getSpeedEast(),
+                                                    speed);
+    needReinit();
+  }
 }
 
 
@@ -805,7 +866,7 @@ FGBFI::setSpeedDown (double speed)
 double
 FGBFI::getThrottle ()
 {
-                               // FIXME: add throttle selector
+                               // FIXME: add engine selector
   return controls.get_throttle(0);
 }
 
@@ -816,12 +877,55 @@ FGBFI::getThrottle ()
 void
 FGBFI::setThrottle (double throttle)
 {
-                               // FIXME: allow throttle selection
-                               // FIXME: clamp?
+                               // FIXME: allow engine selection
   controls.set_throttle(0, throttle);
 }
 
 
+/**
+ * Get the fuel mixture setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getMixture ()
+{
+                               // FIXME: add engine selector
+  return controls.get_mixture(0);
+}
+
+
+/**
+ * Set the fuel mixture, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setMixture (double mixture)
+{
+                               // FIXME: allow engine selection
+  controls.set_mixture(0, mixture);
+}
+
+
+/**
+ * Get the propellor pitch setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getPropAdvance ()
+{
+                               // FIXME: add engine selector
+  return controls.get_prop_advance(0);
+}
+
+
+/**
+ * Set the propellor pitch, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setPropAdvance (double pitch)
+{
+                               // FIXME: allow engine selection
+  controls.set_prop_advance(0, pitch);
+}
+
+
 /**
  * Get the flaps setting, from 0.0 (none) to 1.0 (full).
  */
@@ -1445,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;
 }
 
 
@@ -1458,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);
 }
 
 
@@ -1472,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).
  */
@@ -1491,7 +1590,7 @@ FGBFI::getGPSTargetLongitude ()
   return current_autopilot->get_TargetLongitude();
 }
 
-
+#if 0
 /**
  * Set the GPS target longitude in degrees (negative for west).
  */
@@ -1500,6 +1599,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 {
   current_autopilot->set_TargetLongitude( longitude );
 }
+#endif
 
 
 \f
@@ -1528,7 +1628,7 @@ FGBFI::getVisibility ()
 bool
 FGBFI::getClouds ()
 {
-  return current_options.get_clouds();
+  return globals->get_options()->get_clouds();
 }
 
 
@@ -1538,7 +1638,7 @@ FGBFI::getClouds ()
 double
 FGBFI::getCloudsASL ()
 {
-  return current_options.get_clouds_asl();
+  return globals->get_options()->get_clouds_asl();
 }
 
 
@@ -1562,9 +1662,11 @@ FGBFI::setVisibility (double visibility)
 void
 FGBFI::setClouds (bool clouds)
 {
-  cout << "Set clouds to " << clouds << endl;
-  current_options.set_clouds(clouds);
-  needReinit();
+  if (getClouds() != clouds) {
+    cout << "Set clouds to " << clouds << endl;
+    globals->get_options()->set_clouds(clouds);
+    needReinit();
+  }
 }
 
 
@@ -1574,8 +1676,10 @@ FGBFI::setClouds (bool clouds)
 void
 FGBFI::setCloudsASL (double cloudsASL)
 {
-  current_options.set_clouds_asl(cloudsASL);
-  needReinit();
+  if (getCloudsASL() != cloudsASL) {
+    globals->get_options()->set_clouds_asl(cloudsASL);
+    needReinit();
+  }
 }