X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbfi.cxx;h=1137c0359c2bfe4d174d4ebf0b846ae89d4f9785;hb=a6e0a696376ba2d426eb534bb83ec42038a501e7;hp=8ab40e4e5db4aad28612b68719976cffc02f0af0;hpb=d1e4a4bc6f6a18a1f8c646e9eb6fbd7e2c6f98ec;p=flightgear.git

diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx
index 8ab40e4e5..1137c0359 100644
--- a/src/Main/bfi.cxx
+++ b/src/Main/bfi.cxx
@@ -4,6 +4,8 @@
 //
 // Copyright (C) 2000  David Megginson - david@megginson.com
 //
+// THIS CLASS IS DEPRECATED; USE THE PROPERTY MANAGER INSTEAD.
+//
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
 // published by the Free Software Foundation; either version 2 of the
@@ -20,23 +22,14 @@
 //
 // $Id$
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#if defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#else
-#  include <iostream>
-#endif
+#include "fgfs.hxx"
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
-#include <simgear/math/fg_types.hxx>
+#include <simgear/math/sg_types.hxx>
 #include <simgear/misc/props.hxx>
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <FDM/UIUCModel/uiuc_aircraftdir.h>
@@ -48,17 +41,18 @@
 #include <Time/sunpos.hxx>
 #include <Time/tmp.hxx>
 #include <Cockpit/radiostack.hxx>
+#include <Cockpit/panel.hxx>
 #ifndef FG_OLD_WEATHER
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
 #  include <Weather/weather.hxx>
 #endif
 
-#include "options.hxx"
-#include "save.hxx"
+#include "globals.hxx"
 #include "fg_init.hxx"
+#include "fg_props.hxx"
 
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
 
 
 #include "bfi.hxx"
@@ -69,198 +63,35 @@ FG_USING_NAMESPACE(std);
 // Static variables.
 ////////////////////////////////////////////////////////////////////////
 
-bool FGBFI::_needReinit = false;
-
-
-
-////////////////////////////////////////////////////////////////////////
-// Local functions
-////////////////////////////////////////////////////////////////////////
-
+				// Yech -- not thread-safe, etc. etc.
+static bool _needReinit = false;
+static string _temp;
 
-/**
- * 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 ()
+static inline void needReinit ()
 {
-  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.tieBool("/sim/hud/visibility",
-			     getHUDVisible, setHUDVisible);
-  current_properties.tieBool("/sim/panel/visibility",
-			     getPanelVisible, setPanelVisible);
-
-				// Position
-  current_properties.tieDouble("/position/latitude",
-				getLatitude, setLatitude);
-  current_properties.tieDouble("/position/longitude",
-			       getLongitude, setLongitude);
-  current_properties.tieDouble("/position/altitude",
-			       getAltitude, setAltitude);
-  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);
-
-				// 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/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/brake",
-			       getBrake, setBrake);
-
-				// 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-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/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/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);
-
-  FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
-}
-
-
-/**
- * Reinitialize FGFS if required.
- *
- * Some changes (especially those in aircraft position) require that
- * FGFS be reinitialized afterwards.  Rather than reinitialize after
- * every change, the setter methods simply set a flag so that there
- * can be a single reinit at the end of the frame.
- */
-void
-FGBFI::update ()
-{
-  if (_needReinit) {
-    reinit();
-  }
+  _needReinit = true;
 }
 
 
 /**
  * Reinitialize FGFS to use the new BFI settings.
  */
-void
-FGBFI::reinit ()
+static inline void
+reinit ()
 {
 				// Save the state of everything
 				// that's going to get clobbered
 				// when we reinit the subsystems.
 
-  cout << "BFI: start reinit\n";
-
-  setHeading(getHeading());
-  setPitch(getPitch());
-  setRoll(getRoll());
-  setSpeedNorth(getSpeedNorth());
-  setSpeedEast(getSpeedEast());
-  setSpeedDown(getSpeedDown());
-  setLatitude(getLatitude());
-  setLongitude(getLongitude());
-  setAltitude(getAltitude());
+  SG_LOG(SG_GENERAL, SG_INFO, "Starting BFI reinit");
 
 				// TODO: add more AP stuff
-  double elevator = getElevator();
-  double aileron = getAileron();
-  double rudder = getRudder();
-  double throttle = getThrottle();
-  double elevator_trim = getElevatorTrim();
-  double flaps = getFlaps();
-  double brake = getBrake();
-  bool apHeadingLock = getAPHeadingLock();
-  double apHeadingMag = getAPHeadingMag();
-  bool apAltitudeLock = getAPAltitudeLock();
-  double apAltitude = getAPAltitude();
-  const string &targetAirport = getTargetAirport();
-  bool gpsLock = getGPSLock();
-  double gpsLatitude = getGPSTargetLatitude();
-  double gpsLongitude = getGPSTargetLongitude();
-
-  setTargetAirport("");
-  cout << "Target airport is " << current_options.get_airport_id() << endl;
+  bool apHeadingLock = FGBFI::getAPHeadingLock();
+  bool apAltitudeLock = FGBFI::getAPAltitudeLock();
+  double apAltitude = FGBFI::getAPAltitude();
+  bool gpsLock = FGBFI::getGPSLock();
+  // double gpsLatitude = FGBFI::getGPSTargetLatitude();
+  // double gpsLongitude = FGBFI::getGPSTargetLongitude();
 
   fgReInitSubsystems();
 
@@ -272,64 +103,167 @@ FGBFI::reinit ()
   fgUpdateMoonPos();
   cur_light_params.Update();
   fgUpdateLocalTime();
+#ifndef FG_OLD_WEATHER
   fgUpdateWeatherDatabase();
-  fgRadioSearch();
+#endif
+  current_radiostack->search();
 
 				// Restore all of the old states.
-  setElevator(elevator);
-  setAileron(aileron);
-  setRudder(rudder);
-  setThrottle(throttle);
-  setElevatorTrim(elevator_trim);
-  setFlaps(flaps);
-  setBrake(brake);
-  setAPHeadingLock(apHeadingLock);
-  setAPHeadingMag(apHeadingMag);
-  setAPAltitudeLock(apAltitudeLock);
-  setAPAltitude(apAltitude);
-  setTargetAirport(targetAirport);
-  setGPSLock(gpsLock);
-  setGPSTargetLatitude(gpsLatitude);
-  setGPSTargetLongitude(gpsLongitude);
+  FGBFI::setAPHeadingLock(apHeadingLock);
+  FGBFI::setAPAltitudeLock(apAltitudeLock);
+  FGBFI::setAPAltitude(apAltitude);
+  FGBFI::setGPSLock(gpsLock);
 
   _needReinit = false;
 
-  cout << "BFI: end reinit\n";
+  SG_LOG(SG_GENERAL, SG_INFO, "Ending BFI reinit");
+}
+
+// BEGIN: kludge
+// Allow the view to be set from two axes (i.e. a joystick hat)
+// This needs to be in FGViewer itself, somehow.
+static double axisLong = 0.0;
+static double axisLat = 0.0;
+
+static inline void
+_set_view_from_axes ()
+{
+				// Take no action when hat is centered
+  if (axisLong == 0 && axisLat == 0)
+    return;
+
+  double viewDir = 0;
+
+  if (axisLong < 0) {		// Longitudinal axis forward
+    if (axisLat < 0)
+      viewDir = 45;
+    else if (axisLat > 0)
+      viewDir = 315;
+    else
+      viewDir = 0;
+  } else if (axisLong > 0) {	// Longitudinal axis backward
+    if (axisLat < 0)
+      viewDir = 135;
+    else if (axisLat > 0)
+      viewDir = 225;
+    else
+      viewDir = 180;
+  } else {			// Longitudinal axis neutral
+    if (axisLat < 0)
+      viewDir = 90;
+    else
+      viewDir = 270;
+  }
+
+  globals->get_current_view()->set_goal_view_offset(viewDir*SGD_DEGREES_TO_RADIANS);
+//   globals->get_current_view()->set_view_offset(viewDir*SGD_DEGREES_TO_RADIANS);
 }
 
