dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

commander: cherry-pick fixes

This commit is contained in:
Julian Oes 2016-03-22 17:20:28 +01:00
parent 37a1f6ea8d
commit 790fa7667c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/commander/accelerometer_calibration.cpp
View File

@ -440,7 +440,7 @@ calibrate_return do_accel_calibration_measurements(int mavlink_fd, float (&accel
device_id_primary = device_id[i];
}
} else {
mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Accel #%u no device id, abort", i);
mavlink_and_console_log_critical(mavlink_fd, "[cal] Accel #%u no device id, abort", i);
result = calibrate_return_error;
break;
}

2
src/modules/commander/gyro_calibration.cpp
View File

@ -256,7 +256,7 @@ int do_gyro_calibration(int mavlink_fd)
device_id_primary = worker_data.device_id[s];
}
} else {
mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Gyro #%u no device id, abort", s);
mavlink_and_console_log_critical(mavlink_fd, "[cal] Gyro #%u no device id, abort", s);
}
}

4
src/modules/commander/mag_calibration.cpp
View File

@ -483,7 +483,7 @@ calibrate_return mag_calibrate_all(int mavlink_fd, int32_t (&device_ids)[max_mag
device_ids[cur_mag] = mag_report.device_id;
#endif
if (worker_data.sub_mag[cur_mag] < 0) {
mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Mag #%u not found, abort", cur_mag);
mavlink_and_console_log_critical(mavlink_fd, "[cal] Mag #%u not found, abort", cur_mag);
result = calibrate_return_error;
break;
}
@ -498,7 +498,7 @@ calibrate_return mag_calibrate_all(int mavlink_fd, int32_t (&device_ids)[max_mag
device_id_primary = device_ids[cur_mag];
}
} else {
mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Mag #%u no device id, abort", cur_mag);
mavlink_and_console_log_critical(mavlink_fd, "[cal] Mag #%u no device id, abort", cur_mag);
result = calibrate_return_error;
break;
}