]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/JSBSim/JSBSim.cxx
Fix some sim time issues with the locations of the ground cache and the
[flightgear.git] / src / FDM / JSBSim / JSBSim.cxx
index 40650a6eafa67edadac64c8da041a7e73be25b5e..9267f757ec9a253e6ad7e71825ec167a4845095b 100644 (file)
 
 #include <simgear/compiler.h>
 
-#include <stdio.h>     //      size_t
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
-#include STL_STRING
+#include <stdio.h>    //    size_t
+#include <string>
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <FDM/flight.hxx>
 
 #include <Aircraft/aircraft.hxx>
-#include <Controls/controls.hxx>
+#include <Aircraft/controls.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
+#include "JSBSim.hxx"
 #include <FDM/JSBSim/FGFDMExec.h>
-#include <FDM/JSBSim/FGAircraft.h>
-#include <FDM/JSBSim/FGFCS.h>
-#include <FDM/JSBSim/FGPropagate.h>
+#include <FDM/JSBSim/FGJSBBase.h>
 #include <FDM/JSBSim/FGState.h>
-#include <FDM/JSBSim/FGAuxiliary.h>
-#include <FDM/JSBSim/FGInitialCondition.h>
-#include <FDM/JSBSim/FGTrim.h>
-#include <FDM/JSBSim/FGAtmosphere.h>
-#include <FDM/JSBSim/FGMassBalance.h>
-#include <FDM/JSBSim/FGAerodynamics.h>
-#include <FDM/JSBSim/FGLGear.h>
-#include <FDM/JSBSim/FGPropertyManager.h>
-#include <FDM/JSBSim/FGEngine.h>
-#include <FDM/JSBSim/FGPiston.h>
-#include <FDM/JSBSim/FGGroundCallback.h>
-#include <FDM/JSBSim/FGTurbine.h>
-#include <FDM/JSBSim/FGRocket.h>
-#include <FDM/JSBSim/FGElectric.h>
-#include <FDM/JSBSim/FGNozzle.h>
-#include <FDM/JSBSim/FGPropeller.h>
-#include <FDM/JSBSim/FGRotor.h>
-#include <FDM/JSBSim/FGTank.h>
-#include "JSBSim.hxx"
+#include <FDM/JSBSim/initialization/FGInitialCondition.h>
+#include <FDM/JSBSim/initialization/FGTrim.h>
+#include <FDM/JSBSim/models/FGModel.h>
+#include <FDM/JSBSim/models/FGAircraft.h>
+#include <FDM/JSBSim/models/FGFCS.h>
+#include <FDM/JSBSim/models/FGPropagate.h>
+#include <FDM/JSBSim/models/FGAuxiliary.h>
+#include <FDM/JSBSim/models/FGInertial.h>
+#include <FDM/JSBSim/models/FGAtmosphere.h>
+#include <FDM/JSBSim/models/FGMassBalance.h>
+#include <FDM/JSBSim/models/FGAerodynamics.h>
+#include <FDM/JSBSim/models/FGLGear.h>
+#include <FDM/JSBSim/models/propulsion/FGEngine.h>
+#include <FDM/JSBSim/models/propulsion/FGPiston.h>
+#include <FDM/JSBSim/models/propulsion/FGTurbine.h>
+#include <FDM/JSBSim/models/propulsion/FGTurboProp.h>
+#include <FDM/JSBSim/models/propulsion/FGRocket.h>
+#include <FDM/JSBSim/models/propulsion/FGElectric.h>
+#include <FDM/JSBSim/models/propulsion/FGNozzle.h>
+#include <FDM/JSBSim/models/propulsion/FGPropeller.h>
+#include <FDM/JSBSim/models/propulsion/FGRotor.h>
+#include <FDM/JSBSim/models/propulsion/FGTank.h>
+#include <FDM/JSBSim/input_output/FGPropertyManager.h>
+#include <FDM/JSBSim/input_output/FGGroundCallback.h>
+
+using namespace JSBSim;
 
 static inline double
 FMAX (double a, double b)
@@ -80,7 +82,7 @@ FMAX (double a, double b)
 
 class FGFSGroundCallback : public FGGroundCallback {
 public:
-  FGFSGroundCallback(FGInterface* ifc) : mInterface(ifc) {}
+  FGFSGroundCallback(FGJSBsim* ifc) : mInterface(ifc) {}
   virtual ~FGFSGroundCallback() {}
 
   /** Get the altitude above sea level depenent on the location. */
@@ -98,23 +100,22 @@ public:
                             FGLocation& cont,
                             FGColumnVector3& n, FGColumnVector3& v) const {
     double loc_cart[3] = { l(eX), l(eY), l(eZ) };
-    double contact[3], normal[3], vel[3], lc, ff, agl;
-    int groundtype;
-    mInterface->get_agl_ft(t, loc_cart, contact, normal, vel,
-                           &groundtype, &lc, &ff, &agl);
+    double contact[3], normal[3], vel[3], agl = 0;
+    mInterface->get_agl_ft(t, loc_cart, SG_METER_TO_FEET*2, contact, normal,
+                           vel, &agl);
     n = l.GetTec2l()*FGColumnVector3( normal[0], normal[1], normal[2] );
     v = l.GetTec2l()*FGColumnVector3( vel[0], vel[1], vel[2] );
     cont = FGColumnVector3( contact[0], contact[1], contact[2] );
     return agl;
   }
 private:
-  FGInterface* mInterface;
+  FGJSBsim* mInterface;
 };
 
 /******************************************************************************/
 
 FGJSBsim::FGJSBsim( double dt )
-  : FGInterface(dt)
+  : FGInterface(dt), got_wire(false)
 {
     bool result;
                                 // Set up the debugging level
@@ -142,10 +143,6 @@ FGJSBsim::FGJSBsim( double dt )
         }
     }
 