+// END: kludge
+
 
 
 ////////////////////////////////////////////////////////////////////////
-// Simulation.
+// Local functions
 ////////////////////////////////////////////////////////////////////////
 
 
 /**
- * Return the flight model as an integer.
+ * Initialize the BFI by binding its functions to properties.
  *
- * TODO: use a string instead.
+ * TODO: perhaps these should migrate into the individual modules
+ * (i.e. they should register themselves).
  */
-int
-FGBFI::getFlightModel ()
+void
+FGBFI::init ()
 {
-  return current_options.get_flight_model();
+  SG_LOG(SG_GENERAL, SG_INFO, "Starting BFI init");
+
+				// Simulation
+  fgTie("/sim/aircraft-dir", getAircraftDir, setAircraftDir);
+  fgTie("/sim/view/offset", getViewOffset, setViewOffset);
+  fgTie("/sim/view/goal-offset", getGoalViewOffset, setGoalViewOffset);
+  fgTie("/sim/time/gmt", getDateString, setDateString);
+  fgTie("/sim/time/gmt-string", getGMTString);
+
+				// Orientation
+  fgTie("/orientation/heading-magnetic", getHeadingMag);
+
+				// Engine
+  fgTie("/engines/engine0/rpm", getRPM);
+  fgTie("/engines/engine0/egt", getEGT);
+  fgTie("/engines/engine0/cht", getCHT);
+  fgTie("/engines/engine0/mp", getMP);
+  fgTie("/engines/engine0/fuel-flow", getFuelFlow);
+
+  //consumables
+  fgTie("/consumables/fuel/tank1/level", getTank1Fuel, setTank1Fuel, false);
+  fgTie("/consumables/fuel/tank2/level", getTank2Fuel, setTank2Fuel, false);
+
+				// Autopilot
+  fgTie("/autopilot/locks/altitude", getAPAltitudeLock, setAPAltitudeLock);
+  fgTie("/autopilot/settings/altitude", getAPAltitude, setAPAltitude);
+  fgTie("/autopilot/locks/glide-slope", getAPGSLock, setAPGSLock);
+  fgTie("/autopilot/settings/climb-rate", getAPClimb, setAPClimb, false);
+  fgTie("/autopilot/locks/heading", getAPHeadingLock, setAPHeadingLock);
+  fgTie("/autopilot/settings/heading-bug", getAPHeadingBug, setAPHeadingBug,
+	false);
+  fgTie("/autopilot/locks/wing-leveler", getAPWingLeveler, setAPWingLeveler);
+  fgTie("/autopilot/locks/nav1", getAPNAV1Lock, setAPNAV1Lock);
+  fgTie("/autopilot/locks/auto-throttle",
+	getAPAutoThrottleLock, setAPAutoThrottleLock);
+  fgTie("/autopilot/control-overrides/rudder",
+	getAPRudderControl, setAPRudderControl);
+  fgTie("/autopilot/control-overrides/elevator",
+	getAPElevatorControl, setAPElevatorControl);
+  fgTie("/autopilot/control-overrides/throttle",
+	getAPThrottleControl, setAPThrottleControl);
+
+				// Weather
+  fgTie("/environment/visibility", getVisibility, setVisibility);
+  fgTie("/environment/wind-north", getWindNorth, setWindNorth);
+  fgTie("/environment/wind-east", getWindEast, setWindEast);
+  fgTie("/environment/wind-down", getWindDown, setWindDown);
+
+				// View
+  fgTie("/sim/field-of-view", getFOV, setFOV);
+  fgTie("/sim/view/axes/long", (double(*)())0, setViewAxisLong);
+  fgTie("/sim/view/axes/lat", (double(*)())0, setViewAxisLat);
+
+  _needReinit = false;
+
+  SG_LOG(SG_GENERAL, SG_INFO, "Ending BFI init");
 }
 
 
 /**
- * Return the current aircraft as a string.
+ * Reinitialize FGFS if required.
+ *
+ * Some changes (especially those in aircraft position) require that
+ * FGFS be reinitialized afterwards.  Rather than reinitialize after
+ * every change, the setter methods simply set a flag so that there
+ * can be a single reinit at the end of the frame.
  */
