From 1fc9b99307ac4db988bfd1bce29885b3446ae650 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Tue, 22 Mar 2016 17:29:58 +0100 Subject: [PATCH] commander: some rebase fixes --- src/modules/commander/accelerometer_calibration.cpp | 2 +- src/modules/commander/gyro_calibration.cpp | 2 +- src/modules/commander/mag_calibration.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/commander/accelerometer_calibration.cpp b/src/modules/commander/accelerometer_calibration.cpp index 289450a5f6..ea5136221f 100644 --- a/src/modules/commander/accelerometer_calibration.cpp +++ b/src/modules/commander/accelerometer_calibration.cpp @@ -440,7 +440,7 @@ calibrate_return do_accel_calibration_measurements(orb_advert_t *mavlink_log_pub device_id_primary = device_id[i]; } } else { - mavlink_and_console_log_critical(mavlink_fd, "[cal] Accel #%u no device id, abort", i); + mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Accel #%u no device id, abort", i); result = calibrate_return_error; break; } diff --git a/src/modules/commander/gyro_calibration.cpp b/src/modules/commander/gyro_calibration.cpp index ead70925ee..6684bb88c5 100644 --- a/src/modules/commander/gyro_calibration.cpp +++ b/src/modules/commander/gyro_calibration.cpp @@ -256,7 +256,7 @@ int do_gyro_calibration(orb_advert_t *mavlink_log_pub) device_id_primary = worker_data.device_id[s]; } } else { - mavlink_and_console_log_critical(mavlink_fd, "[cal] Gyro #%u no device id, abort", s); + mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Gyro #%u no device id, abort", s); } } diff --git a/src/modules/commander/mag_calibration.cpp b/src/modules/commander/mag_calibration.cpp index f4692589dc..8b72f85b3c 100644 --- a/src/modules/commander/mag_calibration.cpp +++ b/src/modules/commander/mag_calibration.cpp @@ -483,7 +483,7 @@ calibrate_return mag_calibrate_all(orb_advert_t *mavlink_log_pub, int32_t (&devi device_ids[cur_mag] = mag_report.device_id; #endif if (worker_data.sub_mag[cur_mag] < 0) { - mavlink_and_console_log_critical(mavlink_fd, "[cal] Mag #%u not found, abort", cur_mag); + mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Mag #%u not found, abort", cur_mag); result = calibrate_return_error; break; } @@ -498,7 +498,7 @@ calibrate_return mag_calibrate_all(orb_advert_t *mavlink_log_pub, int32_t (&devi device_id_primary = device_ids[cur_mag]; } } else { - mavlink_and_console_log_critical(mavlink_fd, "[cal] Mag #%u no device id, abort", cur_mag); + mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Mag #%u no device id, abort", cur_mag); result = calibrate_return_error; break; }