-    reset_on_crash = fgGetBool("/sim/reset-on-crash", false);
-    crashed = false;
-    fgSetBool("/sim/crashed", false);
-
     fdmex = new FGFDMExec( (FGPropertyManager*)globals->get_props() );
 
     // Register ground callback.
@@ -159,6 +156,7 @@ FGJSBsim::FGJSBsim( double dt )
     Aircraft        = fdmex->GetAircraft();
     Propagate        = fdmex->GetPropagate();
     Auxiliary       = fdmex->GetAuxiliary();
+    Inertial        = fdmex->GetInertial();
     Aerodynamics    = fdmex->GetAerodynamics();
     GroundReactions = fdmex->GetGroundReactions();
 
@@ -169,10 +167,15 @@ FGJSBsim::FGJSBsim( double dt )
 
     SGPath engine_path( fgGetString("/sim/aircraft-dir") );
     engine_path.append( "Engine" );
+
+    SGPath systems_path( fgGetString("/sim/aircraft-dir") );
+    systems_path.append( "Systems" );
+
     State->Setdt( dt );
 
     result = fdmex->LoadModel( aircraft_path.str(),
                                engine_path.str(),
+                               systems_path.str(),
                                fgGetString("/sim/aero"), false );
 
     if (result) {
@@ -207,9 +210,11 @@ FGJSBsim::FGJSBsim( double dt )
       if (node->getChild("level-gal_us", 0, false) != 0) {
         Propulsion->GetTank(i)->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
       } else {
-        node->setDoubleValue("level-lb", Propulsion->GetTank(i)->GetContents());
+        node->setDoubleValue("level-lbs", Propulsion->GetTank(i)->GetContents());
         node->setDoubleValue("level-gal_us", Propulsion->GetTank(i)->GetContents() / 6.6);
       }
+      node->setDoubleValue("capacity-gal_us",
+                           Propulsion->GetTank(i)->GetCapacity() / 6.6);
     }
     Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
 
@@ -242,6 +247,8 @@ FGJSBsim::FGJSBsim( double dt )
     speedbrake_pos_pct
         =fgGetNode("/surface-positions/speedbrake-pos-norm",true);
     spoilers_pos_pct=fgGetNode("/surface-positions/spoilers-pos-norm",true);
+    tailhook_pos_pct=fgGetNode("/gear/tailhook/position-norm",true);
+    wing_fold_pos_pct=fgGetNode("surface-positions/wing-fold-pos-norm",true);
 
     elevator_pos_pct->setDoubleValue(0);
     left_aileron_pos_pct->setDoubleValue(0);
@@ -261,11 +268,24 @@ FGJSBsim::FGJSBsim( double dt )
     wind_from_east = fgGetNode("/environment/wind-from-east-fps" ,true);
     wind_from_down = fgGetNode("/environment/wind-from-down-fps" ,true);
 
+    slaved = fgGetNode("/sim/slaved/enabled", true);
+
     for (unsigned int i = 0; i < Propulsion->GetNumEngines(); i++) {
       SGPropertyNode * node = fgGetNode("engines/engine", i, true);
       Propulsion->GetEngine(i)->GetThruster()->SetRPM(node->getDoubleValue("rpm") /
                      Propulsion->GetEngine(i)->GetThruster()->GetGearRatio());
     }
+
+    hook_root_struct = FGColumnVector3(
+        fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-offset-x-in", 196),
+        fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-offset-y-in", 0),
+        fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-offset-z-in", -16));
+
+    // Untie the write-state-file property to avoid creating an initfile.xml
+    // file on each reset.
+    fgGetNode("/fdm/jsbsim/simulation/write-state-file")->untie();
+
+    crashed = false;
 }
 
 /******************************************************************************/
@@ -288,30 +308,23 @@ void FGJSBsim::init()
     // Explicitly call the superclass's
     // init method first.
 
-#ifdef FG_WEATHERCM
-    Atmosphere->UseInternal();
-#else
     if (fgGetBool("/environment/params/control-fdm-atmosphere")) {
       Atmosphere->UseExternal();
       Atmosphere->SetExTemperature(
                   9.0/5.0*(temperature->getDoubleValue()+273.15) );
       Atmosphere->SetExPressure(pressure->getDoubleValue()*70.726566);
       Atmosphere->SetExDensity(density->getDoubleValue());
-
-      tmp = turbulence_gain->getDoubleValue();
-      Atmosphere->SetTurbGain(tmp * tmp * 100.0);
-
-      tmp = turbulence_rate->getDoubleValue();
-      Atmosphere->SetTurbRate(tmp);
+      Atmosphere->SetTurbType(FGAtmosphere::ttCulp);
+      Atmosphere->SetTurbGain(turbulence_gain->getDoubleValue());
+      Atmosphere->SetTurbRate(turbulence_rate->getDoubleValue());
 
     } else {
       Atmosphere->UseInternal();
     }
-#endif
 
-    fgic->SetVnorthFpsIC( wind_from_north->getDoubleValue() );
-    fgic->SetVeastFpsIC( wind_from_east->getDoubleValue() );
-    fgic->SetVdownFpsIC( wind_from_down->getDoubleValue() );
+    fgic->SetVNorthFpsIC( wind_from_north->getDoubleValue() );
+    fgic->SetVEastFpsIC( wind_from_east->getDoubleValue() );
+    fgic->SetVDownFpsIC( wind_from_down->getDoubleValue() );
 
     //Atmosphere->SetExTemperature(get_Static_temperature());
     //Atmosphere->SetExPressure(get_Static_pressure());
@@ -328,6 +341,8 @@ void FGJSBsim::init()
           }
     }
 
+    FCS->SetDfPos( ofNorm, globals->get_controls()->get_flaps() );
+
     common_init();
 
     copy_to_JSBsim();