-const string
-FGBFI::getAircraft ()
+void
+FGBFI::update ()
 {
-  return current_options.get_aircraft();
+  _set_view_from_axes();
+  if (_needReinit) {
+    reinit();
+  }
 }
 
 
+
+////////////////////////////////////////////////////////////////////////
+// Simulation.
+////////////////////////////////////////////////////////////////////////
+
+
 /**
  * Return the current aircraft directory (UIUC) as a string.
  */
-const string
+string 
 FGBFI::getAircraftDir ()
 {
   return aircraft_dir;
@@ -337,112 +271,128 @@ FGBFI::getAircraftDir ()
 
 
 /**
- * Set the flight model as an integer.
- *
- * TODO: use a string instead.
+ * Set the current aircraft directory (UIUC).
  */
 void
-FGBFI::setFlightModel (int model)
+FGBFI::setAircraftDir (string dir)
 {
-  current_options.set_flight_model(model);
-  needReinit();
+  if (getAircraftDir() != dir) {
+    aircraft_dir = dir;
+    needReinit();
+  }
 }
 
 
 /**
- * Set the current aircraft.
+ * Get the current view offset in degrees.
  */
-void
-FGBFI::setAircraft (const string &aircraft)
+double
+FGBFI::getViewOffset ()
 {
-  current_options.set_aircraft(aircraft);
-  needReinit();
+  return (globals->get_current_view()
+	  ->get_view_offset() * SGD_RADIANS_TO_DEGREES);
 }
 
-
-/**
- * Set the current aircraft directory (UIUC).
- */
 void
-FGBFI::setAircraftDir (const string &dir)
+FGBFI::setViewOffset (double offset)
 {
-  aircraft_dir = dir;
-  needReinit();
+  globals->get_current_view()->set_view_offset(offset * SGD_DEGREES_TO_RADIANS);
 }
 
-
-/**
- * Return the current Zulu time.
- */
-time_t
-FGBFI::getTimeGMT ()
+double
+FGBFI::getGoalViewOffset ()
 {
-  return FGTime::cur_time_params->get_cur_time();
+  return (globals->get_current_view()
+	  ->get_goal_view_offset() * SGD_RADIANS_TO_DEGREES);
 }
 
-
-/**
- * Set the current Zulu time.
- */
 void
-FGBFI::setTimeGMT (time_t time)
+FGBFI::setGoalViewOffset (double offset)
 {
-				// FIXME: need to update lighting
-				// and solar system
-  current_options.set_time_offset(time);
-  current_options.set_time_offset_type(SG_TIME_GMT_ABSOLUTE);
-  FGTime::cur_time_params->init( cur_fdm_state->get_Longitude(),
-				 cur_fdm_state->get_Latitude(),
-				 current_options.get_fg_root(),
-				 current_options.get_time_offset(),
-				 current_options.get_time_offset_type() );
-  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_current_view()
+    ->set_goal_view_offset(offset * SGD_DEGREES_TO_RADIANS);
 }
 
 
+
+
 /**
- * Return true if the HUD is visible.
+ * Return the current Zulu time.
  */
-bool
-FGBFI::getHUDVisible ()
+string 
+FGBFI::getDateString ()
 {
-  return current_options.get_hud_status();
+  string out;
+  char buf[64];
+  struct tm * t = globals->get_time_params()->getGmt();
+  sprintf(buf, "%.4d-%.2d-%.2dT%.2d:%.2d:%.2d",
+	  t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+	  t->tm_hour, t->tm_min, t->tm_sec);
+  out = buf;
+  return out;
 }
 
 
 /**
- * Ensure that the HUD is visible or hidden.
+ * Set the current Zulu time.
  */
 void
-FGBFI::setHUDVisible (bool visible)
-{
-  current_options.set_hud_status(visible);
-}
+FGBFI::setDateString (string date_string)
+// FGBFI::setTimeGMT (time_t time)
+{
+  SGTime * st = globals->get_time_params();
+  struct tm * current_time = st->getGmt();
+  struct tm new_time;
+
+				// Scan for basic ISO format
+				// YYYY-MM-DDTHH:MM:SS
+  int ret = sscanf(date_string.c_str(), "%d-%d-%dT%d:%d:%d",
+		   &(new_time.tm_year), &(new_time.tm_mon),
+		   &(new_time.tm_mday), &(new_time.tm_hour),
+		   &(new_time.tm_min), &(new_time.tm_sec));
+
+				// Be pretty picky about this, so
+				// that strange things don't happen
+				// if the save file has been edited
+				// by hand.
+  if (ret != 6) {
+    SG_LOG(SG_INPUT, SG_ALERT, "Date/time string " << date_string
+	   << " not in YYYY-MM-DDTHH:MM:SS format; skipped");
+    return;
+  }
 
+				// OK, it looks like we got six
+				// values, one way or another.
+  new_time.tm_year -= 1900;
+  new_time.tm_mon -= 1;
 
-/**
- * Return true if the 2D panel is visible.
- */
-bool
-FGBFI::getPanelVisible ()
-{
-  return current_options.get_panel_status();
+				// Now, tell flight gear to use
+				// the new time.  This was far
+				// too difficult, by the way.
+  long int warp =
+    mktime(&new_time) - mktime(current_time) + globals->get_warp();
+  double lon = current_aircraft.fdm_state->get_Longitude();
+  double lat = current_aircraft.fdm_state->get_Latitude();
+  // double alt = current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER;
+  globals->set_warp(warp);
+  st->update(lon, lat, warp);
+  fgUpdateSkyAndLightingParams();
 }
 
 
 /**
- * Ensure that the 2D panel is visible or hidden.
+ * Return the GMT as a string.
  */
-void
-FGBFI::setPanelVisible (bool visible)
+string 
+FGBFI::getGMTString ()
 {
-  if (current_options.get_panel_status() != visible) {
-    current_options.toggle_panel();
-  }
+  string out;
+  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;
 }
 
 
@@ -458,7 +408,7 @@ FGBFI::setPanelVisible (bool visible)
 double
 FGBFI::getLatitude ()
 {
-  return current_aircraft.fdm_state->get_Latitude() * RAD_TO_DEG;
+  return current_aircraft.fdm_state->get_Latitude() * SGD_RADIANS_TO_DEGREES;
 }
 
 
@@ -468,9 +418,7 @@ FGBFI::getLatitude ()
 void
 FGBFI::setLatitude (double latitude)
 {
-  current_options.set_lat(latitude);
-  current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
-  needReinit();
+  current_aircraft.fdm_state->set_Latitude(latitude * SGD_DEGREES_TO_RADIANS);
 }
 
 
@@ -480,7 +428,7 @@ FGBFI::setLatitude (double latitude)
 double
 FGBFI::getLongitude ()
 {
-  return current_aircraft.fdm_state->get_Longitude() * RAD_TO_DEG;
+  return current_aircraft.fdm_state->get_Longitude() * SGD_RADIANS_TO_DEGREES;
 }
 
 
@@ -490,9 +438,7 @@ FGBFI::getLongitude ()
 void
 FGBFI::setLongitude (double longitude)
 {
-  current_options.set_lon(longitude);
-  current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
-  needReinit();
+  current_aircraft.fdm_state->set_Longitude(longitude * SGD_DEGREES_TO_RADIANS);
 }
 
 
@@ -514,7 +460,7 @@ double
 FGBFI::getAGL ()
 {
   return current_aircraft.fdm_state->get_Altitude()
-	 - scenery.cur_elev * METER_TO_FEET;
+	 - (scenery.cur_elev * SG_METER_TO_FEET);
 }
 
 
@@ -524,10 +470,7 @@ 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();
+  current_aircraft.fdm_state->set_Altitude(altitude);
 }
 
 
@@ -543,7 +486,7 @@ FGBFI::setAltitude (double altitude)
 double
 FGBFI::getHeading ()
 {
-  return current_aircraft.fdm_state->get_Psi() * RAD_TO_DEG;
+  return current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES;
 }
 
 
@@ -553,7 +496,7 @@ FGBFI::getHeading ()
 double
 FGBFI::getHeadingMag ()
 {
-  return current_aircraft.fdm_state->get_Psi() * RAD_TO_DEG - getMagVar();
+  return current_aircraft.fdm_state->get_Psi() * SGD_RADIANS_TO_DEGREES - getMagVar();
 }
 
 
@@ -563,11 +506,9 @@ 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();
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(fdm->get_Phi(), fdm->get_Theta(),
+			heading * SGD_DEGREES_TO_RADIANS);
 }
 
 
