Browse Source

Rover: position_target_global_int() remove rotating yaw for MAV_BODY_FRAMES

gps-1.3.1
Josh Henderson 3 years ago committed by Randy Mackay
parent
commit
6c25a8e628
  1. 10
      Rover/GCS_Mavlink.cpp

10
Rover/GCS_Mavlink.cpp

@ -1001,21 +1001,13 @@ void GCS_MAVLINK_Rover::handle_set_position_target_global_int(const mavlink_mess
target_speed = constrain_float(safe_sqrt(sq(packet.vx) + sq(packet.vy)), -speed_max, speed_max); target_speed = constrain_float(safe_sqrt(sq(packet.vx) + sq(packet.vy)), -speed_max, speed_max);
// convert vector direction to target yaw // convert vector direction to target yaw
target_yaw_cd = degrees(atan2f(packet.vy, packet.vx)) * 100.0f; target_yaw_cd = degrees(atan2f(packet.vy, packet.vx)) * 100.0f;
// rotate target yaw if provided in body-frame
if (packet.coordinate_frame == MAV_FRAME_BODY_NED || packet.coordinate_frame == MAV_FRAME_BODY_OFFSET_NED) {
target_yaw_cd = wrap_180_cd(target_yaw_cd + rover.ahrs.yaw_sensor);
}
} }
// consume yaw heading // consume yaw heading
if (!yaw_ignore) { if (!yaw_ignore) {
target_yaw_cd = ToDeg(packet.yaw) * 100.0f; target_yaw_cd = ToDeg(packet.yaw) * 100.0f;
// rotate target yaw if provided in body-frame
if (packet.coordinate_frame == MAV_FRAME_BODY_NED || packet.coordinate_frame == MAV_FRAME_BODY_OFFSET_NED) {
target_yaw_cd = wrap_180_cd(target_yaw_cd + rover.ahrs.yaw_sensor);
}
} }
// consume yaw rate // consume yaw rate
float target_turn_rate_cds = 0.0f; float target_turn_rate_cds = 0.0f;
if (!yaw_rate_ignore) { if (!yaw_rate_ignore) {

Loading…
Cancel
Save