@@ -339,9 +354,9 @@ void FGJSBsim::init()
     switch(fgic->GetSpeedSet()) {
     case setned:
         SG_LOG(SG_FLIGHT,SG_INFO, "  Vn,Ve,Vd= "
-               << Propagate->GetVel(eNorth) << ", "
-               << Propagate->GetVel(eEast) << ", "
-               << Propagate->GetVel(eDown) << " ft/s");
+               << Propagate->GetVel(FGJSBBase::eNorth) << ", "
+               << Propagate->GetVel(FGJSBBase::eEast) << ", "
+               << Propagate->GetVel(FGJSBBase::eDown) << " ft/s");
     break;
     case setuvw:
         SG_LOG(SG_FLIGHT,SG_INFO, "  U,V,W= "
@@ -363,11 +378,11 @@ void FGJSBsim::init()
     stall_warning->setDoubleValue(0);
 
     SG_LOG( SG_FLIGHT, SG_INFO, "  Bank Angle: "
-            << Propagate->GetEuler(ePhi)*RADTODEG << " deg" );
+            << Propagate->GetEuler(FGJSBBase::ePhi)*RADTODEG << " deg" );
     SG_LOG( SG_FLIGHT, SG_INFO, "  Pitch Angle: "
-            << Propagate->GetEuler(eTht)*RADTODEG << " deg" );
+            << Propagate->GetEuler(FGJSBBase::eTht)*RADTODEG << " deg" );
     SG_LOG( SG_FLIGHT, SG_INFO, "  True Heading: "
-            << Propagate->GetEuler(ePsi)*RADTODEG << " deg" );
+            << Propagate->GetEuler(FGJSBBase::ePsi)*RADTODEG << " deg" );
     SG_LOG( SG_FLIGHT, SG_INFO, "  Latitude: "
             << Propagate->GetLocation().GetLatitudeDeg() << " deg" );
     SG_LOG( SG_FLIGHT, SG_INFO, "  Longitude: "
@@ -390,6 +405,12 @@ void FGJSBsim::init()
 
 void FGJSBsim::update( double dt )
 {
+    if(crashed) {
+      if(!fgGetBool("/sim/crashed"))
+        fgSetBool("/sim/crashed", true);
+      return;
+    }
+
     if (is_suspended())
       return;
 
@@ -421,15 +442,20 @@ void FGJSBsim::update( double dt )
       cart = FGLocation(lon, lat, alt+slr);
     }
     double cart_pos[3] = { cart(1), cart(2), cart(3) };
-    bool cache_ok = prepare_ground_cache_ft( State->Getsim_time(), cart_pos,
+    double t0 = State->Getsim_time();
+    bool cache_ok = prepare_ground_cache_ft( t0, t0 + dt, cart_pos,
                                              groundCacheRadius );
     if (!cache_ok) {
       SG_LOG(SG_FLIGHT, SG_WARN,
              "FGInterface is being called without scenery below the aircraft!");
-      cout << "altitude         = " << alt << endl;
-      cout << "sea level radius = " << slr << endl;
-      cout << "latitude         = " << lat << endl;
-      cout << "longitude        = " << lon << endl;
+      SG_LOG(SG_FLIGHT, SG_WARN,
+             "altitude         = " << alt);
+      SG_LOG(SG_FLIGHT, SG_WARN,
+            "sea level radius = " << slr);
+      SG_LOG(SG_FLIGHT, SG_WARN,
+            "latitude         = " << lat);
+      SG_LOG(SG_FLIGHT, SG_WARN,
+            "longitude        = " << lon);
       //return;
     }
 
@@ -439,10 +465,9 @@ void FGJSBsim::update( double dt )
 
     if ( needTrim ) {
       if ( startup_trim->getBoolValue() ) {
-        double contact[3], dummy[3], lc, ff, agl;
-        int groundtype;
-        get_agl_ft(State->Getsim_time(), cart_pos, contact,
-                   dummy, dummy, &groundtype, &lc, &ff, &agl);
+        double contact[3], d[3], agl;
+        get_agl_ft(State->Getsim_time(), cart_pos, SG_METER_TO_FEET*2, contact,
+                   d, d, &agl);
         double terrain_alt = sqrt(contact[0]*contact[0] + contact[1]*contact[1]
              + contact[2]*contact[2]) - fgic->GetSeaLevelRadiusFtIC();
 
@@ -460,13 +485,16 @@ void FGJSBsim::update( double dt )
 
     for ( i=0; i < multiloop; i++ ) {
       fdmex->Run();
+      update_external_forces(State->Getsim_time() + i * State->Getdt());      
     }
 
     FGJSBBase::Message* msg;
-    while (fdmex->ReadMessage()) {
+    while (fdmex->SomeMessages()) {
       msg = fdmex->ProcessMessage();
       switch (msg->type) {
       case FGJSBBase::Message::eText:
+        if (msg->text == "Crash Detected: Simulation FREEZE.")
+          crashed = true;
         SG_LOG( SG_FLIGHT, SG_INFO, msg->messageId << ": " << msg->text );
         break;
       case FGJSBBase::Message::eBool:
@@ -487,12 +515,6 @@ void FGJSBsim::update( double dt )
     // translate JSBsim back to FG structure so that the
     // autopilot (and the rest of the sim can use the updated values
     copy_from_JSBsim();
-
-    // crashed (altitude AGL < 0)
-    if (get_Altitude_AGL() < 0.0) {
-      crash_message = "Attempted to fly under ground.";
-      crash_handler();
-    }
 }
 
 /******************************************************************************/
@@ -512,8 +534,6 @@ bool FGJSBsim::copy_to_JSBsim()
     FCS->SetPitchTrimCmd( globals->get_controls()->get_elevator_trim() );
     FCS->SetDrCmd( -globals->get_controls()->get_rudder() );
     FCS->SetYawTrimCmd( -globals->get_controls()->get_rudder_trim() );
-    // FIXME: make that get_steering work
-//     FCS->SetDsCmd( globals->get_controls()->get_steering()/80.0 );
     FCS->SetDsCmd( globals->get_controls()->get_rudder() );
     FCS->SetDfCmd( globals->get_controls()->get_flaps() );
     FCS->SetDsbCmd( globals->get_controls()->get_speedbrake() );
@@ -534,6 +554,7 @@ bool FGJSBsim::copy_to_JSBsim()
       FCS->SetThrottleCmd(i, globals->get_controls()->get_throttle(i));
       FCS->SetMixtureCmd(i, globals->get_controls()->get_mixture(i));
       FCS->SetPropAdvanceCmd(i, globals->get_controls()->get_prop_advance(i));
+      FCS->SetFeatherCmd(i, globals->get_controls()->get_feather(i));
 
       switch (Propulsion->GetEngine(i)->GetType()) {
       case FGEngine::etPiston:
@@ -547,7 +568,7 @@ bool FGJSBsim::copy_to_JSBsim()
         FGTurbine* eng = (FGTurbine*)Propulsion->GetEngine(i);
         eng->SetAugmentation( globals->get_controls()->get_augmentation(i) );
         eng->SetReverse( globals->get_controls()->get_reverser(i) );
-        eng->SetInjection( globals->get_controls()->get_water_injection(i) );
+        //eng->SetInjection( globals->get_controls()->get_water_injection(i) );
         eng->SetCutoff( globals->get_controls()->get_cutoff(i) );
         eng->SetIgnition( globals->get_controls()->get_ignition(i) );
         break;
@@ -557,6 +578,17 @@ bool FGJSBsim::copy_to_JSBsim()
         FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
         break;
         } // end FGRocket code block
+      case FGEngine::etTurboprop:
+        { // FGTurboProp code block
+        FGTurboProp* eng = (FGTurboProp*)Propulsion->GetEngine(i);
+        eng->SetReverse( globals->get_controls()->get_reverser(i) );
+        eng->SetCutoff( globals->get_controls()->get_cutoff(i) );
+        eng->SetIgnition( globals->get_controls()->get_ignition(i) );
+
+        eng->SetGeneratorPower( globals->get_controls()->get_generator_breaker(i) );
+        eng->SetCondition( globals->get_controls()->get_condition(i) );
+        break;
+        } // end FGTurboProp code block
       }
 
       { // FGEngine code block
@@ -576,10 +608,10 @@ bool FGJSBsim::copy_to_JSBsim()
     Atmosphere->SetExDensity(density->getDoubleValue());
 
     tmp = turbulence_gain->getDoubleValue();
-    Atmosphere->SetTurbGain(tmp * tmp * 100.0);
+    //Atmosphere->SetTurbGain(tmp * tmp * 100.0);
 
     tmp = turbulence_rate->getDoubleValue();
-    Atmosphere->SetTurbRate(tmp);
+    //Atmosphere->SetTurbRate(tmp);
 
     Atmosphere->SetWindNED( wind_from_north->getDoubleValue(),
                             wind_from_east->getDoubleValue(),
@@ -593,11 +625,11 @@ bool FGJSBsim::copy_to_JSBsim()
       SGPropertyNode * node = fgGetNode("/consumables/fuel/tank", i, true);
       FGTank * tank = Propulsion->GetTank(i);
       tank->SetContents(node->getDoubleValue("level-gal_us") * 6.6);
-//       tank->SetContents(node->getDoubleValue("level-lb"));
+//       tank->SetContents(node->getDoubleValue("level-lbs"));
     }
-    SGPropertyNode* node = fgGetNode("/systems/refuel", true);
-    Propulsion->SetRefuel(node->getDoubleValue("contact"));
+
     Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
+    fdmex->SetSlave(slaved->getBoolValue());
 
     return true;
 }
@@ -636,18 +668,18 @@ bool FGJSBsim::copy_from_JSBsim()
 
     // Velocities
 
-    _set_Velocities_Local( Propagate->GetVel(eNorth),
-                           Propagate->GetVel(eEast),
-                           Propagate->GetVel(eDown) );
+    _set_Velocities_Local( Propagate->GetVel(FGJSBBase::eNorth),
+                           Propagate->GetVel(FGJSBBase::eEast),
+                           Propagate->GetVel(FGJSBBase::eDown) );
 
     _set_Velocities_Wind_Body( Propagate->GetUVW(1),
                                Propagate->GetUVW(2),
                                Propagate->GetUVW(3) );
 
     // Make the HUD work ...
-    _set_Velocities_Ground( Propagate->GetVel(eNorth),
-                            Propagate->GetVel(eEast),
-                            -Propagate->GetVel(eDown) );
+    _set_Velocities_Ground( Propagate->GetVel(FGJSBBase::eNorth),
+                            Propagate->GetVel(FGJSBBase::eEast),
+                            -Propagate->GetVel(FGJSBBase::eDown) );
 
     _set_V_rel_wind( Auxiliary->GetVt() );
 
@@ -657,13 +689,13 @@ bool FGJSBsim::copy_from_JSBsim()
 
     _set_V_ground_speed( Auxiliary->GetVground() );
 
-    _set_Omega_Body( Propagate->GetPQR(eP),
-                     Propagate->GetPQR(eQ),
-                     Propagate->GetPQR(eR) );
+    _set_Omega_Body( Propagate->GetPQR(FGJSBBase::eP),
+                     Propagate->GetPQR(FGJSBBase::eQ),
+                     Propagate->GetPQR(FGJSBBase::eR) );
 
-    _set_Euler_Rates( Auxiliary->GetEulerRates(ePhi),
-                      Auxiliary->GetEulerRates(eTht),
-                      Auxiliary->GetEulerRates(ePsi) );
+    _set_Euler_Rates( Auxiliary->GetEulerRates(FGJSBBase::ePhi),
+                      Auxiliary->GetEulerRates(FGJSBBase::eTht),
+                      Auxiliary->GetEulerRates(FGJSBBase::ePsi) );
 
     _set_Mach_number( Auxiliary->GetMach() );
 
@@ -674,19 +706,18 @@ bool FGJSBsim::copy_from_JSBsim()
 
     _set_Altitude_AGL( Propagate->GetDistanceAGL() );
     {
-      double loc_cart[3] = { l(eX), l(eY), l(eZ) };
+      double loc_cart[3] = { l(FGJSBBase::eX), l(FGJSBBase::eY), l(FGJSBBase::eZ) };
       double contact[3], d[3], sd, t;
-      int id;
       is_valid_m(&t, d, &sd);
-      get_agl_ft(t, loc_cart, contact, d, d, &id, &sd, &sd, &sd);
+      get_agl_ft(t, loc_cart, SG_METER_TO_FEET*2, contact, d, d, &sd);
       double rwrad
         = FGColumnVector3( contact[0], contact[1], contact[2] ).Magnitude();
       _set_Runway_altitude( rwrad - get_Sea_level_radius() );
     }
 
-    _set_Euler_Angles( Propagate->GetEuler(ePhi),
-                       Propagate->GetEuler(eTht),
-                       Propagate->GetEuler(ePsi) );
+    _set_Euler_Angles( Propagate->GetEuler(FGJSBBase::ePhi),
+                       Propagate->GetEuler(FGJSBBase::eTht),
+                       Propagate->GetEuler(FGJSBBase::ePsi) );
 
     _set_Alpha( Auxiliary->Getalpha() );
     _set_Beta( Auxiliary->Getbeta() );
@@ -694,7 +725,7 @@ bool FGJSBsim::copy_from_JSBsim()
 
     _set_Gamma_vert_rad( Auxiliary->GetGamma() );
 
-    _set_Earth_position_angle( Auxiliary->GetEarthPositionAngle() );
+    _set_Earth_position_angle( Inertial->GetEarthPositionAngle() );
 
     _set_Climb_Rate( Propagate->Gethdot() );
 
@@ -721,6 +752,10 @@ bool FGJSBsim::copy_from_JSBsim()
         node->setDoubleValue("oil-temperature-degf", eng->getOilTemp_degF());
         node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
         node->setDoubleValue("mp-osi", eng->getManifoldPressure_inHg());
+        // NOTE: mp-osi is not in ounces per square inch.
+        // This error is left for reasons of backwards compatibility with
+        // existing FlightGear sound and instrument configurations.
+        node->setDoubleValue("mp-inhg", eng->getManifoldPressure_inHg());
         node->setDoubleValue("cht-degf", eng->getCylinderHeadTemp_degF());
         node->setDoubleValue("rpm", eng->getRPM());
         } // end FGPiston code block
@@ -751,6 +786,28 @@ bool FGJSBsim::copy_from_JSBsim()
         globals->get_controls()->set_augmentation(i, eng->GetAugmentation() );
         } // end FGTurbine code block
         break;
+      case FGEngine::etTurboprop:
+        { // FGTurboProp code block
+        FGTurboProp* eng = (FGTurboProp*)Propulsion->GetEngine(i);
+        node->setDoubleValue("n1", eng->GetN1());
+        //node->setDoubleValue("n2", eng->GetN2());
+        node->setDoubleValue("itt_degf", 32 + eng->GetITT()*9/5);
+        node->setBoolValue("ignition", eng->GetIgnition());
+        node->setDoubleValue("nozzle-pos-norm", eng->GetNozzle());
+        node->setDoubleValue("inlet-pos-norm", eng->GetInlet());
+        node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
+        node->setBoolValue("reversed", eng->GetReversed());
+        node->setBoolValue("cutoff", eng->GetCutoff());
+        node->setBoolValue("starting", eng->GetEngStarting());
+        node->setBoolValue("generator-power", eng->GetGeneratorPower());
+        node->setBoolValue("damaged", eng->GetCondition());
+        node->setBoolValue("ielu-intervent", eng->GetIeluIntervent());
+        node->setDoubleValue("oil-temperature-degf", eng->getOilTemp_degF());
+//        node->setBoolValue("onfire", eng->GetFire());
+        globals->get_controls()->set_reverser(i, eng->GetReversed() );
+        globals->get_controls()->set_cutoff(i, eng->GetCutoff() );
+        } // end FGTurboProp code block
+        break;
       case FGEngine::etElectric:
         { // FGElectric code block
         FGElectric* eng = (FGElectric*)Propulsion->GetEngine(i);
@@ -782,6 +839,7 @@ bool FGJSBsim::copy_from_JSBsim()
         tnode->setDoubleValue("rpm", thruster->GetRPM());
         tnode->setDoubleValue("pitch", prop->GetPitch());
         tnode->setDoubleValue("torque", prop->GetTorque());
+        tnode->setBoolValue("feathered", prop->GetFeather());
         } // end FGPropeller code block
         break;
       case FGThruster::ttRotor:
@@ -806,7 +864,7 @@ bool FGJSBsim::copy_from_JSBsim()
         double contents = tank->GetContents();
         double temp = tank->GetTemperature_degC();
         node->setDoubleValue("level-gal_us", contents/6.6);
-        node->setDoubleValue("level-lb", contents);
+        node->setDoubleValue("level-lbs", contents);
         if (temp != -9999.0) node->setDoubleValue("temperature_degC", temp);
       }
     }
@@ -822,6 +880,14 @@ bool FGJSBsim::copy_from_JSBsim()
     flap_pos_pct->setDoubleValue( FCS->GetDfPos(ofNorm) );
     speedbrake_pos_pct->setDoubleValue( FCS->GetDsbPos(ofNorm) );
     spoilers_pos_pct->setDoubleValue( FCS->GetDspPos(ofNorm) );
+    tailhook_pos_pct->setDoubleValue( FCS->GetTailhookPos() );
+    wing_fold_pos_pct->setDoubleValue( FCS->GetWingFoldPos() );
+
+    // force a sim crashed if crashed (altitude AGL < 0)
+    if (get_Altitude_AGL() < -100.0) {
+         State->SuspendIntegration();
+         crashed = true;
+    }
 
     return true;
 }
