diff options
| author | Lorenz Meier <lm@qgroundcontrol.org> | 2014-12-02 11:19:03 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@qgroundcontrol.org> | 2014-12-02 11:19:03 +0100 |
| commit | b4da5afcce1b1b4806d4583ee04ad126bbba8e01 (patch) | |
| tree | d5a0f4da41f109018cff31921ee8c0daa754d929 /src/modules | |
| parent | 032ca98e9e72a71e05f4f177a87d63096c58c7ca (diff) | |
| parent | 45c52b51ee84bead9562a51a4d410fcbe921e798 (diff) | |
| download | px4-firmware-b4da5afcce1b1b4806d4583ee04ad126bbba8e01.tar.gz px4-firmware-b4da5afcce1b1b4806d4583ee04ad126bbba8e01.tar.bz2 px4-firmware-b4da5afcce1b1b4806d4583ee04ad126bbba8e01.zip | |
Merge pull request #1479 from AndreasAntener/accel-calibration-fix
Accel calibration fix
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/commander/accelerometer_calibration.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/commander/accelerometer_calibration.cpp b/src/modules/commander/accelerometer_calibration.cpp index 0cb41489f..d4cd97be6 100644 --- a/src/modules/commander/accelerometer_calibration.cpp +++ b/src/modules/commander/accelerometer_calibration.cpp @@ -263,7 +263,7 @@ int do_accel_calibration_measurements(int mavlink_fd, float accel_offs[3], float const int samples_num = 2500; float accel_ref[6][3]; bool data_collected[6] = { false, false, false, false, false, false }; - const char *orientation_strs[6] = { "front", "back", "left", "right", "top", "bottom" }; + const char *orientation_strs[6] = { "back", "front", "left", "right", "up", "down" }; int sensor_combined_sub = orb_subscribe(ORB_ID(sensor_combined)); @@ -294,12 +294,12 @@ int do_accel_calibration_measurements(int mavlink_fd, float accel_offs[3], float /* inform user which axes are still needed */ mavlink_log_info(mavlink_fd, "pending: %s%s%s%s%s%s", - (!data_collected[0]) ? "front " : "", - (!data_collected[1]) ? "back " : "", + (!data_collected[5]) ? "down " : "", + (!data_collected[0]) ? "back " : "", + (!data_collected[1]) ? "front " : "", (!data_collected[2]) ? "left " : "", (!data_collected[3]) ? "right " : "", - (!data_collected[4]) ? "up " : "", - (!data_collected[5]) ? "down " : ""); + (!data_collected[4]) ? "up " : ""); /* allow user enough time to read the message */ sleep(3); |