From f30e01ec026d2c908682b80049c565446682d360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Thu, 28 Nov 2019 10:14:23 +0100 Subject: [PATCH] calibration: shorten too long messages --- src/modules/commander/accelerometer_calibration.cpp | 4 ++-- src/modules/commander/airspeed_calibration.cpp | 6 +++--- src/modules/commander/calibration_messages.h | 4 ++-- src/modules/commander/gyro_calibration.cpp | 2 +- src/modules/commander/mag_calibration.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/commander/accelerometer_calibration.cpp b/src/modules/commander/accelerometer_calibration.cpp index 4328a4211c..319744bbb2 100644 --- a/src/modules/commander/accelerometer_calibration.cpp +++ b/src/modules/commander/accelerometer_calibration.cpp @@ -414,7 +414,7 @@ int do_accel_calibration(orb_advert_t *mavlink_log_pub) failed |= (PX4_OK != param_set_no_notification(param_find(str), &(device_id[uorb_index]))); if (failed) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG, uorb_index); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG); return PX4_ERROR; } @@ -432,7 +432,7 @@ int do_accel_calibration(orb_advert_t *mavlink_log_pub) } if (res != PX4_OK) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_APPLY_CAL_MSG, uorb_index); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_APPLY_CAL_MSG); } #endif diff --git a/src/modules/commander/airspeed_calibration.cpp b/src/modules/commander/airspeed_calibration.cpp index 98f816b48a..043e91cef5 100644 --- a/src/modules/commander/airspeed_calibration.cpp +++ b/src/modules/commander/airspeed_calibration.cpp @@ -115,7 +115,7 @@ int do_airspeed_calibration(orb_advert_t *mavlink_log_pub) /* set scaling offset parameter */ if (param_set(param_find("SENS_DPRES_OFF"), &(diff_pres_offset))) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG, 1); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG); goto error_return; } } @@ -186,7 +186,7 @@ int do_airspeed_calibration(orb_advert_t *mavlink_log_pub) } if (param_set(param_find("SENS_DPRES_OFF"), &(diff_pres_offset))) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG, 1); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG); goto error_return; } @@ -237,7 +237,7 @@ int do_airspeed_calibration(orb_advert_t *mavlink_log_pub) diff_pres_offset = 0.0f; if (param_set(param_find("SENS_DPRES_OFF"), &(diff_pres_offset))) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG, 1); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG); goto error_return; } diff --git a/src/modules/commander/calibration_messages.h b/src/modules/commander/calibration_messages.h index cfbd87329e..0c7cda1417 100644 --- a/src/modules/commander/calibration_messages.h +++ b/src/modules/commander/calibration_messages.h @@ -61,7 +61,7 @@ #define CAL_ERROR_SENSOR_MSG "[cal] calibration failed: reading sensor" #define CAL_ERROR_RESET_CAL_MSG "[cal] calibration failed: to reset, sensor %u" -#define CAL_ERROR_APPLY_CAL_MSG "[cal] calibration failed: to apply calibration, sensor %u" -#define CAL_ERROR_SET_PARAMS_MSG "[cal] calibration failed: to set parameters, sensor %u" +#define CAL_ERROR_APPLY_CAL_MSG "[cal] calibration failed: to apply calibration" +#define CAL_ERROR_SET_PARAMS_MSG "[cal] calibration failed: to set parameters" #endif /* CALIBRATION_MESSAGES_H_ */ diff --git a/src/modules/commander/gyro_calibration.cpp b/src/modules/commander/gyro_calibration.cpp index 6a7fedce7b..36c5e4b1c4 100644 --- a/src/modules/commander/gyro_calibration.cpp +++ b/src/modules/commander/gyro_calibration.cpp @@ -487,7 +487,7 @@ int do_gyro_calibration(orb_advert_t *mavlink_log_pub) px4_close(fd); if (res != PX4_OK) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_APPLY_CAL_MSG, 1); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_APPLY_CAL_MSG); } #endif diff --git a/src/modules/commander/mag_calibration.cpp b/src/modules/commander/mag_calibration.cpp index cbd1592178..9deea64a69 100644 --- a/src/modules/commander/mag_calibration.cpp +++ b/src/modules/commander/mag_calibration.cpp @@ -840,7 +840,7 @@ calibrate_return mag_calibrate_all(orb_advert_t *mavlink_log_pub) #ifdef __PX4_NUTTX if (px4_ioctl(fd_mag, MAGIOCSSCALE, (long unsigned int)&mscale) != PX4_OK) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_APPLY_CAL_MSG, cur_mag); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_APPLY_CAL_MSG); result = calibrate_return_error; } @@ -881,7 +881,7 @@ calibrate_return mag_calibrate_all(orb_advert_t *mavlink_log_pub) #endif if (failed) { - calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG, cur_mag); + calibration_log_critical(mavlink_log_pub, CAL_ERROR_SET_PARAMS_MSG); result = calibrate_return_error; } else {