Browse Source

AP_Gimbal: change isCopterFlipped()

mission-4.1.18
Jonathan Challinger 10 years ago committed by Randy Mackay
parent
commit
231f776dd7
  1. 8
      libraries/AP_Mount/AP_Gimbal.cpp
  2. 2
      libraries/AP_Mount/AP_Gimbal.h

8
libraries/AP_Mount/AP_Gimbal.cpp

@ -10,7 +10,7 @@ void AP_Gimbal::receive_feedback(mavlink_channel_t chan, mavlink_message_t *msg) @@ -10,7 +10,7 @@ void AP_Gimbal::receive_feedback(mavlink_channel_t chan, mavlink_message_t *msg)
{
decode_feedback(msg);
update_state();
if (_ekf.getStatus() && !isCopterFliped() && _gimbalParams.K_gimbalRate!=0.0f){
if (_ekf.getStatus() && !isCopterFlipped() && _gimbalParams.K_gimbalRate!=0.0f){
send_control(chan);
}
@ -184,6 +184,6 @@ Vector3f AP_Gimbal::getGimbalEstimateEF() @@ -184,6 +184,6 @@ Vector3f AP_Gimbal::getGimbalEstimateEF()
return eulerEst;
}
uint8_t AP_Gimbal::isCopterFliped(){
return fabs(_ahrs.roll)>1.0f || fabs(_ahrs.pitch)>1.0f;
}
uint8_t AP_Gimbal::isCopterFlipped(){
return _ahrs.cos_roll()*_ahrs.cos_pitch() < 0.5f;
}

2
libraries/AP_Mount/AP_Gimbal.h

@ -80,7 +80,7 @@ private: @@ -80,7 +80,7 @@ private:
void update_state();
void decode_feedback(mavlink_message_t *msg);
uint8_t isCopterFliped();
uint8_t isCopterFlipped();
// Control loop functions
Vector3f getGimbalRateDemVecYaw(const Quaternion &quatEst);

Loading…
Cancel
Save