]> 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 85a0f80b98f927d7710342bfbc6a05cfbdfc974b..ba599925dc690201d3532dbcfa38b202f87d34e0 100644 (file)
 #endif
 
 #include <simgear/constants.h>
-#include <simgear/math/fg_types.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/ephemeris/ephemeris.hxx>
+#include <simgear/math/sg_types.hxx>
+#include <simgear/misc/props.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include <Aircraft/aircraft.hxx>
+#include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #include <Controls/controls.hxx>
 #include <Autopilot/newauto.hxx>
 #include <Scenery/scenery.hxx>
-#include <Time/fg_time.hxx>
 #include <Time/light.hxx>
+#include <Time/event.hxx>
+#include <Time/sunpos.hxx>
+#include <Time/tmp.hxx>
 #include <Cockpit/radiostack.hxx>
 #ifndef FG_OLD_WEATHER
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #  include <Weather/weather.hxx>
 #endif
 
-#include "options.hxx"
+#include "globals.hxx"
 #include "save.hxx"
 #include "fg_init.hxx"
+#include <simgear/misc/props.hxx>
 
 FG_USING_NAMESPACE(std);
 
-                               // FIXME: these are not part of the
-                               // published interface!!!
-// extern fgAPDataPtr APDataGlobal;
-// extern void fgAPAltitudeSet (double new_altitude);
-// extern void fgAPHeadingSet (double new_heading);
-
 
 #include "bfi.hxx"
 
@@ -77,6 +79,171 @@ bool FGBFI::_needReinit = false;
 ////////////////////////////////////////////////////////////////////////
 
 