@@ -829,17 +895,19 @@ bool FGJSBsim::copy_from_JSBsim()
 
 bool FGJSBsim::ToggleDataLogging(void)
 {
-    return fdmex->GetOutput()->Toggle();
+  // ToDo: handle this properly
+  fdmex->DisableOutput();
+  return false;
 }
 
 
 bool FGJSBsim::ToggleDataLogging(bool state)
 {
     if (state) {
-      fdmex->GetOutput()->Enable();
+      fdmex->EnableOutput();
       return true;
     } else {
-      fdmex->GetOutput()->Disable();
+      fdmex->DisableOutput();
       return false;
     }
 }
@@ -848,7 +916,7 @@ bool FGJSBsim::ToggleDataLogging(bool state)
 //Positions
 void FGJSBsim::set_Latitude(double lat)
 {
-    static const SGPropertyNode *altitude = fgGetNode("/position/altitude-ft");
+    static SGConstPropertyNode_ptr altitude = fgGetNode("/position/altitude-ft");
     double alt;
     double sea_level_radius_meters, lat_geoc;
 
@@ -888,7 +956,7 @@ void FGJSBsim::set_Longitude(double lon)
 
 void FGJSBsim::set_Altitude(double alt)
 {
-    static const SGPropertyNode *latitude = fgGetNode("/position/latitude-deg");
+    static SGConstPropertyNode_ptr latitude = fgGetNode("/position/latitude-deg");
 
     double sea_level_radius_meters,lat_geoc;
 
@@ -943,9 +1011,9 @@ void FGJSBsim::set_Velocities_Local( double north, double east, double down )
     FGInterface::set_Velocities_Local(north, east, down);
 
     update_ic();
-    fgic->SetVnorthFpsIC(north);
-    fgic->SetVeastFpsIC(east);
-    fgic->SetVdownFpsIC(down);
+    fgic->SetVNorthFpsIC(north);
+    fgic->SetVEastFpsIC(east);
+    fgic->SetVDownFpsIC(down);
     needTrim=true;
 }
 
@@ -974,9 +1042,9 @@ void FGJSBsim::set_Euler_Angles( double phi, double theta, double psi )
     FGInterface::set_Euler_Angles(phi, theta, psi);
 
     update_ic();
-    fgic->SetPitchAngleRadIC(theta);
-    fgic->SetRollAngleRadIC(phi);
-    fgic->SetTrueHeadingRadIC(psi);
+    fgic->SetThetaRadIC(theta);
+    fgic->SetPhiRadIC(phi);
+    fgic->SetPsiRadIC(psi);
     needTrim=true;
 }
 
