Changes by Tony Peden to get pitch, roll, and yaw rates onto the "bus."

diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index e5b2b619a0497040cb8ca312e1558f7c5b9ff876..44afb4f4e121c4c72df5d431ec1472a7d11df0cd 100644 (file)
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -198,7 +198,7 @@ int FGBalloonSim::copy_from_BalloonSim() {
 
     current_balloon.getHPR( temp );
     set_Euler_Angles( temp[0], temp[1], temp[2] );
-
+    set_Euler_Rates(0,0,0);
 
     set_Alpha( 0.0/*FDMExec.GetTranslation()->Getalpha()*/ );
     set_Beta( 0.0/*FDMExec.GetTranslation()->Getbeta()*/ );

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 285b47bf07978d14c2da9fcfd0790e6af8e79d71..9fb14d9333d05cbda9ec67ed91046a3b4ecd22a6 100644 (file)
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -209,7 +209,9 @@ int FGJSBsim::copy_from_JSBsim() {
     // set_Omega_Local( P_local, Q_local, R_local );
     // set_Omega_Total( P_total, Q_total, R_total );
     
-    // set_Euler_Rates( Phi_dot, Theta_dot, Psi_dot );
+    set_Euler_Rates( FDMExec.GetRotation()->Getphi(),
+                    FDMExec.GetRotation()->Gettht(),
+                    FDMExec.GetRotation()->Getpsi() );
     // ***FIXME*** set_Geocentric_Rates( Latitude_dot, Longitude_dot, Radius_dot );
        
     set_Mach_number( FDMExec.GetState()->GetMach());

diff --git a/src/FDM/LaRCsim.cxx b/src/FDM/LaRCsim.cxx
index 58fe14004f0c8ddab309e73cc0163214882e3cef..651f264a4e96d73fd08faa90d430a08b1750d9a5 100644 (file)
--- a/src/FDM/LaRCsim.cxx
+++ b/src/FDM/LaRCsim.cxx
@@ -360,7 +360,7 @@ int FGLaRCsim::copy_from_LaRCsim() {
     // set_Omega_Local( P_local, Q_local, R_local );
     // set_Omega_Total( P_total, Q_total, R_total );
     
-    // set_Euler_Rates( Phi_dot, Theta_dot, Psi_dot );
+    set_Euler_Rates( Phi_dot, Theta_dot, Psi_dot );
     set_Geocentric_Rates( Latitude_dot, Longitude_dot, Radius_dot );
 
     set_Mach_number( mach_number );

diff --git a/src/FDM/MagicCarpet.cxx b/src/FDM/MagicCarpet.cxx
index 9b09105ca5700d6be86ed367800776cf1aa858af..31a428aa2e42c8a38b313e87cd6b44a0f0018fe9 100644 (file)
--- a/src/FDM/MagicCarpet.cxx
+++ b/src/FDM/MagicCarpet.cxx
@@ -62,6 +62,7 @@ int FGMagicCarpet::update( int multiloop ) {
 
     // update euler angles
     set_Euler_Angles( get_Phi(), get_Theta(), fmod(get_Psi() + turn, FG_2PI) );
+    set_Euler_Rates(0,0,0);
 
     // update (lon/lat) position
     double lat2, lon2, az2;

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index c9f4fdb8cc1e23f7736d176d3b45911cdbd85250..c0c6c03192aba70b706b7ba29ff919107df2642a 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -532,11 +532,11 @@ public:
     // inline double get_Phi_dot() const { return euler_rates_v[0]; }
     // inline double get_Theta_dot() const { return euler_rates_v[1]; }
     // inline double get_Psi_dot() const { return euler_rates_v[2]; }
-    /* inline void set_Euler_Rates( double phi, double theta, double psi ) {
+    inline void set_Euler_Rates( double phi, double theta, double psi ) {
        euler_rates_v[0] = phi;
        euler_rates_v[1] = theta;
        euler_rates_v[2] = psi;
-    } */
+    } 
 
     FG_VECTOR_3    geocentric_rates_v;     // Geocentric linear velocities
     // inline double * get_Geocentric_rates_v() { return geocentric_rates_v; }