+/**
+ * Initialize the BFI by binding its functions to properties.
+ *
+ * TODO: perhaps these should migrate into the individual modules
+ * (i.e. they should register themselves).
+ */
+void
+FGBFI::init ()
+{
+  FG_LOG(FG_GENERAL, FG_INFO, "Starting BFI init");
+                               // Simulation
+  current_properties.tieInt("/sim/flight-model",
+                           getFlightModel, setFlightModel);
+//   current_properties.tieString("/sim/aircraft",
+//                            getAircraft, setAircraft);
+  // TODO: timeGMT
+  current_properties.tieString("/sim/time/gmt-string",
+                              getGMTString, 0);
+  current_properties.tieBool("/sim/hud/visibility",
+                            getHUDVisible, setHUDVisible);
+  current_properties.tieBool("/sim/panel/visibility",
+                            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, false);
+  current_properties.tieDouble("/position/altitude-agl",
+                              getAGL, 0);
+
+                               // Orientation
+  current_properties.tieDouble("/orientation/heading",
+                              getHeading, setHeading);
+  current_properties.tieDouble("/orientation/heading-magnetic",
+                              getHeadingMag, 0);
+  current_properties.tieDouble("/orientation/pitch",
+                              getPitch, setPitch);
+  current_properties.tieDouble("/orientation/roll",
+                              getRoll, setRoll);
+
+                               // Engine
+  current_properties.tieDouble("/engines/engine0/rpm",
+                              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",
+                              getAirspeed, 0);
+  current_properties.tieDouble("/velocities/side-slip",
+                              getSideSlip, 0);
+  current_properties.tieDouble("/velocities/vertical-speed",
+                              getVerticalSpeed, 0);
+  current_properties.tieDouble("/velocities/speed-north",
+                              getSpeedNorth, setSpeedNorth);
+  current_properties.tieDouble("/velocities/speed-east",
+                              getSpeedEast, setSpeedEast);
+  current_properties.tieDouble("/velocities/speed-down",
+                              getSpeedDown, setSpeedDown);
+
+                               // 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",
+                              getAileron, setAileron);
+  current_properties.tieDouble("/controls/rudder",
+                              getRudder, setRudder);
+  current_properties.tieDouble("/controls/elevator",
+                              getElevator, setElevator);
+  current_properties.tieDouble("/controls/elevator-trim",
+                              getElevatorTrim, setElevatorTrim);
+  current_properties.tieDouble("/controls/brakes/all",
+                              getBrakes, setBrakes);
+  current_properties.tieDouble("/controls/brakes/left",
+                              getLeftBrake, setLeftBrake);
+  current_properties.tieDouble("/controls/brakes/right",
+                              getRightBrake, setRightBrake);
+  current_properties.tieDouble("/controls/brakes/center",
+                              getRightBrake, setCenterBrake);
+
+                               // Autopilot
+  current_properties.tieBool("/autopilot/locks/altitude",
+                            getAPAltitudeLock, setAPAltitudeLock);
+  current_properties.tieDouble("/autopilot/settings/altitude",
+                              getAPAltitude, setAPAltitude);
+  current_properties.tieBool("/autopilot/locks/heading",
+                            getAPHeadingLock, setAPHeadingLock);
+  current_properties.tieDouble("/autopilot/settings/heading",
+                              getAPHeading, setAPHeading);
+  current_properties.tieDouble("/autopilot/settings/heading-magnetic",
+                              getAPHeadingMag, setAPHeadingMag);
+  current_properties.tieBool("/autopilot/locks/nav1",
+                            getAPNAV1Lock, setAPNAV1Lock);
+
+                               // Radio navigation
+  current_properties.tieDouble("/radios/nav1/frequencies/selected",
+                              getNAV1Freq, setNAV1Freq);
+  current_properties.tieDouble("/radios/nav1/frequencies/standby",
+                              getNAV1AltFreq, setNAV1AltFreq);
+  current_properties.tieDouble("/radios/nav1/radials/actual",
+                              getNAV1Radial, 0);
+  current_properties.tieDouble("/radios/nav1/radials/selected",
+                              getNAV1SelRadial, setNAV1SelRadial);
+  current_properties.tieDouble("/radios/nav1/dme/distance",
+                              getNAV1DistDME, 0);
+  current_properties.tieBool("/radios/nav1/to-flag",
+                            getNAV1TO, 0);
+  current_properties.tieBool("/radios/nav1/from-flag",
+                            getNAV1FROM, 0);
+  current_properties.tieBool("/radios/nav1/in-range",
+                            getNAV1InRange, 0);
+  current_properties.tieBool("/radios/nav1/dme/in-range",
+                            getNAV1DMEInRange, 0);
+                              
+  current_properties.tieDouble("/radios/nav2/frequencies/selected",
+                              getNAV2Freq, setNAV2Freq);
+  current_properties.tieDouble("/radios/nav2/frequencies/standby",
+                              getNAV2AltFreq, setNAV2AltFreq);
+  current_properties.tieDouble("/radios/nav2/radials/actual",
+                              getNAV2Radial, 0);
+  current_properties.tieDouble("/radios/nav2/radials/selected",
+                              getNAV2SelRadial, setNAV2SelRadial);
+  current_properties.tieDouble("/radios/nav2/dme/distance",
+                              getNAV2DistDME, 0);
+  current_properties.tieBool("/radios/nav2/to-flag",
+                            getNAV2TO, 0);
+  current_properties.tieBool("/radios/nav2/from-flag",
+                            getNAV2FROM, 0);
+  current_properties.tieBool("/radios/nav2/in-range",
+                            getNAV2InRange, 0);
+  current_properties.tieBool("/radios/nav2/dme/in-range",
+                            getNAV2DMEInRange, 0);
+
+  current_properties.tieDouble("/radios/adf/frequencies/selected",
+                              getADFFreq, setADFFreq);
+  current_properties.tieDouble("/radios/adf/frequencies/standby",
+                              getADFAltFreq, setADFAltFreq);
+  current_properties.tieDouble("/radios/adf/rotation",
+                              getADFRotation, setADFRotation);
+
+  current_properties.tieDouble("/environment/visibility",
+                              getVisibility, setVisibility);
+
+  _needReinit = false;
+
+  FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
+}
+
+
 /**
  * Reinitialize FGFS if required.
  *
@@ -104,6 +271,8 @@ FGBFI::reinit ()
                                // that's going to get clobbered
                                // when we reinit the subsystems.
 
+  cout << "BFI: start reinit\n";
+
                                // TODO: add more AP stuff
   double elevator = getElevator();
   double aileron = getAileron();
@@ -111,9 +280,9 @@ FGBFI::reinit ()
   double throttle = getThrottle();
   double elevator_trim = getElevatorTrim();
   double flaps = getFlaps();
-  double brake = getBrake();
+  double brake = getBrakes();
   bool apHeadingLock = getAPHeadingLock();
-  double apHeading = getAPHeading();
+  double apHeadingMag = getAPHeadingMag();
   bool apAltitudeLock = getAPAltitudeLock();
   double apAltitude = getAPAltitude();
   const string &targetAirport = getTargetAirport();
@@ -121,9 +290,21 @@ FGBFI::reinit ()
   double gpsLatitude = getGPSTargetLatitude();
   double gpsLongitude = getGPSTargetLongitude();
 
+  setTargetAirport("");
+  cout << "Target airport is " << globals->get_options()->get_airport_id() << endl;
+
   fgReInitSubsystems();
-  // solarSystemRebuild();
+
+                               // FIXME: this is wrong.
+                               // All of these are scheduled events,
+                               // and it should be possible to force
+                               // them all to run once.
+  fgUpdateSunPos();
+  fgUpdateMoonPos();
   cur_light_params.Update();
+  fgUpdateLocalTime();
+  fgUpdateWeatherDatabase();
+  fgRadioSearch();
 
                                // Restore all of the old states.
   setElevator(elevator);
@@ -132,17 +313,17 @@ FGBFI::reinit ()
   setThrottle(throttle);
   setElevatorTrim(elevator_trim);
   setFlaps(flaps);
-  setBrake(brake);
+  setBrakes(brake);
   setAPHeadingLock(apHeadingLock);
-  setAPHeading(apHeading);
+  setAPHeadingMag(apHeadingMag);
   setAPAltitudeLock(apAltitudeLock);
   setAPAltitude(apAltitude);
   setTargetAirport(targetAirport);
   setGPSLock(gpsLock);
-  setGPSTargetLatitude(gpsLatitude);
-  setGPSTargetLongitude(gpsLongitude);
 
   _needReinit = false;
+
+  cout << "BFI: end reinit\n";
 }
 
 
@@ -160,7 +341,27 @@ FGBFI::reinit ()
 int
 FGBFI::getFlightModel ()
 {
-  return current_options.get_flight_model();
+  return globals->get_options()->get_flight_model();
+}
+
+
+/**
+ * Return the current aircraft as a string.
+ */
+const string
+FGBFI::getAircraft ()
+{
+  return globals->get_options()->get_aircraft();
+}
+
+
+/**
+ * Return the current aircraft directory (UIUC) as a string.
+ */
+const string
+FGBFI::getAircraftDir ()
+{
+  return aircraft_dir;
 }
 
 
