]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/bfi.cxx
Updates to time parsing and setting by David Megginson.
[flightgear.git] / src / Main / bfi.cxx
index ab980d250816543d44b40bff4830f39598b702db..8ab72ac792a041d85e110986c8ccc9fc3391d7da 100644 (file)
@@ -48,6 +48,7 @@
 #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
@@ -55,7 +56,6 @@
 #endif
 
 #include "globals.hxx"
-#include "options.hxx"
 #include "save.hxx"
 #include "fg_init.hxx"
 #include <simgear/misc/props.hxx>
@@ -71,7 +71,80 @@ FG_USING_NAMESPACE(std);
 // Static variables.
 ////////////////////////////////////////////////////////////////////////
 
-bool FGBFI::_needReinit = false;
+                               // Yech -- not thread-safe, etc. etc.
+static bool _needReinit = false;
+static string _temp;
+
+static inline void needReinit ()
+{
+  _needReinit = true;
+}
+
+
+/**
+ * Reinitialize FGFS to use the new BFI settings.
+ */
+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";
+
+                               // TODO: add more AP stuff
+  double elevator = FGBFI::getElevator();
+  double aileron = FGBFI::getAileron();
+  double rudder = FGBFI::getRudder();
+  double throttle = FGBFI::getThrottle();
+  double elevator_trim = FGBFI::getElevatorTrim();
+  double flaps = FGBFI::getFlaps();
+  double brake = FGBFI::getBrakes();
+  bool apHeadingLock = FGBFI::getAPHeadingLock();
+  double apHeadingMag = FGBFI::getAPHeadingMag();
+  bool apAltitudeLock = FGBFI::getAPAltitudeLock();
+  double apAltitude = FGBFI::getAPAltitude();
+  const string &targetAirport = FGBFI::getTargetAirport();
+  bool gpsLock = FGBFI::getGPSLock();
+  // double gpsLatitude = FGBFI::getGPSTargetLatitude();
+  // double gpsLongitude = FGBFI::getGPSTargetLongitude();
+
+  FGBFI::setTargetAirport("");
+  cout << "Target airport is " << globals->get_options()->get_airport_id() << endl;
+
+  fgReInitSubsystems();
+
+                               // 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.
+  FGBFI::setElevator(elevator);
+  FGBFI::setAileron(aileron);
+  FGBFI::setRudder(rudder);
+  FGBFI::setThrottle(throttle);
+  FGBFI::setElevatorTrim(elevator_trim);
+  FGBFI::setFlaps(flaps);
+  FGBFI::setBrakes(brake);
+  FGBFI::setAPHeadingLock(apHeadingLock);
+  FGBFI::setAPHeadingMag(apHeadingMag);
+  FGBFI::setAPAltitudeLock(apAltitudeLock);
+  FGBFI::setAPAltitude(apAltitude);
+  FGBFI::setTargetAirport(targetAirport);
+  FGBFI::setGPSLock(gpsLock);
+
+  _needReinit = false;
+
+  cout << "BFI: end reinit\n";
+}
 
 
 \f
@@ -93,23 +166,34 @@ FGBFI::init ()
                                // Simulation
   current_properties.tieInt("/sim/flight-model",
                            getFlightModel, setFlightModel);
-//   current_properties.tieString("/sim/aircraft",
-//                            getAircraft, setAircraft);
+  current_properties.tieString("/sim/aircraft",
+                              getAircraft, setAircraft);
+  current_properties.tieString("/sim/aircraft-dir",
+                              getAircraftDir, setAircraftDir);
   // TODO: timeGMT
+  current_properties.tieString("/sim/time/gmt",
+                              getDateString, setDateString);
   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);
+  current_properties.tieInt("/sim/panel/x-offset",
+                           getPanelXOffset, setPanelXOffset);
+  current_properties.tieInt("/sim/panel/y-offset",
+                           getPanelYOffset, setPanelYOffset);
 
                                // 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);
 
@@ -128,20 +212,24 @@ FGBFI::init ()
                               getRPM, 0);
   current_properties.tieDouble("/engines/engine0/egt",
                               getEGT, 0);