@@ -577,7 +518,7 @@ FGBFI::setHeading (double heading)
 double
 FGBFI::getPitch ()
 {
-  return current_aircraft.fdm_state->get_Theta() * RAD_TO_DEG;
+  return current_aircraft.fdm_state->get_Theta() * SGD_RADIANS_TO_DEGREES;
 }
 
 
@@ -587,12 +528,8 @@ 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();
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(fdm->get_Phi(), pitch * SGD_DEGREES_TO_RADIANS, fdm->get_Psi());
 }
 
 
@@ -602,7 +539,7 @@ FGBFI::setPitch (double pitch)
 double
 FGBFI::getRoll ()
 {
-  return current_aircraft.fdm_state->get_Phi() * RAD_TO_DEG;
+  return current_aircraft.fdm_state->get_Phi() * SGD_RADIANS_TO_DEGREES;
 }
 
 
@@ -612,305 +549,303 @@ 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();
+  FGInterface * fdm = current_aircraft.fdm_state;
+  fdm->set_Euler_Angles(roll * SGD_DEGREES_TO_RADIANS, fdm->get_Theta(), fdm->get_Psi());
 }
 
 
-
-////////////////////////////////////////////////////////////////////////
-// Velocities
-////////////////////////////////////////////////////////////////////////
-
-
 /**
- * Return the current airspeed in knots.
+ * Return the current engine0 rpm
  */
 double
-FGBFI::getAirspeed ()
+FGBFI::getRPM ()
 {
-				// FIXME: should we add speed-up?
-  return current_aircraft.fdm_state->get_V_calibrated_kts();
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_RPM();
+  } else {
+      return 0.0;
+  }
 }
 
 
 /**
- * Return the current sideslip (FIXME: units unknown).
+ * Set the current engine0 rpm
  */
-double
-FGBFI::getSideSlip ()
+void
+FGBFI::setRPM (double rpm)
 {
-  return current_aircraft.fdm_state->get_Beta();
+    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 climb rate in feet/minute
+ * Return the current engine0 EGT.
  */
 double
-FGBFI::getVerticalSpeed ()
+FGBFI::getEGT ()
 {
-				// What about meters?
-  return current_aircraft.fdm_state->get_Climb_Rate() * 60.0;
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+  } else {
+      return 0.0;
+  }
 }
 
 
 /**
- * Get the current north velocity (units??).
+ * Return the current engine0 CHT.
  */
 double
-FGBFI::getSpeedNorth ()
+FGBFI::getCHT ()
 {
-  return current_aircraft.fdm_state->get_V_north();
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_CHT();
+  } else {
+      return 0.0;
+  }
 }
 
 
 /**
- * Set the current north velocity (units??).
+ * Return the current engine0 Manifold Pressure.
  */
-void
-FGBFI::setSpeedNorth (double speed)
+double
+FGBFI::getMP ()
 {
-  current_options.set_uBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(speed,
-						   getSpeedEast(),
-						   getSpeedDown());
-  needReinit();
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_Manifold_Pressure();
+  } else {
+      return 0.0;
+  }
 }
 