@@ -172,8 +373,36 @@ FGBFI::getFlightModel ()
 void
 FGBFI::setFlightModel (int model)
 {
-  current_options.set_flight_model(model);
-  needReinit();
+  if (getFlightModel() != model) {
+    globals->get_options()->set_flight_model(model);
+    needReinit();
+  }
+}
+
+
+/**
+ * Set the current aircraft.
+ */
+void
+FGBFI::setAircraft (const string &aircraft)
+{
+  if (getAircraft() != aircraft) {
+    globals->get_options()->set_aircraft(aircraft);
+    needReinit();
+  }
+}
+
+
+/**
+ * Set the current aircraft directory (UIUC).
+ */
+void
+FGBFI::setAircraftDir (const string &dir)
+{
+  if (getAircraftDir() != dir) {
+    aircraft_dir = dir;
+    needReinit();
+  }
 }
 
 
@@ -183,8 +412,7 @@ FGBFI::setFlightModel (int model)
 time_t
 FGBFI::getTimeGMT ()
 {
-                               // FIXME: inefficient
-  return mktime(FGTime::cur_time_params->getGmt());
+  return globals->get_time_params()->get_cur_time();
 }
 
 
@@ -194,17 +422,32 @@ 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);
-  FGTime::cur_time_params->init( cur_fdm_state->get_Longitude(),
-                                cur_fdm_state->get_Latitude() );
-  FGTime::cur_time_params->update( cur_fdm_state->get_Longitude(),
-                                  cur_fdm_state->get_Latitude(),
-                                  cur_fdm_state->get_Altitude()
-                                  * FEET_TO_METER );
-  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();
+  }
+}
+
+
+/**
+ * Return the GMT as a string.
+ */
+const string &
+FGBFI::getGMTString ()
+{
+  static string out;           // FIXME: not thread-safe
+  char buf[16];
+  struct tm * t = globals->get_time_params()->getGmt();
+  sprintf(buf, " %.2d:%.2d:%.2d",
+         t->tm_hour, t->tm_min, t->tm_sec);
+  out = buf;
+  return out;
 }
 
 
