From 5e855c67477fe08517297a38e718ed1102536cf6 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 16 Nov 2020 11:48:07 -0500 Subject: [PATCH] commander: preflightcheck and calibration remove hash (#) from mavlink message - QGroundControl is reading these as "Hash" and I don't think it's ambiguous if removed --- .../PreFlightCheck/checks/accelerometerCheck.cpp | 6 +++--- .../Arming/PreFlightCheck/checks/baroCheck.cpp | 4 ++-- .../Arming/PreFlightCheck/checks/gyroCheck.cpp | 6 +++--- .../Arming/PreFlightCheck/checks/magnetometerCheck.cpp | 6 +++--- src/modules/commander/mag_calibration.cpp | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/modules/commander/Arming/PreFlightCheck/checks/accelerometerCheck.cpp b/src/modules/commander/Arming/PreFlightCheck/checks/accelerometerCheck.cpp index b56dd3c26e..b762e66ed5 100644 --- a/src/modules/commander/Arming/PreFlightCheck/checks/accelerometerCheck.cpp +++ b/src/modules/commander/Arming/PreFlightCheck/checks/accelerometerCheck.cpp @@ -59,7 +59,7 @@ bool PreFlightCheck::accelerometerCheck(orb_advert_t *mavlink_log_pub, vehicle_s if (!valid) { if (report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Accel #%u", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Accel %u", instance); } } @@ -69,7 +69,7 @@ bool PreFlightCheck::accelerometerCheck(orb_advert_t *mavlink_log_pub, vehicle_s if (!calibration_valid) { if (report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Accel #%u uncalibrated", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Accel %u uncalibrated", instance); } } else { @@ -89,7 +89,7 @@ bool PreFlightCheck::accelerometerCheck(orb_advert_t *mavlink_log_pub, vehicle_s } else { if (!optional && report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Accel Sensor #%u missing", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Accel Sensor %u missing", instance); } } diff --git a/src/modules/commander/Arming/PreFlightCheck/checks/baroCheck.cpp b/src/modules/commander/Arming/PreFlightCheck/checks/baroCheck.cpp index ffc195a405..00d48d7c72 100644 --- a/src/modules/commander/Arming/PreFlightCheck/checks/baroCheck.cpp +++ b/src/modules/commander/Arming/PreFlightCheck/checks/baroCheck.cpp @@ -55,13 +55,13 @@ bool PreFlightCheck::baroCheck(orb_advert_t *mavlink_log_pub, vehicle_status_s & if (!valid) { if (report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Baro #%u", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Baro %u", instance); } } } else { if (!optional && report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Baro Sensor #%u missing", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Baro Sensor %u missing", instance); } } diff --git a/src/modules/commander/Arming/PreFlightCheck/checks/gyroCheck.cpp b/src/modules/commander/Arming/PreFlightCheck/checks/gyroCheck.cpp index 16823b8890..47477b26cc 100644 --- a/src/modules/commander/Arming/PreFlightCheck/checks/gyroCheck.cpp +++ b/src/modules/commander/Arming/PreFlightCheck/checks/gyroCheck.cpp @@ -58,7 +58,7 @@ bool PreFlightCheck::gyroCheck(orb_advert_t *mavlink_log_pub, vehicle_status_s & if (!valid) { if (report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Gyro #%u", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Gyro %u", instance); } } @@ -68,13 +68,13 @@ bool PreFlightCheck::gyroCheck(orb_advert_t *mavlink_log_pub, vehicle_status_s & if (!calibration_valid) { if (report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Gyro #%u uncalibrated", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Gyro %u uncalibrated", instance); } } } else { if (!optional && report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Gyro Sensor #%u missing", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Gyro Sensor %u missing", instance); } } diff --git a/src/modules/commander/Arming/PreFlightCheck/checks/magnetometerCheck.cpp b/src/modules/commander/Arming/PreFlightCheck/checks/magnetometerCheck.cpp index d29ae269c9..7177cb746b 100644 --- a/src/modules/commander/Arming/PreFlightCheck/checks/magnetometerCheck.cpp +++ b/src/modules/commander/Arming/PreFlightCheck/checks/magnetometerCheck.cpp @@ -58,7 +58,7 @@ bool PreFlightCheck::magnetometerCheck(orb_advert_t *mavlink_log_pub, vehicle_st if (!valid) { if (report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Compass #%u", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: no valid data from Compass %u", instance); } } @@ -68,13 +68,13 @@ bool PreFlightCheck::magnetometerCheck(orb_advert_t *mavlink_log_pub, vehicle_st if (!calibration_valid) { if (report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Compass #%u uncalibrated", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Compass %u uncalibrated", instance); } } } else { if (!optional && report_fail) { - mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Compass Sensor #%u missing", instance); + mavlink_log_critical(mavlink_log_pub, "Preflight Fail: Compass Sensor %u missing", instance); } } diff --git a/src/modules/commander/mag_calibration.cpp b/src/modules/commander/mag_calibration.cpp index 59ba29f8b0..0267458b18 100644 --- a/src/modules/commander/mag_calibration.cpp +++ b/src/modules/commander/mag_calibration.cpp @@ -185,14 +185,14 @@ static calibrate_return check_calibration_result(float offset_x, float offset_y, for (unsigned i = 0; i < num_finite; ++i) { if (!PX4_ISFINITE(must_be_finite[i])) { - calibration_log_emergency(mavlink_log_pub, "Retry calibration (sphere NaN, #%u)", cur_mag); + calibration_log_emergency(mavlink_log_pub, "Retry calibration (sphere NaN, %u)", cur_mag); return calibrate_return_error; } } // earth field between 0.25 and 0.65 Gauss if (sphere_radius < 0.2f || sphere_radius >= 0.7f) { - calibration_log_emergency(mavlink_log_pub, "Retry calibration (mag #%u sphere radius invaid %.3f)", cur_mag, + calibration_log_emergency(mavlink_log_pub, "Retry calibration (mag %u sphere radius invaid %.3f)", cur_mag, (double)sphere_radius); return calibrate_return_error; } @@ -202,7 +202,7 @@ static calibrate_return check_calibration_result(float offset_x, float offset_y, for (unsigned i = 0; i < num_positive; ++i) { if (should_be_positive[i] <= 0.0f) { - calibration_log_emergency(mavlink_log_pub, "Retry calibration (mag #%u with non-positive scale)", cur_mag); + calibration_log_emergency(mavlink_log_pub, "Retry calibration (mag %u with non-positive scale)", cur_mag); return calibrate_return_error; } } @@ -216,7 +216,7 @@ static calibrate_return check_calibration_result(float offset_x, float offset_y, static constexpr float MAG_MAX_OFFSET_LEN = 1.3f; if (fabsf(should_be_not_huge[i]) > MAG_MAX_OFFSET_LEN) { - calibration_log_critical(mavlink_log_pub, "Warning: mag (#%u) with large offsets", cur_mag); + calibration_log_critical(mavlink_log_pub, "Warning: mag %u with large offsets", cur_mag); break; } } @@ -599,7 +599,7 @@ calibrate_return mag_calibrate_all(orb_advert_t *mavlink_log_pub, int32_t cal_ma } if (!sphere_fit_success && !ellipsoid_fit_success) { - calibration_log_emergency(mavlink_log_pub, "Retry calibration (unable to fit mag #%u)", cur_mag); + calibration_log_emergency(mavlink_log_pub, "Retry calibration (unable to fit mag %u)", cur_mag); result = calibrate_return_error; break; }