+  current_properties.tieDouble("/engines/engine0/cht",
+                              getCHT, 0);
+  current_properties.tieDouble("/engines/engine0/mp",
+                              getMP, 0);
 
                                // Velocities
   current_properties.tieDouble("/velocities/airspeed",
-                              getAirspeed, 0);
+                              getAirspeed, setAirspeed);
   current_properties.tieDouble("/velocities/side-slip",
                               getSideSlip, 0);
   current_properties.tieDouble("/velocities/vertical-speed",
                               getVerticalSpeed, 0);
   current_properties.tieDouble("/velocities/speed-north",
-                              getSpeedNorth, setSpeedNorth);
+                              getSpeedNorth, 0);
   current_properties.tieDouble("/velocities/speed-east",
-                              getSpeedEast, setSpeedEast);
+                              getSpeedEast, 0);
   current_properties.tieDouble("/velocities/speed-down",
-                              getSpeedDown, setSpeedDown);
+                              getSpeedDown, 0);
 
                                // Controls
   current_properties.tieDouble("/controls/throttle",
@@ -232,6 +320,8 @@ FGBFI::init ()
   current_properties.tieDouble("/environment/visibility",
                               getVisibility, setVisibility);
 
+  _needReinit = false;
+
   FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
 }
 
@@ -253,74 +343,6 @@ FGBFI::update ()
 }
 
 
-/**
- * Reinitialize FGFS to use the new BFI settings.
- */
-void
-FGBFI::reinit ()
-{
-                               // Save the state of everything
-                               // 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();
-  double rudder = getRudder();
-  double throttle = getThrottle();
-  double elevator_trim = getElevatorTrim();
-  double flaps = getFlaps();
-  double brake = getBrakes();
-  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;
-
-  fgReInitSubsystems();
-
-                               // 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);
-  setAileron(aileron);
-  setRudder(rudder);
-  setThrottle(throttle);
-  setElevatorTrim(elevator_trim);
-  setFlaps(flaps);
-  setBrakes(brake);
-  setAPHeadingLock(apHeadingLock);
-  setAPHeadingMag(apHeadingMag);
-  setAPAltitudeLock(apAltitudeLock);
-  setAPAltitude(apAltitude);
-  setTargetAirport(targetAirport);
-  setGPSLock(gpsLock);
-  setGPSTargetLatitude(gpsLatitude);
-  setGPSTargetLongitude(gpsLongitude);
-
-  _needReinit = false;
-
-  cout << "BFI: end reinit\n";
-}
-
-
 \f
 ////////////////////////////////////////////////////////////////////////
 // Simulation.
@@ -335,27 +357,29 @@ 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
+const string &
 FGBFI::getAircraft ()
 {
-  return current_options.get_aircraft();
+  _temp = globals->get_options()->get_aircraft();
+  return _temp;
 }
 
 
 /**
  * Return the current aircraft directory (UIUC) as a string.
  */
-const string
+const string &
 FGBFI::getAircraftDir ()
 {
-  return aircraft_dir;
+  _temp = aircraft_dir;
+  return _temp;
 }
 
 
@@ -368,7 +392,7 @@ void
 FGBFI::setFlightModel (int model)
 {
   if (getFlightModel() != model) {
-    current_options.set_flight_model(model);
+    globals->get_options()->set_flight_model(model);
     needReinit();
   }
 }
@@ -381,7 +405,7 @@ void
 FGBFI::setAircraft (const string &aircraft)
 {
   if (getAircraft() != aircraft) {
-    current_options.set_aircraft(aircraft);
+    globals->get_options()->set_aircraft(aircraft);
     needReinit();
   }
 }
@@ -403,10 +427,17 @@ FGBFI::setAircraftDir (const string &dir)
 /**
  * Return the current Zulu time.
  */
-time_t
-FGBFI::getTimeGMT ()
+const string &
+FGBFI::getDateString ()
 {
-  return globals->get_time_params()->get_cur_time();
+  static string out;           // FIXME: not thread-safe
+  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;
 }
 
 
@@ -414,18 +445,46 @@ FGBFI::getTimeGMT ()
  * Set the current Zulu time.
  */
 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();
+FGBFI::setDateString (const 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) {
+    FG_LOG(FG_INPUT, FG_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;
+
+                               // 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() * FEET_TO_METER;
+  globals->set_warp(warp);
+  st->update(lon, lat, warp);
+  fgUpdateSkyAndLightingParams();
 }
 
 
@@ -451,7 +510,7 @@ FGBFI::getGMTString ()
 bool
 FGBFI::getHUDVisible ()
 {
-  return current_options.get_hud_status();
+  return globals->get_options()->get_hud_status();
 }
 
 
@@ -461,7 +520,7 @@ FGBFI::getHUDVisible ()
 void
 FGBFI::setHUDVisible (bool visible)
 {
-  current_options.set_hud_status(visible);
+  globals->get_options()->set_hud_status(visible);
 }
 
 
@@ -471,7 +530,7 @@ FGBFI::setHUDVisible (bool visible)
 bool
 FGBFI::getPanelVisible ()
 {
-  return current_options.get_panel_status();
+  return globals->get_options()->get_panel_status();
 }
 
 
@@ -481,12 +540,62 @@ 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();
   }
 }
 
 