-
 /**
- * Get the current east velocity (units??).
+ * Return the current engine0 fuel flow
  */
 double
-FGBFI::getSpeedEast ()
+FGBFI::getFuelFlow ()
 {
-  return current_aircraft.fdm_state->get_V_east();
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_Fuel_Flow();
+  } else {
+      return 0.0;
+  }
 }
 
+////////////////////////////////////////////////////////////////////////
+// Consumables
+////////////////////////////////////////////////////////////////////////
 
 /**
- * Set the current east velocity (units??).
+ * Return the fuel level in tank 1
  */
-void
-FGBFI::setSpeedEast (double speed)
+double
+FGBFI::getTank1Fuel ()
 {
-  current_options.set_vBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-						   speed,
-						   getSpeedDown());
-  needReinit();
+  return current_aircraft.fdm_state->get_Tank1Fuel();
 }
 
+void
+FGBFI::setTank1Fuel ( double gals )
+{
+  current_aircraft.fdm_state->set_Tank1Fuel( gals );
+}
 
 /**
- * Get the current down velocity (units??).
+ * Return the fuel level in tank 2
  */
 double
-FGBFI::getSpeedDown ()
+FGBFI::getTank2Fuel ()
 {
-  return current_aircraft.fdm_state->get_V_down();
+  return current_aircraft.fdm_state->get_Tank2Fuel();
 }
 
-
-/**
- * Set the current down velocity (units??).
- */
 void
-FGBFI::setSpeedDown (double speed)
+FGBFI::setTank2Fuel ( double gals )
 {
-  current_options.set_wBody(speed);
-  current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-						   getSpeedEast(),
-						   speed);
-  needReinit();
+  current_aircraft.fdm_state->set_Tank2Fuel( gals );
 }
 
-
 
 ////////////////////////////////////////////////////////////////////////
-// Controls
+// Velocities
 ////////////////////////////////////////////////////////////////////////
 
 
 /**
- * Get the throttle setting, from 0.0 (none) to 1.0 (full).
+ * Return the current airspeed in knots.
  */
 double
-FGBFI::getThrottle ()
+FGBFI::getAirspeed ()
 {
-				// FIXME: add throttle selector
-  return controls.get_throttle(0);
+				// FIXME: should we add speed-up?
+  return current_aircraft.fdm_state->get_V_calibrated_kts();
 }
 
 
 /**
- * Set the throttle, from 0.0 (none) to 1.0 (full).
+ * Set the calibrated airspeed in knots.
  */
 void
-FGBFI::setThrottle (double throttle)
+FGBFI::setAirspeed (double speed)
 {
-				// FIXME: allow throttle selection
-				// FIXME: clamp?
-  controls.set_throttle(0, throttle);
+  current_aircraft.fdm_state->set_V_calibrated_kts(speed);
 }
 
 
 /**
- * Get the flaps setting, from 0.0 (none) to 1.0 (full).
+ * Return the current sideslip (FIXME: units unknown).
  */
 double
-FGBFI::getFlaps ()
+FGBFI::getSideSlip ()
 {
-  return controls.get_flaps();
+  return current_aircraft.fdm_state->get_Beta();
 }
 
 
 /**
- * Set the flaps, from 0.0 (none) to 1.0 (full).
+ * Return the current climb rate in feet/minute
  */
-void
-FGBFI::setFlaps (double flaps)
+double
+FGBFI::getVerticalSpeed ()
 {
-				// FIXME: clamp?
-  controls.set_flaps(flaps);
+				// What about meters?
+  return current_aircraft.fdm_state->get_Climb_Rate() * 60.0;
 }
 
 
 /**
- * Get the aileron, from -1.0 (left) to 1.0 (right).
+ * Get the current north velocity (units??).
  */
 double
-FGBFI::getAileron ()
+FGBFI::getSpeedNorth ()
 {
-  return controls.get_aileron();
+  return current_aircraft.fdm_state->get_V_north();
 }
 
 
-/**
- * Set the aileron, from -1.0 (left) to 1.0 (right).
- */
-void
-FGBFI::setAileron (double aileron)
-{
-				// FIXME: clamp?
-  controls.set_aileron(aileron);
-}
+// /**
+//  * Set the current north velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedNorth (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(speed, fdm->get_V_east(), fdm->get_V_down());
+// }
 
 
 /**
- * Get the rudder setting, from -1.0 (left) to 1.0 (right).
+ * Get the current east velocity (units??).
  */
 double
-FGBFI::getRudder ()
+FGBFI::getSpeedEast ()
 {
-  return controls.get_rudder();
+  return current_aircraft.fdm_state->get_V_east();
 }
 
 
-/**
- * Set the rudder, from -1.0 (left) to 1.0 (right).
- */
-void
-FGBFI::setRudder (double rudder)
-{
-				// FIXME: clamp?
-  controls.set_rudder(rudder);
-}
+// /**
+//  * Set the current east velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedEast (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(fdm->get_V_north(), speed, fdm->get_V_down());
+// }
 
 
 /**
- * Get the elevator setting, from -1.0 (down) to 1.0 (up).
+ * Get the current down velocity (units??).
  */
 double
-FGBFI::getElevator ()
+FGBFI::getSpeedDown ()
 {
-  return controls.get_elevator();
+  return current_aircraft.fdm_state->get_V_down();
 }
 
 
-/**
- * Set the elevator, from -1.0 (down) to 1.0 (up).
- */
-void
-FGBFI::setElevator (double elevator)
-{
-				// FIXME: clamp?
-  controls.set_elevator(elevator);
-}
+// /**
+//  * Set the current down velocity (units??).
+//  */
+// void
+// FGBFI::setSpeedDown (double speed)
+// {
+//   FGInterface * fdm = current_aircraft.fdm_state;
+// //   fdm->set_Velocities_Local(fdm->get_V_north(), fdm->get_V_east(), speed);
+// }
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Autopilot
+////////////////////////////////////////////////////////////////////////
 
 
 /**
- * Get the elevator trim, from -1.0 (down) to 1.0 (up).
+ * Get the autopilot altitude lock (true=on).
  */