@@ -214,7 +457,7 @@ FGBFI::setTimeGMT (time_t time)
 bool
 FGBFI::getHUDVisible ()
 {
-  return current_options.get_hud_status();
+  return globals->get_options()->get_hud_status();
 }
 
 
@@ -224,7 +467,7 @@ FGBFI::getHUDVisible ()
 void
 FGBFI::setHUDVisible (bool visible)
 {
-  current_options.set_hud_status(visible);
+  globals->get_options()->set_hud_status(visible);
 }
 
 
@@ -234,7 +477,7 @@ FGBFI::setHUDVisible (bool visible)
 bool
 FGBFI::getPanelVisible ()
 {
-  return current_options.get_panel_status();
+  return globals->get_options()->get_panel_status();
 }
 
 
@@ -244,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();
   }
 }
 
@@ -272,8 +515,11 @@ FGBFI::getLatitude ()
 void
 FGBFI::setLatitude (double latitude)
 {
-  current_options.set_lat(latitude);
-  needReinit();
+  if (getLatitude() != latitude) {
+    globals->get_options()->set_lat(latitude);
+    current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
+    needReinit();
+  }
 }
 
 
@@ -293,8 +539,11 @@ FGBFI::getLongitude ()
 void
 FGBFI::setLongitude (double longitude)
 {
-  current_options.set_lon(longitude);
-  needReinit();
+  if (getLongitude() != longitude) {
+    globals->get_options()->set_lon(longitude);
+    current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
+    needReinit();
+  }
 }
 
 
@@ -316,7 +565,7 @@ double
 FGBFI::getAGL ()
 {
   return current_aircraft.fdm_state->get_Altitude()
-        - scenery.cur_elev * METER_TO_FEET;
+        - (scenery.cur_elev * METER_TO_FEET);
 }
 
 
@@ -326,8 +575,11 @@ FGBFI::getAGL ()
 void
 FGBFI::setAltitude (double altitude)
 {
-  current_options.set_altitude(altitude * FEET_TO_METER);
-  needReinit();
+  if (getAltitude() != altitude) {
+    fgFDMForceAltitude(getFlightModel(), altitude);
+    globals->get_options()->set_altitude(altitude);
+    current_aircraft.fdm_state->set_Altitude(altitude);
+  }
 }
 
 
@@ -347,14 +599,29 @@ FGBFI::getHeading ()
 }
 
 
+/**
+ * Return the current heading in degrees.
+ */
+double
+FGBFI::getHeadingMag ()
+{
+  return current_aircraft.fdm_state->get_Psi() * RAD_TO_DEG - getMagVar();
+}
+
+
 /**
  * Set the current heading in degrees.
  */
 void
 FGBFI::setHeading (double heading)
 {
-  current_options.set_heading(heading);
-  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();
+  }
 }
 
 
@@ -374,9 +641,13 @@ FGBFI::getPitch ()
 void
 FGBFI::setPitch (double pitch)
 {
-
-  current_options.set_pitch(pitch);
-  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();
+  }
 }
 
 
@@ -396,8 +667,77 @@ FGBFI::getRoll ()
 void
 FGBFI::setRoll (double roll)
 {
-  current_options.set_roll(roll);
-  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();
+  }
+}
+
+
+/**
+ * Return the current engine0 rpm
+ */
+double
+FGBFI::getRPM ()
+{
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_RPM();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * Set the current engine0 rpm
+ */
+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 ) {
+      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();
+  }
 }
 
 
@@ -455,8 +795,12 @@ FGBFI::getSpeedNorth ()
 void
 FGBFI::setSpeedNorth (double speed)
 {
-  current_options.set_uBody(speed);
-  needReinit();
+  if (getSpeedNorth() != speed) {
+    current_aircraft.fdm_state->set_Velocities_Local(speed,
+                                                    getSpeedEast(),
+                                                    getSpeedDown());
+    needReinit();
+  }
 }
 
 