+/**
+ * Get the panel's current x-shift.
+ */
+int
+FGBFI::getPanelXOffset ()
+{
+  if (current_panel != 0)
+    return current_panel->getXOffset();
+  else
+    return 0;
+}
+
+
+/**
+ * Set the panel's current x-shift.
+ */
+void
+FGBFI::setPanelXOffset (int offset)
+{
+  if (current_panel != 0)
+    current_panel->setXOffset(offset);
+}
+
+
+/**
+ * Get the panel's current y-shift.
+ */
+int
+FGBFI::getPanelYOffset ()
+{
+  if (current_panel != 0)
+    return current_panel->getYOffset();
+  else
+    return 0;
+}
+
+
+/**
+ * Set the panel's current y-shift.
+ */
+void
+FGBFI::setPanelYOffset (int offset)
+{
+  if (current_panel != 0)
+    current_panel->setYOffset(offset);
+}
+
+
+
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // Position
@@ -509,11 +618,8 @@ FGBFI::getLatitude ()
 void
 FGBFI::setLatitude (double latitude)
 {
-  if (getLatitude() != latitude) {
-    current_options.set_lat(latitude);
-    current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
-    needReinit();
-  }
+  current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
+  fgUpdateSkyAndLightingParams();
 }
 
 
@@ -533,11 +639,8 @@ FGBFI::getLongitude ()
 void
 FGBFI::setLongitude (double longitude)
 {
-  if (getLongitude() != longitude) {
-    current_options.set_lon(longitude);
-    current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
-    needReinit();
-  }
+  current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
+  fgUpdateSkyAndLightingParams();
 }
 
 
@@ -569,11 +672,8 @@ FGBFI::getAGL ()
 void
 FGBFI::setAltitude (double altitude)
 {
-  if (getAltitude() != altitude) {
-    fgFDMForceAltitude(getFlightModel(), altitude * FEET_TO_METER);
-    current_options.set_altitude(altitude * FEET_TO_METER);
-    current_aircraft.fdm_state->set_Altitude(altitude);
-  }
+  current_aircraft.fdm_state->set_Altitude(altitude);
+  fgUpdateSkyAndLightingParams();
 }
 
 
@@ -609,13 +709,9 @@ FGBFI::getHeadingMag ()
 void
 FGBFI::setHeading (double heading)
 {
-  if (getHeading() != 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 * DEG_TO_RAD);
 }
 
 
@@ -635,13 +731,8 @@ FGBFI::getPitch ()
 void
 FGBFI::setPitch (double pitch)
 {
-  if (getPitch() != 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 * DEG_TO_RAD, fdm->get_Psi());
 }
 
 
@@ -661,13 +752,8 @@ FGBFI::getRoll ()
 void
 FGBFI::setRoll (double roll)
 {
-  if (getRoll() != 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 * DEG_TO_RAD, fdm->get_Theta(), fdm->get_Psi());
 }
 
 
@@ -691,8 +777,11 @@ FGBFI::getRPM ()
 void
 FGBFI::setRPM (double rpm)
 {
-  if (getRPM() != rpm)
-    current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+    if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+       if (getRPM() != rpm) {
+           current_aircraft.fdm_state->get_engine(0)->set_RPM( rpm );
+       }
+    }
 }
 
 
@@ -702,7 +791,39 @@ FGBFI::setRPM (double rpm)
 double
 FGBFI::getEGT ()
 {
-  return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+  if ( current_aircraft.fdm_state->get_engine(0) != NULL ) {
+      return current_aircraft.fdm_state->get_engine(0)->get_EGT();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * 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();
+  } else {
+      return 0.0;
+  }
+}
+
+
+/**
+ * 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();
+  } else {
+      return 0.0;
+  }
 }
 
 
@@ -723,6 +844,16 @@ FGBFI::getAirspeed ()
 }
 
 
+/**
+ * Set the calibrated airspeed in knots.
+ */
+void
+FGBFI::setAirspeed (double speed)
+{
+  current_aircraft.fdm_state->set_V_calibrated_kts(speed);
+}
+
+
 /**
  * Return the current sideslip (FIXME: units unknown).
  */
