From 0f6762bbd2345b98d727e2feee89da191467471e Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Sat, 27 Jan 2018 15:40:46 +0900 Subject: [PATCH] Copter: PSC_ACCZ param name shortened --- ArduCopter/AP_Arming.cpp | 4 ++-- ArduCopter/Parameters.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ArduCopter/AP_Arming.cpp b/ArduCopter/AP_Arming.cpp index c687d6e5f5..ccdeb60a40 100644 --- a/ArduCopter/AP_Arming.cpp +++ b/ArduCopter/AP_Arming.cpp @@ -266,10 +266,10 @@ bool AP_Arming_Copter::parameter_checks(bool display_failure) parameter_checks_pid_warning_message(display_failure, "PSC_VELZ_P"); return false; } else if (is_zero(copter.pos_control->get_accel_z_pid().kP())) { - parameter_checks_pid_warning_message(display_failure, "PSC_ACCELZ_P"); + parameter_checks_pid_warning_message(display_failure, "PSC_ACCZ_P"); return false; } else if (is_zero(copter.pos_control->get_accel_z_pid().kI())) { - parameter_checks_pid_warning_message(display_failure, "PSC_ACCELZ_I"); + parameter_checks_pid_warning_message(display_failure, "PSC_ACCZ_I"); return false; } else if (is_zero(copter.attitude_control->get_rate_roll_pid().kP()) && is_zero(copter.attitude_control->get_rate_roll_pid().ff())) { parameter_checks_pid_warning_message(display_failure, "ATC_RAT_RLL_P"); diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp index df788f36f7..7f44580146 100644 --- a/ArduCopter/Parameters.cpp +++ b/ArduCopter/Parameters.cpp @@ -1086,11 +1086,11 @@ void Copter::convert_pid_parameters(void) { Parameters::k_param_pi_vel_xy, 2, AP_PARAM_FLOAT, "PSC_VELXY_IMAX" }, { Parameters::k_param_pi_vel_xy, 3, AP_PARAM_FLOAT, "PSC_VELXY_FILT" }, { Parameters::k_param_p_vel_z, 0, AP_PARAM_FLOAT, "PSC_VELZ_P" }, - { Parameters::k_param_pid_accel_z, 0, AP_PARAM_FLOAT, "PSC_ACCELZ_P" }, - { Parameters::k_param_pid_accel_z, 1, AP_PARAM_FLOAT, "PSC_ACCELZ_I" }, - { Parameters::k_param_pid_accel_z, 2, AP_PARAM_FLOAT, "PSC_ACCELZ_D" }, - { Parameters::k_param_pid_accel_z, 5, AP_PARAM_FLOAT, "PSC_ACCELZ_IMAX" }, - { Parameters::k_param_pid_accel_z, 6, AP_PARAM_FLOAT, "PSC_ACCELZ_FILT" }, + { Parameters::k_param_pid_accel_z, 0, AP_PARAM_FLOAT, "PSC_ACCZ_P" }, + { Parameters::k_param_pid_accel_z, 1, AP_PARAM_FLOAT, "PSC_ACCZ_I" }, + { Parameters::k_param_pid_accel_z, 2, AP_PARAM_FLOAT, "PSC_ACCZ_D" }, + { Parameters::k_param_pid_accel_z, 5, AP_PARAM_FLOAT, "PSC_ACCZ_IMAX" }, + { Parameters::k_param_pid_accel_z, 6, AP_PARAM_FLOAT, "PSC_ACCZ_FILT" }, { Parameters::k_param_p_alt_hold, 0, AP_PARAM_FLOAT, "PSC_POSZ_P" }, { Parameters::k_param_p_pos_xy, 0, AP_PARAM_FLOAT, "PSC_POSXY_P" }, };