-double
-FGBFI::getElevatorTrim ()
+bool
+FGBFI::getAPAltitudeLock ()
 {
-  return controls.get_elevator_trim();
+    return current_autopilot->get_AltitudeEnabled();
 }
 
 
 /**
- * Set the elevator trim, from -1.0 (down) to 1.0 (up).
+ * Set the autopilot altitude lock (true=on).
  */
 void
-FGBFI::setElevatorTrim (double trim)
+FGBFI::setAPAltitudeLock (bool lock)
 {
-				// FIXME: clamp?
-  controls.set_elevator_trim(trim);
+  current_autopilot->set_AltitudeMode(FGAutopilot::FG_ALTITUDE_LOCK);
+  current_autopilot->set_AltitudeEnabled(lock);
 }
 
 
 /**
- * Get the brake setting, from 0.0 (none) to 1.0 (full).
+ * Get the autopilot altitude lock (true=on).
  */
-double
-FGBFI::getBrake ()
+bool
+FGBFI::getAPGSLock ()
 {
-				// FIXME: add brake selector
-  return controls.get_brake(0);
+    return current_autopilot->get_AltitudeEnabled();
 }
 
 
 /**
- * Set the brake, from 0.0 (none) to 1.0 (full).
+ * Set the autopilot altitude lock (true=on).
  */
 void
-FGBFI::setBrake (double brake)
+FGBFI::setAPGSLock (bool lock)
 {
-				// FIXME: clamp?
-				// FIXME: allow brake selection
-  controls.set_brake(0, brake);
+  current_autopilot->set_AltitudeMode(FGAutopilot::FG_ALTITUDE_GS1);
+  current_autopilot->set_AltitudeEnabled(lock);
 }
 
 
-
-////////////////////////////////////////////////////////////////////////
-// Autopilot
-////////////////////////////////////////////////////////////////////////
-
-
 /**
- * Get the autopilot altitude lock (true=on).
+ * Get the autopilot target altitude in feet.
  */
-bool
-FGBFI::getAPAltitudeLock ()
+double
+FGBFI::getAPAltitude ()
 {
-    return current_autopilot->get_AltitudeEnabled();
+  return current_autopilot->get_TargetAltitude() * SG_METER_TO_FEET;
 }
 
 
 /**
- * Set the autopilot altitude lock (true=on).
+ * Set the autopilot target altitude in feet.
  */
 void
-FGBFI::setAPAltitudeLock (bool lock)
+FGBFI::setAPAltitude (double altitude)
 {
-  current_autopilot->set_AltitudeMode(FGAutopilot::FG_ALTITUDE_LOCK);
-  current_autopilot->set_AltitudeEnabled(lock);
+    current_autopilot->set_TargetAltitude( altitude * SG_FEET_TO_METER );
 }
 
 
@@ -918,9 +853,9 @@ FGBFI::setAPAltitudeLock (bool lock)
  * Get the autopilot target altitude in feet.
  */
 double
-FGBFI::getAPAltitude ()
+FGBFI::getAPClimb ()
 {
-  return current_autopilot->get_TargetAltitude() * METER_TO_FEET;
+  return current_autopilot->get_TargetClimbRate() * SG_METER_TO_FEET;
 }
 
 
@@ -928,9 +863,9 @@ FGBFI::getAPAltitude ()
  * Set the autopilot target altitude in feet.
  */
 void
-FGBFI::setAPAltitude (double altitude)
+FGBFI::setAPClimb (double rate)
 {
-    current_autopilot->set_TargetAltitude( altitude );
+    current_autopilot->set_TargetClimbRate( rate * SG_FEET_TO_METER );
 }
 
 
@@ -942,7 +877,7 @@ FGBFI::getAPHeadingLock ()
 {
     return
       (current_autopilot->get_HeadingEnabled() &&
-       current_autopilot->get_HeadingMode() == FGAutopilot::FG_HEADING_LOCK);
+       current_autopilot->get_HeadingMode() == DEFAULT_AP_HEADING_LOCK);
 }
 
 
@@ -952,39 +887,59 @@ FGBFI::getAPHeadingLock ()
 void
 FGBFI::setAPHeadingLock (bool lock)
 {
-  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);
-  }
+    if (lock) {
+	current_autopilot->set_HeadingMode(DEFAULT_AP_HEADING_LOCK);
+	current_autopilot->set_HeadingEnabled(true);
+    } else {
+	current_autopilot->set_HeadingEnabled(false);
+    }
 }
 
 
 /**
- * Get the autopilot target heading in degrees.
+ * Get the autopilot heading bug in degrees.
  */
 double
-FGBFI::getAPHeadingMag ()
+FGBFI::getAPHeadingBug ()
 {
-  return current_autopilot->get_TargetHeading() - getMagVar();
+  return current_autopilot->get_DGTargetHeading();
 }
 
 
 /**
- * Set the autopilot target heading in degrees.
+ * Set the autopilot heading bug in degrees.
  */
 void
-FGBFI::setAPHeadingMag (double heading)
+FGBFI::setAPHeadingBug (double heading)
 {
-  current_autopilot->set_TargetHeading( heading + getMagVar() );
+  current_autopilot->set_DGTargetHeading( heading );
+}
+
+
+/**
+ * Get the autopilot wing leveler lock (true=on).
+ */
+bool
+FGBFI::getAPWingLeveler ()
+{
+    return
+      (current_autopilot->get_HeadingEnabled() &&
+       current_autopilot->get_HeadingMode() == FGAutopilot::FG_TC_HEADING_LOCK);
+}
+
+
+/**
+ * Set the autopilot wing leveler lock (true=on).
+ */
+void
+FGBFI::setAPWingLeveler (bool lock)
+{
+    if (lock) {
+	current_autopilot->set_HeadingMode(FGAutopilot::FG_TC_HEADING_LOCK);
+	current_autopilot->set_HeadingEnabled(true);
+    } else {
+	current_autopilot->set_HeadingEnabled(false);
+    }
 }
 
 