@@ -476,8 +820,12 @@ FGBFI::getSpeedEast ()
 void
 FGBFI::setSpeedEast (double speed)
 {
-  current_options.set_vBody(speed);
-  needReinit();
+  if (getSpeedEast() != speed) {
+    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
+                                                    speed,
+                                                    getSpeedDown());
+    needReinit();
+  }
 }
 
 
@@ -497,8 +845,12 @@ FGBFI::getSpeedDown ()
 void
 FGBFI::setSpeedDown (double speed)
 {
-  current_options.set_wBody(speed);
-  needReinit();
+  if (getSpeedDown() != speed) {
+    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
+                                                    getSpeedEast(),
+                                                    speed);
+    needReinit();
+  }
 }
 
 
@@ -514,7 +866,7 @@ FGBFI::setSpeedDown (double speed)
 double
 FGBFI::getThrottle ()
 {
-                               // FIXME: add throttle selector
+                               // FIXME: add engine selector
   return controls.get_throttle(0);
 }
 
@@ -525,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).
  */
@@ -637,28 +1032,92 @@ FGBFI::setElevatorTrim (double trim)
 
 
 /**
- * Get the brake setting, from 0.0 (none) to 1.0 (full).
+ * Get the highest brake setting, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getBrakes ()
+{
+  double b1 = getCenterBrake();
+  double b2 = getLeftBrake();
+  double b3 = getRightBrake();
+  return (b1 > b2 ? (b1 > b3 ? b1 : b3) : (b2 > b3 ? b2 : b3));
+}
+
+
+/**
+ * Set all brakes, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setBrakes (double brake)
+{
+  setCenterBrake(brake);
+  setLeftBrake(brake);
+  setRightBrake(brake);
+}
+
+
+/**
+ * Get the center brake, from 0.0 (none) to 1.0 (full).
  */
 double
-FGBFI::getBrake ()
+FGBFI::getCenterBrake ()
+{
+  return controls.get_brake(2);
+}
+
+
+/**
+ * Set the center brake, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setCenterBrake (double brake)
+{
+  controls.set_brake(2, brake);
+}
+
+
+/**
+ * Get the left brake, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getLeftBrake ()
 {
-                               // FIXME: add brake selector
   return controls.get_brake(0);
 }
 
 
 /**
- * Set the brake, from 0.0 (none) to 1.0 (full).
+ * Set the left brake, from 0.0 (none) to 1.0 (full).
  */
 void
-FGBFI::setBrake (double brake)
+FGBFI::setLeftBrake (double brake)
 {
-                               // FIXME: clamp?
-                               // FIXME: allow brake selection
   controls.set_brake(0, brake);
 }
 
 
+/**
+ * Get the right brake, from 0.0 (none) to 1.0 (full).
+ */
+double
+FGBFI::getRightBrake ()
+{
+  return controls.get_brake(1);
+}
+
+
+/**
+ * Set the right brake, from 0.0 (none) to 1.0 (full).
+ */
+void
+FGBFI::setRightBrake (double brake)
+{
+  controls.set_brake(1, brake);
+}
+
+
+
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // Autopilot
@@ -724,10 +1183,19 @@ FGBFI::getAPHeadingLock ()
 void
 FGBFI::setAPHeadingLock (bool lock)
 {
-  double heading = getAPHeading();
-  current_autopilot->set_HeadingMode(FGAutopilot::FG_HEADING_LOCK);
-  current_autopilot->set_HeadingEnabled(lock);
-  setAPHeading(heading);
+  if (lock) {
+                               // We need to do this so that
+                               // it's possible to lock onto a
+                               // heading other than the current
+                               // heading.
+    double heading = getAPHeadingMag();
+    current_autopilot->set_HeadingMode(FGAutopilot::FG_HEADING_LOCK);
+    current_autopilot->set_HeadingEnabled(true);
+    setAPHeadingMag(heading);
+  } else if (current_autopilot->get_HeadingMode() ==
+            FGAutopilot::FG_HEADING_LOCK) {
+    current_autopilot->set_HeadingEnabled(false);
+  }
 }
 
 
