|
|
@ -215,7 +215,7 @@ void Copter::send_pid_tuning(mavlink_channel_t chan) |
|
|
|
const Vector3f &gyro = ahrs.get_gyro(); |
|
|
|
const Vector3f &gyro = ahrs.get_gyro(); |
|
|
|
if (g.gcs_pid_mask & 1) { |
|
|
|
if (g.gcs_pid_mask & 1) { |
|
|
|
const DataFlash_Class::PID_Info &pid_info = attitude_control->get_rate_roll_pid().get_pid_info(); |
|
|
|
const DataFlash_Class::PID_Info &pid_info = attitude_control->get_rate_roll_pid().get_pid_info(); |
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_ROLL,
|
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_ROLL, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
degrees(gyro.x), |
|
|
|
degrees(gyro.x), |
|
|
|
pid_info.FF*0.01f, |
|
|
|
pid_info.FF*0.01f, |
|
|
@ -228,7 +228,7 @@ void Copter::send_pid_tuning(mavlink_channel_t chan) |
|
|
|
} |
|
|
|
} |
|
|
|
if (g.gcs_pid_mask & 2) { |
|
|
|
if (g.gcs_pid_mask & 2) { |
|
|
|
const DataFlash_Class::PID_Info &pid_info = attitude_control->get_rate_pitch_pid().get_pid_info(); |
|
|
|
const DataFlash_Class::PID_Info &pid_info = attitude_control->get_rate_pitch_pid().get_pid_info(); |
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_PITCH,
|
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_PITCH, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
degrees(gyro.y), |
|
|
|
degrees(gyro.y), |
|
|
|
pid_info.FF*0.01f, |
|
|
|
pid_info.FF*0.01f, |
|
|
@ -241,7 +241,7 @@ void Copter::send_pid_tuning(mavlink_channel_t chan) |
|
|
|
} |
|
|
|
} |
|
|
|
if (g.gcs_pid_mask & 4) { |
|
|
|
if (g.gcs_pid_mask & 4) { |
|
|
|
const DataFlash_Class::PID_Info &pid_info = attitude_control->get_rate_yaw_pid().get_pid_info(); |
|
|
|
const DataFlash_Class::PID_Info &pid_info = attitude_control->get_rate_yaw_pid().get_pid_info(); |
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_YAW,
|
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_YAW, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
degrees(gyro.z), |
|
|
|
degrees(gyro.z), |
|
|
|
pid_info.FF*0.01f, |
|
|
|
pid_info.FF*0.01f, |
|
|
@ -254,7 +254,7 @@ void Copter::send_pid_tuning(mavlink_channel_t chan) |
|
|
|
} |
|
|
|
} |
|
|
|
if (g.gcs_pid_mask & 8) { |
|
|
|
if (g.gcs_pid_mask & 8) { |
|
|
|
const DataFlash_Class::PID_Info &pid_info = copter.pos_control->get_accel_z_pid().get_pid_info(); |
|
|
|
const DataFlash_Class::PID_Info &pid_info = copter.pos_control->get_accel_z_pid().get_pid_info(); |
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_ACCZ,
|
|
|
|
mavlink_msg_pid_tuning_send(chan, PID_TUNING_ACCZ, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
pid_info.desired*0.01f, |
|
|
|
-(ahrs.get_accel_ef_blended().z + GRAVITY_MSS), |
|
|
|
-(ahrs.get_accel_ef_blended().z + GRAVITY_MSS), |
|
|
|
pid_info.FF*0.01f, |
|
|
|
pid_info.FF*0.01f, |
|
|
@ -413,7 +413,7 @@ bool GCS_MAVLINK_Copter::try_send_message(enum ap_message id) |
|
|
|
|
|
|
|
|
|
|
|
case MSG_MOUNT_STATUS: |
|
|
|
case MSG_MOUNT_STATUS: |
|
|
|
#if MOUNT == ENABLED |
|
|
|
#if MOUNT == ENABLED |
|
|
|
CHECK_PAYLOAD_SIZE(MOUNT_STATUS);
|
|
|
|
CHECK_PAYLOAD_SIZE(MOUNT_STATUS); |
|
|
|
copter.camera_mount.status_msg(chan); |
|
|
|
copter.camera_mount.status_msg(chan); |
|
|
|
#endif // MOUNT == ENABLED
|
|
|
|
#endif // MOUNT == ENABLED
|
|
|
|
break; |
|
|
|
break; |
|
|
|