@@ -1015,168 +970,90 @@ FGBFI::setAPNAV1Lock (bool lock)
   }
 }
 
-
-
-////////////////////////////////////////////////////////////////////////
-// Radio navigation.
-////////////////////////////////////////////////////////////////////////
-
-double
-FGBFI::getNAV1Freq ()
-{
-  return current_radiostack->get_nav1_freq();
-}
-
-double
-FGBFI::getNAV1AltFreq ()
-{
-  return current_radiostack->get_nav1_alt_freq();
-}
-
-double
-FGBFI::getNAV1Radial ()
-{
-  return current_radiostack->get_nav1_radial();
-}
-
-double
-FGBFI::getNAV1SelRadial ()
-{
-  return current_radiostack->get_nav1_sel_radial();
-}
-
-double
-FGBFI::getNAV1DistDME ()
-{
-  return current_radiostack->get_nav1_dme_dist();
-}
-
-bool
-FGBFI::getNAV1InRange ()
-{
-  return current_radiostack->get_nav1_inrange();
-}
-
-bool
-FGBFI::getNAV1DMEInRange ()
-{
-  return (current_radiostack->get_nav1_inrange() &&
-	  current_radiostack->get_nav1_has_dme());
-}
-
-double
-FGBFI::getNAV2Freq ()
-{
-  return current_radiostack->get_nav2_freq();
-}
-
-double
-FGBFI::getNAV2AltFreq ()
-{
-  return current_radiostack->get_nav2_alt_freq();
-}
-
-double
-FGBFI::getNAV2Radial ()
-{
-  return current_radiostack->get_nav2_radial();
-}
-
-double
-FGBFI::getNAV2SelRadial ()
-{
-  return current_radiostack->get_nav2_sel_radial();
-}
-
-double
-FGBFI::getNAV2DistDME ()
-{
-  return current_radiostack->get_nav2_dme_dist();
-}
-
-bool
-FGBFI::getNAV2InRange ()
-{
-  return current_radiostack->get_nav2_inrange();
-}
-
+/**
+ * Get the autopilot autothrottle lock.
+ */
 bool
-FGBFI::getNAV2DMEInRange ()
+FGBFI::getAPAutoThrottleLock ()
 {
-  return (current_radiostack->get_nav2_inrange() &&
-	  current_radiostack->get_nav2_has_dme());
+  return current_autopilot->get_AutoThrottleEnabled();
 }
 
-double
-FGBFI::getADFFreq ()
-{
-  return current_radiostack->get_adf_freq();
-}
-
-double
-FGBFI::getADFAltFreq ()
-{
-  return current_radiostack->get_adf_alt_freq();
-}
-
-double
-FGBFI::getADFRotation ()
-{
-  return current_radiostack->get_adf_rotation();
-}
 
+/**
+ * Set the autothrottle lock.
+ */
 void
-FGBFI::setNAV1Freq (double freq)
+FGBFI::setAPAutoThrottleLock (bool lock)
 {
-  current_radiostack->set_nav1_freq(freq);
+  current_autopilot->set_AutoThrottleEnabled(lock);
 }
 
-void
-FGBFI::setNAV1AltFreq (double freq)
-{
-  current_radiostack->set_nav1_alt_freq(freq);
-}
 
-void
-FGBFI::setNAV1SelRadial (double radial)
-{
-  current_radiostack->set_nav1_sel_radial(radial);
-}
-
-void
-FGBFI::setNAV2Freq (double freq)
+// kludge
+double
+FGBFI::getAPRudderControl ()
 {
-  current_radiostack->set_nav2_freq(freq);
+    if (getAPHeadingLock())
+        return current_autopilot->get_TargetHeading();
+    else
+        return controls.get_rudder();
 }
 
+// kludge
 void
-FGBFI::setNAV2AltFreq (double freq)
+FGBFI::setAPRudderControl (double value)
 {
-  current_radiostack->set_nav2_alt_freq(freq);
+    if (getAPHeadingLock()) {
+        SG_LOG(SG_GENERAL, SG_DEBUG, "setAPRudderControl " << value );
+        value -= current_autopilot->get_TargetHeading();
+        current_autopilot->HeadingAdjust(value < 0.0 ? -1.0 : 1.0);
+    } else {
+        controls.set_rudder(value);
+    }
 }
 
-void
-FGBFI::setNAV2SelRadial (double radial)
+// kludge
+double
+FGBFI::getAPElevatorControl ()
 {
-  current_radiostack->set_nav2_sel_radial(radial);
+  if (getAPAltitudeLock())
+      return current_autopilot->get_TargetAltitude();
+  else
+    return controls.get_elevator();
 }
 
+// kludge
 void
-FGBFI::setADFFreq (double freq)
+FGBFI::setAPElevatorControl (double value)
 {
-  current_radiostack->set_adf_freq(freq);
+    if (getAPAltitudeLock()) {
+        SG_LOG(SG_GENERAL, SG_DEBUG, "setAPElevatorControl " << value );
+        value -= current_autopilot->get_TargetAltitude();
+        current_autopilot->AltitudeAdjust(value < 0.0 ? 100.0 : -100.0);
+    } else {
+        controls.set_elevator(value);
+    }
 }
 
-void
-FGBFI::setADFAltFreq (double freq)
+// kludge
+double
+FGBFI::getAPThrottleControl ()
 {
-  current_radiostack->set_adf_alt_freq(freq);
+  if (getAPAutoThrottleLock())
+    return 0.0;			// always resets
+  else
+    return controls.get_throttle(0);
 }
 
+// kludge
 void
-FGBFI::setADFRotation (double rot)
+FGBFI::setAPThrottleControl (double value)
 {
-  current_radiostack->set_adf_rotation(rot);
+  if (getAPAutoThrottleLock())
+    current_autopilot->AutoThrottleAdjust(value < 0.0 ? -0.01 : 0.01);
+  else
+    controls.set_throttle(0, value);
 }
 
 