@@ -751,6 +1219,26 @@ FGBFI::setAPHeading (double heading)
 }
 
 
+/**
+ * Get the autopilot target heading in degrees.
+ */
+double
+FGBFI::getAPHeadingMag ()
+{
+  return current_autopilot->get_TargetHeading() - getMagVar();
+}
+
+
+/**
+ * Set the autopilot target heading in degrees.
+ */
+void
+FGBFI::setAPHeadingMag (double heading)
+{
+  current_autopilot->set_TargetHeading( heading + getMagVar() );
+}
+
+
 /**
  * Return true if the autopilot is locked to NAV1.
  */
@@ -769,8 +1257,13 @@ FGBFI::getAPNAV1Lock ()
 void
 FGBFI::setAPNAV1Lock (bool lock)
 {
-  current_autopilot->set_HeadingMode(FGAutopilot::FG_HEADING_NAV1);
-  current_autopilot->set_HeadingEnabled(lock);
+  if (lock) {
+    current_autopilot->set_HeadingMode(FGAutopilot::FG_HEADING_NAV1);
+    current_autopilot->set_HeadingEnabled(true);
+  } else if (current_autopilot->get_HeadingMode() ==
+            FGAutopilot::FG_HEADING_NAV1) {
+    current_autopilot->set_HeadingEnabled(false);
+  }
 }
 
 
@@ -804,9 +1297,62 @@ FGBFI::getNAV1SelRadial ()
 }
 
 double
-FGBFI::getNAV1Dist ()
+FGBFI::getNAV1DistDME ()
+{
+  return current_radiostack->get_nav1_dme_dist();
+}
+
+bool 
+FGBFI::getNAV1TO ()
+{
+  if (current_radiostack->get_nav1_inrange()) {
+    double heading = current_radiostack->get_nav1_heading();
+    double radial = current_radiostack->get_nav1_radial();
+    double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav1_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset<= 8.0 || offset >= 352.0);
+    } else {
+      double offset =
+       fabs(heading - var - radial);
+      return (offset <= 20.0 || offset >= 340.0);
+    }
+  } else {
+    return false;
+  }
+}
+
+bool
+FGBFI::getNAV1FROM ()
+{
+  if (current_radiostack->get_nav1_inrange()) {
+    double heading = current_radiostack->get_nav1_heading();
+    double radial = current_radiostack->get_nav1_radial();
+    double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav1_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset >= 172.0 && offset<= 188.0);
+    } else {
+      double offset =
+       fabs(heading - var - radial);
+      return (offset >= 160.0 && offset <= 200.0);
+    }
+  } else {
+    return false;
+  }
+}
+
+bool
+FGBFI::getNAV1InRange ()
 {
-  return current_radiostack->get_nav1_dist();
+  return current_radiostack->get_nav1_inrange();
+}
+
+bool
+FGBFI::getNAV1DMEInRange ()
+{
+  return (current_radiostack->get_nav1_inrange() &&
+         current_radiostack->get_nav1_has_dme());
 }
 
 double
@@ -834,9 +1380,63 @@ FGBFI::getNAV2SelRadial ()
 }
 
 double
-FGBFI::getNAV2Dist ()
+FGBFI::getNAV2DistDME ()
+{
+  return current_radiostack->get_nav2_dme_dist();
+}
+
+bool 
+FGBFI::getNAV2TO ()
+{
+  if (current_radiostack->get_nav2_inrange()) {
+    double heading = current_radiostack->get_nav2_heading();
+    double radial = current_radiostack->get_nav2_radial();
+    double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav2_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset<= 8.0 || offset >= 352.0);
+    } else {
+      double offset =
+       fabs(heading - var - radial);
+      return (offset <= 20.0 || offset >= 340.0);
+    }
+  } else {
+    return false;
+  }
+}
+
+bool 
+FGBFI::getNAV2FROM ()
+{
+  if (current_radiostack->get_nav2_inrange()) {
+    double heading = current_radiostack->get_nav2_heading();
+    double radial = current_radiostack->get_nav2_radial();
+    double var = FGBFI::getMagVar();
+    if (current_radiostack->get_nav2_loc()) {
+      double offset = fabs(heading - radial);
+      return (offset >= 172.0 && offset<= 188.0);
+    } else {
+      double offset =
+       fabs(heading - var - radial);
+      return (offset >= 160.0 && offset <= 200.0);
+    }
+  } else {
+    return false;
+  }
+}
+
+
+bool
+FGBFI::getNAV2InRange ()
 {
-  return current_radiostack->get_nav1_dist();
+  return current_radiostack->get_nav2_inrange();
+}
+
+bool
+FGBFI::getNAV2DMEInRange ()
+{
+  return (current_radiostack->get_nav2_inrange() &&
+         current_radiostack->get_nav2_has_dme());
 }
 
 double