@@ -754,20 +885,15 @@ FGBFI::getSpeedNorth ()
 }
 
 
-/**
- * Set the current north velocity (units??).
- */
-void
-FGBFI::setSpeedNorth (double speed)
-{
-  if (getSpeedNorth() != speed) {
-    current_options.set_uBody(speed);
-    current_aircraft.fdm_state->set_Velocities_Local(speed,
-                                                    getSpeedEast(),
-                                                    getSpeedDown());
-    needReinit();
-  }
-}
+// /**
+//  * 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());
+// }
 
 
 /**
@@ -780,20 +906,15 @@ FGBFI::getSpeedEast ()
 }
 
 
-/**
- * Set the current east velocity (units??).
- */
-void
-FGBFI::setSpeedEast (double speed)
-{
-  if (getSpeedEast() != speed) {
-    current_options.set_vBody(speed);
-    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-                                                    speed,
-                                                    getSpeedDown());
-    needReinit();
-  }
-}
+// /**
+//  * 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());
+// }
 
 
 /**
@@ -806,20 +927,15 @@ FGBFI::getSpeedDown ()
 }
 
 
-/**
- * Set the current down velocity (units??).
- */
-void
-FGBFI::setSpeedDown (double speed)
-{
-  if (getSpeedDown() != speed) {
-    current_options.set_wBody(speed);
-    current_aircraft.fdm_state->set_Velocities_Local(getSpeedNorth(),
-                                                    getSpeedEast(),
-                                                    speed);
-    needReinit();
-  }
-}
+// /**
+//  * 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);
+// }
 
 
 \f
@@ -1517,10 +1633,14 @@ FGBFI::setGPSLock (bool lock)
 /**
  * Get the GPS target airport code.
  */
-const string
+const string &
 FGBFI::getTargetAirport ()
 {
-  return current_options.get_airport_id();
+  // FIXME: not thread-safe
+  static string out;
+  out = globals->get_options()->get_airport_id();
+
+  return out;
 }
 
 
@@ -1530,7 +1650,8 @@ FGBFI::getTargetAirport ()
 void
 FGBFI::setTargetAirport (const string &airportId)
 {
-  current_options.set_airport_id(airportId);
+  // cout << "setting target airport id = " << airportId << endl;
+  globals->get_options()->set_airport_id(airportId);
 }
 
 
@@ -1544,16 +1665,6 @@ FGBFI::getGPSTargetLatitude ()
 }
 
 
-/**
- * Set the GPS target latitude in degrees (negative for south).
- */
-void
-FGBFI::setGPSTargetLatitude (double latitude)
-{
-  current_autopilot->set_TargetLatitude( latitude );
-}
-
-
 /**
  * Get the GPS target longitude in degrees (negative for west).
  */
@@ -1563,7 +1674,7 @@ FGBFI::getGPSTargetLongitude ()
   return current_autopilot->get_TargetLongitude();
 }
 
-
+#if 0
 /**
  * Set the GPS target longitude in degrees (negative for west).
  */
@@ -1572,6 +1683,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 {
   current_autopilot->set_TargetLongitude( longitude );
 }
+#endif
 
 
 \f
@@ -1594,26 +1706,6 @@ FGBFI::getVisibility ()
 }
 
 
-/**
- * Check whether clouds are enabled.
- */
-bool
-FGBFI::getClouds ()
-{
-  return current_options.get_clouds();
-}
-
-
-/**
- * Check the height of the clouds ASL (units?).
- */
-double
-FGBFI::getCloudsASL ()
-{
-  return current_options.get_clouds_asl();
-}
-
-
 /**
  * Set the current visibility (units??).
  */
@@ -1628,33 +1720,6 @@ FGBFI::setVisibility (double visibility)
 }
 
 
-/**
- * Switch clouds on or off.
- */
-void
-FGBFI::setClouds (bool clouds)
-{
-  if (getClouds() != clouds) {
-    cout << "Set clouds to " << clouds << endl;
-    current_options.set_clouds(clouds);
-    needReinit();
-  }
-}
-
-
-/**
- * Set the cloud height.
- */
-void
-FGBFI::setCloudsASL (double cloudsASL)
-{
-  if (getCloudsASL() != cloudsASL) {
-    current_options.set_clouds_asl(cloudsASL);
-    needReinit();
-  }
-}
-
-
 \f
 ////////////////////////////////////////////////////////////////////////
 // Time