diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-25 12:54:46 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-25 12:54:46 +0200 |
| commit | 8595c734e646f22226672e0e06b6c38e0d80cb20 (patch) | |
| tree | 64b404dbaf62e584d110659eb58a4d29576c58e5 /src/modules/commander/PreflightCheck.cpp | |
| parent | 0b50c6c003c6069e70191dec1ad62d99c6419023 (diff) | |
| parent | c7ecafe99b6c6c567d9bd8ac223d5e20592644bc (diff) | |
| download | px4-firmware-8595c734e646f22226672e0e06b6c38e0d80cb20.tar.gz px4-firmware-8595c734e646f22226672e0e06b6c38e0d80cb20.tar.bz2 px4-firmware-8595c734e646f22226672e0e06b6c38e0d80cb20.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/modules/commander/PreflightCheck.cpp')
| -rw-r--r-- | src/modules/commander/PreflightCheck.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/commander/PreflightCheck.cpp b/src/modules/commander/PreflightCheck.cpp index 6bb7e5c24..b0a587762 100644 --- a/src/modules/commander/PreflightCheck.cpp +++ b/src/modules/commander/PreflightCheck.cpp @@ -93,7 +93,7 @@ static bool magnometerCheck(int mavlink_fd, unsigned instance, bool optional) if (devid != calibration_devid) { mavlink_and_console_log_critical(mavlink_fd, - "PREFLIGHT FAIL: MAG #%u UNCALIBRATED (NO ID)", instance); + "PREFLIGHT FAIL: MAG #%u UNCALIBRATED", instance); success = false; goto out; } @@ -137,7 +137,7 @@ static bool accelerometerCheck(int mavlink_fd, unsigned instance, bool optional, if (devid != calibration_devid) { mavlink_and_console_log_critical(mavlink_fd, - "PREFLIGHT FAIL: ACCEL #%u UNCALIBRATED (NO ID)", instance); + "PREFLIGHT FAIL: ACCEL #%u UNCALIBRATED", instance); success = false; goto out; } @@ -161,7 +161,7 @@ static bool accelerometerCheck(int mavlink_fd, unsigned instance, bool optional, float accel_magnitude = sqrtf(acc.x * acc.x + acc.y * acc.y + acc.z * acc.z); if (accel_magnitude < 4.0f || accel_magnitude > 15.0f /* m/s^2 */) { - mavlink_and_console_log_critical(mavlink_fd, "PREFLIGHT FAIL: ACCEL RANGE, hold still"); + mavlink_and_console_log_critical(mavlink_fd, "PREFLIGHT FAIL: ACCEL RANGE, hold still on arming"); /* this is frickin' fatal */ success = false; goto out; @@ -204,7 +204,7 @@ static bool gyroCheck(int mavlink_fd, unsigned instance, bool optional) if (devid != calibration_devid) { mavlink_and_console_log_critical(mavlink_fd, - "PREFLIGHT FAIL: GYRO #%u UNCALIBRATED (NO ID)", instance); + "PREFLIGHT FAIL: GYRO #%u UNCALIBRATED", instance); success = false; goto out; } |