Browse Source

AP_Mount: update gimbal for changed quaternion API

master
Andrew Tridgell 10 years ago
parent
commit
d96e62cce7
  1. 7
      libraries/AP_Mount/AP_Gimbal.cpp

7
libraries/AP_Mount/AP_Gimbal.cpp

@ -133,8 +133,7 @@ Vector3f AP_Gimbal::getGimbalRateDemVecYaw(const Quaternion &quatEst)
Vector3f AP_Gimbal::getGimbalRateDemVecTilt(const Quaternion &quatEst) Vector3f AP_Gimbal::getGimbalRateDemVecTilt(const Quaternion &quatEst)
{ {
// Calculate the gimbal 321 Euler angle estimates relative to earth frame // Calculate the gimbal 321 Euler angle estimates relative to earth frame
Vector3f eulerEst; Vector3f eulerEst = quatEst.to_vector312();
quatEst.to_vector312(eulerEst.x, eulerEst.y, eulerEst.z);
// Calculate a demanded quaternion using the demanded roll and pitch and estimated yaw (yaw is slaved to the vehicle) // Calculate a demanded quaternion using the demanded roll and pitch and estimated yaw (yaw is slaved to the vehicle)
Quaternion quatDem; Quaternion quatDem;
@ -202,9 +201,7 @@ Vector3f AP_Gimbal::getGimbalEstimateEF()
{ {
Quaternion quatEst; Quaternion quatEst;
_ekf.getQuat(quatEst); _ekf.getQuat(quatEst);
Vector3f eulerEst; return quatEst.to_vector312();
quatEst.to_vector312(eulerEst.x, eulerEst.y, eulerEst.z);
return eulerEst;
} }
bool AP_Gimbal::isCopterFlipped() bool AP_Gimbal::isCopterFlipped()

Loading…
Cancel
Save