@@ -1021,8 +1089,10 @@ void FGJSBsim::init_gear(void )
       node->setDoubleValue("zoffset-in", gear->GetBodyLocation()(3));
       node->setBoolValue("wow", gear->GetWOW());
       node->setBoolValue("has-brake", gear->GetBrakeGroup() > 0);
-      node->setDoubleValue("position-norm", FCS->GetGearPos());
+      node->setDoubleValue("position-norm", gear->GetGearUnitPos());
       node->setDoubleValue("tire-pressure-norm", gear->GetTirePressure());
+      node->setDoubleValue("compression-norm", gear->GetCompLen());
+      node->setDoubleValue("compression-ft", gear->GetCompLen());
       if ( gear->GetSteerable() )
         node->setDoubleValue("steering-norm", gear->GetSteerNorm());
     }
@@ -1036,8 +1106,10 @@ void FGJSBsim::update_gear(void)
       FGLGear *gear = gr->GetGearUnit(i);
       SGPropertyNode * node = fgGetNode("gear/gear", i, true);
       node->getChild("wow", 0, true)->setBoolValue( gear->GetWOW());
-      node->getChild("position-norm", 0, true)->setDoubleValue(FCS->GetGearPos());
+      node->getChild("position-norm", 0, true)->setDoubleValue(gear->GetGearUnitPos());
       gear->SetTirePressure(node->getDoubleValue("tire-pressure-norm"));