@@ -1215,141 +1092,154 @@ FGBFI::setGPSLock (bool lock)
 
 
 /**
- * Get the GPS target airport code.
+ * Get the GPS target latitude in degrees (negative for south).
  */
-const string
-FGBFI::getTargetAirport ()
+double
+FGBFI::getGPSTargetLatitude ()
 {
-  return current_options.get_airport_id();
+    return current_autopilot->get_TargetLatitude();
 }
 
 
 /**
- * Set the GPS target airport code.
+ * Get the GPS target longitude in degrees (negative for west).
  */
-void
-FGBFI::setTargetAirport (const string &airportId)
+double
+FGBFI::getGPSTargetLongitude ()
 {
-  current_options.set_airport_id(airportId);
+  return current_autopilot->get_TargetLongitude();
 }
 
 
+
+////////////////////////////////////////////////////////////////////////
+// Weather
+////////////////////////////////////////////////////////////////////////
+
+
 /**
- * Get the GPS target latitude in degrees (negative for south).
+ * Get the current visibility (meters).
  */
 double
-FGBFI::getGPSTargetLatitude ()
+FGBFI::getVisibility ()
 {
-    return current_autopilot->get_TargetLatitude();
+#ifndef FG_OLD_WEATHER
+  return WeatherDatabase->getWeatherVisibility();
+#else
+  return current_weather.get_visibility();
+#endif
 }
 
 
 /**
- * Set the GPS target latitude in degrees (negative for south).
+ * Set the current visibility (meters).
  */
 void
-FGBFI::setGPSTargetLatitude (double latitude)
+FGBFI::setVisibility (double visibility)
 {
-  current_autopilot->set_TargetLatitude( latitude );
+#ifndef FG_OLD_WEATHER
+  WeatherDatabase->setWeatherVisibility(visibility);
+#else
+  current_weather.set_visibility(visibility);
+#endif
 }
 
 
 /**
- * Get the GPS target longitude in degrees (negative for west).
+ * Get the current wind north velocity (feet/second).
  */
 double
-FGBFI::getGPSTargetLongitude ()
+FGBFI::getWindNorth ()
 {
-  return current_autopilot->get_TargetLongitude();
+  return current_aircraft.fdm_state->get_V_north_airmass();
 }
 
 
 /**
- * Set the GPS target longitude in degrees (negative for west).
+ * Set the current wind north velocity (feet/second).
  */
 void
-FGBFI::setGPSTargetLongitude (double longitude)
+FGBFI::setWindNorth (double speed)
 {
-  current_autopilot->set_TargetLongitude( longitude );
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(speed,
+							   getWindEast(),
+							   getWindDown());
 }
 
 
-
-////////////////////////////////////////////////////////////////////////
-// Weather
-////////////////////////////////////////////////////////////////////////
-
-
 /**
- * Get the current visible (units??).
+ * Get the current wind east velocity (feet/second).
  */
 double
-FGBFI::getVisibility ()
+FGBFI::getWindEast ()
 {
-#ifndef FG_OLD_WEATHER
-  return WeatherDatabase->getWeatherVisibility();
-#else
-  return current_weather.get_visibility();
-#endif
+  return current_aircraft.fdm_state->get_V_east_airmass();
 }
 
 
 /**
- * Check whether clouds are enabled.
+ * Set the current wind east velocity (feet/second).
  */
-bool
-FGBFI::getClouds ()
+void
+FGBFI::setWindEast (double speed)
 {
-  return current_options.get_clouds();
+  cout << "Set wind-east to " << speed << endl;
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+							   speed,
+							   getWindDown());
 }
 
 
 /**
- * Check the height of the clouds ASL (units?).
+ * Get the current wind down velocity (feet/second).
  */
 double
-FGBFI::getCloudsASL ()
+FGBFI::getWindDown ()
 {
-  return current_options.get_clouds_asl();
+  return current_aircraft.fdm_state->get_V_down_airmass();
 }
 
 
 /**
- * Set the current visibility (units??).
+ * Set the current wind down velocity (feet/second).
  */
 void
-FGBFI::setVisibility (double visibility)
+FGBFI::setWindDown (double speed)
 {
-#ifndef FG_OLD_WEATHER
-  WeatherDatabase->setWeatherVisibility(visibility);
-#else
-  current_weather.set_visibility(visibility);
-#endif
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+							   getWindEast(),
+							   speed);
 }
 
 
-/**
- * Switch clouds on or off.
- */
-void
-FGBFI::setClouds (bool clouds)
+
+////////////////////////////////////////////////////////////////////////
+// View.
+////////////////////////////////////////////////////////////////////////
+
+double
+FGBFI::getFOV ()
 {
-  cout << "Set clouds to " << clouds << endl;
-  current_options.set_clouds(clouds);
-  needReinit();
+  return globals->get_current_view()->get_fov();
 }
 
+void
+FGBFI::setFOV (double fov)
+{
+  globals->get_current_view()->set_fov( fov );
+}
 
-/**
- * Set the cloud height.
- */
 void
-FGBFI::setCloudsASL (double cloudsASL)
+FGBFI::setViewAxisLong (double axis)
 {
-  current_options.set_clouds_asl(cloudsASL);
-  needReinit();
+  axisLong = axis;
 }
 
+void
+FGBFI::setViewAxisLat (double axis)
+{
+  axisLat = axis;
+}
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -1362,7 +1252,7 @@ FGBFI::setCloudsASL (double cloudsASL)
 double
 FGBFI::getMagVar ()
 {
-  return cur_magvar.get_magvar() * RAD_TO_DEG;
+  return globals->get_mag()->get_magvar() * SGD_RADIANS_TO_DEGREES;
 }
 
 
@@ -1372,7 +1262,7 @@ FGBFI::getMagVar ()
 double
 FGBFI::getMagDip ()
 {
-  return cur_magvar.get_magdip() * RAD_TO_DEG;
+  return globals->get_mag()->get_magdip() * SGD_RADIANS_TO_DEGREES;
 }