@@ -924,10 +1524,9 @@ FGBFI::setADFRotation (double rot)
 bool
 FGBFI::getGPSLock ()
 {
-    return ( current_autopilot->get_HeadingEnabled() &&
-            ( current_autopilot->get_HeadingMode() == 
-              FGAutopilot::FG_HEADING_WAYPOINT )
-          );
+  return (current_autopilot->get_HeadingEnabled() &&
+         (current_autopilot->get_HeadingMode() ==
+          FGAutopilot::FG_HEADING_WAYPOINT ));
 }
 
 
@@ -937,18 +1536,27 @@ FGBFI::getGPSLock ()
 void
 FGBFI::setGPSLock (bool lock)
 {
-    current_autopilot->set_HeadingEnabled( true );
-    current_autopilot->set_HeadingMode( FGAutopilot::FG_HEADING_WAYPOINT );
+  if (lock) {
+    current_autopilot->set_HeadingMode(FGAutopilot::FG_HEADING_WAYPOINT);
+    current_autopilot->set_HeadingEnabled(true);
+  } else if (current_autopilot->get_HeadingMode() ==
+            FGAutopilot::FG_HEADING_WAYPOINT) {
+    current_autopilot->set_HeadingEnabled(false);
+  }
 }
 
 
 /**
  * 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;
 }
 
 
@@ -958,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);
 }
 
 
@@ -972,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).
  */
@@ -991,7 +1590,7 @@ FGBFI::getGPSTargetLongitude ()
   return current_autopilot->get_TargetLongitude();
 }
 
-
+#if 0
 /**
  * Set the GPS target longitude in degrees (negative for west).
  */
@@ -1000,6 +1599,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 {
   current_autopilot->set_TargetLongitude( longitude );
 }
+#endif
 
 
 \f
@@ -1022,6 +1622,26 @@ FGBFI::getVisibility ()
 }
 
 
+/**
+ * Check whether clouds are enabled.
+ */
+bool
+FGBFI::getClouds ()
+{
+  return globals->get_options()->get_clouds();
+}
+
+
+/**
+ * Check the height of the clouds ASL (units?).
+ */
+double
+FGBFI::getCloudsASL ()
+{
+  return globals->get_options()->get_clouds_asl();
+}
+
+
 /**
  * Set the current visibility (units??).
  */
@@ -1036,6 +1656,33 @@ FGBFI::setVisibility (double visibility)
 }
 
 
+/**
+ * Switch clouds on or off.
+ */
+void
+FGBFI::setClouds (bool clouds)
+{
+  if (getClouds() != clouds) {
+    cout << "Set clouds to " << clouds << endl;
+    globals->get_options()->set_clouds(clouds);
+    needReinit();
+  }
+}
+
+
+/**
+ * Set the cloud height.
+ */
+void
+FGBFI::setCloudsASL (double cloudsASL)
+{
+  if (getCloudsASL() != cloudsASL) {
+    globals->get_options()->set_clouds_asl(cloudsASL);
+    needReinit();
+  }
+}
+
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // Time
@@ -1047,7 +1694,7 @@ FGBFI::setVisibility (double visibility)
 double
 FGBFI::getMagVar ()
 {
-  return FGTime::cur_time_params->getMagVar() * RAD_TO_DEG;
+  return globals->get_mag()->get_magvar() * RAD_TO_DEG;
 }
 
 
@@ -1057,7 +1704,7 @@ FGBFI::getMagVar ()
 double
 FGBFI::getMagDip ()
 {
-  return FGTime::cur_time_params->getMagDip() * RAD_TO_DEG;
+  return globals->get_mag()->get_magdip() * RAD_TO_DEG;
 }