+      node->setDoubleValue("compression-norm", gear->GetCompLen());
+      node->setDoubleValue("compression-ft", gear->GetCompLen());
       if ( gear->GetSteerable() )
         node->setDoubleValue("steering-norm", gear->GetSteerNorm());
     }
@@ -1049,7 +1121,6 @@ void FGJSBsim::do_trim(void)
 
   if ( fgGetBool("/sim/presets/onground") )
   {
-    fgic->SetVcalibratedKtsIC(0.0);
     fgtrim = new FGTrim(fdmex,tGround);
   } else {
     fgtrim = new FGTrim(fdmex,tLongitudinal);
@@ -1061,8 +1132,8 @@ void FGJSBsim::do_trim(void)
   } else {
     trimmed->setBoolValue(true);
   }
-  if (FGJSBBase::debug_lvl > 0)
-      State->ReportState();
+//  if (FGJSBBase::debug_lvl > 0)
+//      State->ReportState();
 
   delete fgtrim;
 
@@ -1089,24 +1160,212 @@ void FGJSBsim::update_ic(void)
      fgic->SetLongitudeRadIC( get_Longitude() );
      fgic->SetAltitudeFtIC( get_Altitude() );
      fgic->SetVcalibratedKtsIC( get_V_calibrated_kts() );
