diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-20 16:26:15 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-20 16:26:15 +0200 |
| commit | 2a58929ffde494ba7db0bd09178545d5d650b420 (patch) | |
| tree | ccd9f8c3d5fa26ef06d8838250ee6465cdfa571a /src/modules | |
| parent | 230c09e2f44e0bcf8613815e2f771b4dffe8b042 (diff) | |
| parent | b7cc1c880f94138655696d7bd4a526fc218a4242 (diff) | |
| download | px4-firmware-2a58929ffde494ba7db0bd09178545d5d650b420.tar.gz px4-firmware-2a58929ffde494ba7db0bd09178545d5d650b420.tar.bz2 px4-firmware-2a58929ffde494ba7db0bd09178545d5d650b420.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/commander/accelerometer_calibration.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/modules/commander/accelerometer_calibration.c b/src/modules/commander/accelerometer_calibration.c index 6a304896a..fbb73d997 100644 --- a/src/modules/commander/accelerometer_calibration.c +++ b/src/modules/commander/accelerometer_calibration.c @@ -226,6 +226,12 @@ int do_accel_calibration_mesurements(int mavlink_fd, float accel_offs[3], float if (orient < 0) return ERROR; + if (data_collected[orient]) { + sprintf(str, "%s direction already measured, please rotate", orientation_strs[orient]); + mavlink_log_info(mavlink_fd, str); + continue; + } + sprintf(str, "meas started: %s", orientation_strs[orient]); mavlink_log_info(mavlink_fd, str); read_accelerometer_avg(sensor_combined_sub, &(accel_ref[orient][0]), samples_num); @@ -380,6 +386,8 @@ int read_accelerometer_avg(int sensor_combined_sub, float accel_avg[3], int samp int count = 0; float accel_sum[3] = { 0.0f, 0.0f, 0.0f }; + int errcount = 0; + while (count < samples_num) { int poll_ret = poll(fds, 1, 1000); if (poll_ret == 1) { @@ -389,8 +397,12 @@ int read_accelerometer_avg(int sensor_combined_sub, float accel_avg[3], int samp accel_sum[i] += sensor.accelerometer_m_s2[i]; count++; } else { - return ERROR; + errcount++; + continue; } + + if (errcount > samples_num / 10) + return ERROR; } for (int i = 0; i < 3; i++) { |