fly/flightgear
1
0
Fork 0
Code Activity

Fixed the pilot acceleration for consistency with the accelerometer computation

Browse source
This commit is contained in:
bcoconni 2015-08-09 20:00:08 +02:00
parent adb926eefc
commit 7bcbe8e802
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/FDM/JSBSim/FGFDMExec.cpp
View file

@ -425,7 +425,8 @@ void FGFDMExec::LoadInputs(unsigned int idx)
Auxiliary->in.Tl2b = Propagate->GetTl2b(); Auxiliary->in.Tl2b = Propagate->GetTl2b();
Auxiliary->in.Tb2l = Propagate->GetTb2l(); Auxiliary->in.Tb2l = Propagate->GetTb2l();
Auxiliary->in.vPQR = Propagate->GetPQR(); Auxiliary->in.vPQR = Propagate->GetPQR();
Auxiliary->in.vPQRdot = Accelerations->GetPQRdot(); Auxiliary->in.vPQRi = Propagate->GetPQRi();
Auxiliary->in.vPQRidot = Accelerations->GetPQRidot();
Auxiliary->in.vUVW = Propagate->GetUVW(); Auxiliary->in.vUVW = Propagate->GetUVW();
Auxiliary->in.vUVWdot = Accelerations->GetUVWdot(); Auxiliary->in.vUVWdot = Accelerations->GetUVWdot();
Auxiliary->in.vVel = Propagate->GetVel(); Auxiliary->in.vVel = Propagate->GetVel();

4
src/FDM/JSBSim/models/FGAuxiliary.cpp
View file

@ -242,8 +242,8 @@ bool FGAuxiliary::Run(bool Holding)
// Nz is Acceleration in "g's", along normal axis (-Z body axis) // Nz is Acceleration in "g's", along normal axis (-Z body axis)
Nz = -vNcg(eZ); Nz = -vNcg(eZ);
Ny = vNcg(eY); Ny = vNcg(eY);
vPilotAccel = in.vBodyAccel + in.vPQRdot * in.ToEyePt; vPilotAccel = in.vBodyAccel + in.vPQRidot * in.ToEyePt;
vPilotAccel += in.vPQR * (in.vPQR * in.ToEyePt); vPilotAccel += in.vPQRi * (in.vPQRi * in.ToEyePt);
vNwcg = mTb2w * vNcg; vNwcg = mTb2w * vNcg;
vNwcg(eZ) = 1.0 - vNwcg(eZ); vNwcg(eZ) = 1.0 - vNwcg(eZ);

3
src/FDM/JSBSim/models/FGAuxiliary.h
View file

@ -269,7 +269,8 @@ public:
FGMatrix33 Tl2b; FGMatrix33 Tl2b;
FGMatrix33 Tb2l; FGMatrix33 Tb2l;
FGColumnVector3 vPQR; FGColumnVector3 vPQR;
FGColumnVector3 vPQRdot; FGColumnVector3 vPQRi;
FGColumnVector3 vPQRidot;
FGColumnVector3 vUVW; FGColumnVector3 vUVW;
FGColumnVector3 vUVWdot; FGColumnVector3 vUVWdot;
FGColumnVector3 vVel; FGColumnVector3 vVel;