-     fgic->SetPitchAngleRadIC( get_Theta() );
-     fgic->SetRollAngleRadIC( get_Phi() );
-     fgic->SetTrueHeadingRadIC( get_Psi() );
+     fgic->SetThetaRadIC( get_Theta() );
+     fgic->SetPhiRadIC( get_Phi() );
+     fgic->SetPsiRadIC( get_Psi() );
      fgic->SetClimbRateFpsIC( get_Climb_Rate() );
    }
 }
 
-void FGJSBsim::crash_handler(void)
+bool
+FGJSBsim::get_agl_ft(double t, const double pt[3], double alt_off,
+                     double contact[3], double normal[3], double vel[3],
+                     double *agl)
 {
-   if (crashed) return;  // we already crashed
-   crashed = true;
-   fgSetBool("/sim/crashed", true);
-   SG_LOG( SG_FLIGHT, SG_WARN, "  Crash: " << crash_message );
-   if (reset_on_crash) {
-     SGPropertyNode* node = fgGetNode("/sim/presets", true);
-     globals->get_commands()->execute("old-reinit-dialog", node);   
-   } else {
-     fgSetBool("/sim/freeze/master", true);
-     fgSetBool("/sim/freeze/clock", true);
-   }
+   double angularVel[3];
+   const SGMaterial* material;
+   simgear::BVHNode::Id id;
+   if (!FGInterface::get_agl_ft(t, pt, alt_off, contact, normal, vel,
+                                angularVel, material, id))
+       return false;
+   SGGeod geodPt = SGGeod::fromCart(SG_FEET_TO_METER*SGVec3d(pt));
+   SGQuatd hlToEc = SGQuatd::fromLonLat(geodPt);
+   *agl = dot(hlToEc.rotate(SGVec3d(0, 0, 1)), SGVec3d(contact) - SGVec3d(pt));
+   return true;
 }
+
+inline static double dot3(const FGColumnVector3& a, const FGColumnVector3& b)
+{
+    return a(1) * b(1) + a(2) * b(2) + a(3) * b(3);
+}
+
+inline static double sqr(double x)
+{
+    return x * x;
+}
+
+static double angle_diff(double a, double b)
+{
+    double diff = fabs(a - b);
+    if (diff > 180) diff = 360 - diff;
+    
+    return diff;
+}
+
+static void check_hook_solution(const FGColumnVector3& ground_normal_body, double E, double hook_length, double sin_fi_guess, double cos_fi_guess, double* sin_fis, double* cos_fis, double* fis, int* points)
+{
+    FGColumnVector3 tip(-hook_length * cos_fi_guess, 0, hook_length * sin_fi_guess);
+    double dist = dot3(tip, ground_normal_body);
+    if (fabs(dist + E) < 0.0001) {
+       sin_fis[*points] = sin_fi_guess;
+       cos_fis[*points] = cos_fi_guess;
+       fis[*points] = atan2(sin_fi_guess, cos_fi_guess) * SG_RADIANS_TO_DEGREES;
+       (*points)++;
+    } 
+}
+
+
+static void check_hook_solution(const FGColumnVector3& ground_normal_body, double E, double hook_length, double sin_fi_guess, double* sin_fis, double* cos_fis, double* fis, int* points)
+{
+    if (sin_fi_guess >= -1 && sin_fi_guess <= 1) {
+       double cos_fi_guess = sqrt(1 - sqr(sin_fi_guess));
+       check_hook_solution(ground_normal_body, E, hook_length, sin_fi_guess, cos_fi_guess, sin_fis, cos_fis, fis, points);
+       if (fabs(cos_fi_guess) > SG_EPSILON) {
+           check_hook_solution(ground_normal_body, E, hook_length, sin_fi_guess, -cos_fi_guess, sin_fis, cos_fis, fis, points);
+       }
+    }
+}
+
+void FGJSBsim::update_external_forces(double t_off)
+{
+    const FGMatrix33& Tb2l = Propagate->GetTb2l();
+    const FGMatrix33& Tl2b = Propagate->GetTl2b();
+    const FGLocation& Location = Propagate->GetLocation();
+    const FGMatrix33& Tec2l = Location.GetTec2l();
+        
+    double hook_area[4][3];
+    
+    FGColumnVector3 hook_root_body = MassBalance->StructuralToBody(hook_root_struct);
+    FGColumnVector3 hook_root = Location.LocalToLocation(Tb2l *   hook_root_body);
+    hook_area[1][0] = hook_root(1);
+    hook_area[1][1] = hook_root(2);
+    hook_area[1][2] = hook_root(3);
+    
+    hook_length = fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-length-ft", 6.75);
+    double fi_min = fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-min-deg", -18);
+    double fi_max = fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-max-deg", 30);
+    double fi = fgGetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-norm") * (fi_max - fi_min) + fi_min;
+    double cos_fi = cos(fi * SG_DEGREES_TO_RADIANS);
+    double sin_fi = sin(fi * SG_DEGREES_TO_RADIANS);
+
+    FGColumnVector3 hook_tip_body = hook_root_body;
+    hook_tip_body(1) -= hook_length * cos_fi;
+    hook_tip_body(3) += hook_length * sin_fi;    
+    bool hook_tip_valid = true;
+    
+    double contact[3];
+    double ground_normal[3];
+    double ground_vel[3];
+    double root_agl_ft;
+
+    if (!got_wire) {
+        bool got = get_agl_ft(t_off, hook_area[1], 0, contact, ground_normal, ground_vel, &root_agl_ft);
+        if (got && root_agl_ft > 0 && root_agl_ft < hook_length) {
+            FGColumnVector3 ground_normal_body = Tl2b * (Tec2l * FGColumnVector3(ground_normal[0], ground_normal[1], ground_normal[2]));
+            FGColumnVector3 contact_body = Tl2b * Location.LocationToLocal(FGColumnVector3(contact[0], contact[1], contact[2]));
+            double D = -dot3(contact_body, ground_normal_body);
+
+           // check hook tip agl against same ground plane
+           double hook_tip_agl_ft = dot3(hook_tip_body, ground_normal_body) + D;
+           if (hook_tip_agl_ft < 0) {
+
+               // hook tip: hx - l cos, hy, hz + l sin
+               // on ground:  - n0 l cos + n2 l sin + E = 0
+
+               double E = D + dot3(hook_root_body, ground_normal_body);
+
+               // substitue x = sin fi, cos fi = sqrt(1 - x * x)
+               // and rearrange to get a quadratic with coeffs:
+               double a = sqr(hook_length) * (sqr(ground_normal_body(1)) + sqr(ground_normal_body(3)));
+               double b = 2 * E * ground_normal_body(3) * hook_length;
+               double c = sqr(E) - sqr(ground_normal_body(1) * hook_length);   
+
+               double disc = sqr(b) - 4 * a * c;
+               if (disc >= 0) {
+                   double delta = sqrt(disc) / (2 * a);
+               
+                   // allow 4 solutions for safety, should never happen
+                   double sin_fis[4];
+                   double cos_fis[4];
+                   double fis[4];
+                   int points = 0;
+               
+                   double sin_fi_guess = -b / (2 * a) - delta;
+                   check_hook_solution(ground_normal_body, E, hook_length, sin_fi_guess, sin_fis, cos_fis, fis, &points);
+                   check_hook_solution(ground_normal_body, E, hook_length, sin_fi_guess + 2 * delta, sin_fis, cos_fis, fis, &points);
+               
+                   if (points == 2) {
+                       double diff1 = angle_diff(fi, fis[0]);
+                       double diff2 = angle_diff(fi, fis[1]);
+                       int point = diff1 < diff2 ? 0 : 1;
+                       fi = fis[point];
+                       sin_fi = sin_fis[point];
+                       cos_fi = cos_fis[point];
+                       hook_tip_body(1) = hook_root_body(1) - hook_length * cos_fi;
+                       hook_tip_body(3) = hook_root_body(3) + hook_length * sin_fi;
+                   }
+               }
+           }
+       }
+    } else {
+        FGColumnVector3 hook_root_vel = Propagate->GetVel() + (Tb2l * (Propagate->GetPQR() *  hook_root_body));
+        double wire_ends_ec[2][3];
+        double wire_vel_ec[2][3];
+        get_wire_ends_ft(t_off, wire_ends_ec, wire_vel_ec);
+        FGColumnVector3 wire_vel_1 = Tec2l * FGColumnVector3(wire_vel_ec[0][0], wire_vel_ec[0][1], wire_vel_ec[0][2]);
+        FGColumnVector3 wire_vel_2 = Tec2l * FGColumnVector3(wire_vel_ec[1][0], wire_vel_ec[1][1], wire_vel_ec[1][2]);
+        FGColumnVector3 rel_vel = hook_root_vel - (wire_vel_1 + wire_vel_2) / 2;
+        if (rel_vel.Magnitude() < 3) {
+            got_wire = false;
+            release_wire();
+            fgSetDouble("/fdm/jsbsim/external_reactions/hook/magnitude", 0.0);
+        } else {
+            FGColumnVector3 wire_end1_body = Tl2b * Location.LocationToLocal(FGColumnVector3(wire_ends_ec[0][0], wire_ends_ec[0][1], wire_ends_ec[0][2])) - hook_root_body;
+            FGColumnVector3 wire_end2_body = Tl2b * Location.LocationToLocal(FGColumnVector3(wire_ends_ec[1][0], wire_ends_ec[1][1], wire_ends_ec[1][2])) - hook_root_body;
+            FGColumnVector3 force_plane_normal = wire_end1_body * wire_end2_body;
+            force_plane_normal.Normalize();
+            cos_fi = dot3(force_plane_normal, FGColumnVector3(0, 0, 1));
+            if (cos_fi < 0) cos_fi = -cos_fi;
+            sin_fi = sqrt(1 - sqr(cos_fi));
+            fi = atan2(sin_fi, cos_fi) * SG_RADIANS_TO_DEGREES;
+        
+            fgSetDouble("/fdm/jsbsim/external_reactions/hook/x", -cos_fi);
+            fgSetDouble("/fdm/jsbsim/external_reactions/hook/y", 0);
+            fgSetDouble("/fdm/jsbsim/external_reactions/hook/z", sin_fi);
+            fgSetDouble("/fdm/jsbsim/external_reactions/hook/magnitude", fgGetDouble("/fdm/jsbsim/systems/hook/force"));
+        }
+    }
+
+    FGColumnVector3 hook_tip = Location.LocalToLocation(Tb2l * hook_tip_body);
+
+    hook_area[0][0] = hook_tip(1);
+    hook_area[0][1] = hook_tip(2);
+    hook_area[0][2] = hook_tip(3);
+
+    if (!got_wire) {
+        // The previous positions.
+        hook_area[2][0] = last_hook_root[0];
+        hook_area[2][1] = last_hook_root[1];
+        hook_area[2][2] = last_hook_root[2];
+        hook_area[3][0] = last_hook_tip[0];
+        hook_area[3][1] = last_hook_tip[1];
+        hook_area[3][2] = last_hook_tip[2];
+
+        // Check if we caught a wire.
+        // Returns true if we caught one.
+        if (caught_wire_ft(t_off, hook_area)) {
+                got_wire = true;
+        }
+    }
+    
+    // save actual position as old position ...
+    last_hook_tip[0] = hook_area[0][0];
+    last_hook_tip[1] = hook_area[0][1];
+    last_hook_tip[2] = hook_area[0][2];
+    last_hook_root[0] = hook_area[1][0];
+    last_hook_root[1] = hook_area[1][1];
+    last_hook_root[2] = hook_area[1][2];
+    
+    fgSetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-deg", fi);
+}
+