Merge branch 'release_v1.0.0'

This commit is contained in:
Lorenz Meier
2015-05-22 07:24:57 +02:00
4 changed files with 28 additions and 17 deletions

View File

@@ -559,7 +559,7 @@ calibrate_return calculate_calibration_values(unsigned sensor, float (&accel_ref
int do_level_calibration(int mavlink_fd) {
const unsigned cal_time = 5;
const unsigned cal_hz = 250;
const unsigned cal_hz = 100;
const unsigned settle_time = 30;
int att_sub = orb_subscribe(ORB_ID(vehicle_attitude));
struct vehicle_attitude_s att;
@@ -614,6 +614,8 @@ int do_level_calibration(int mavlink_fd) {
pitch_mean /= counter;
} else {
mavlink_and_console_log_info(mavlink_fd, "not enough measurements taken");
success = false;
goto out;
}
if (fabsf(roll_mean) > 0.8f ) {
@@ -628,6 +630,7 @@ int do_level_calibration(int mavlink_fd) {
success = true;
}
out:
if (success) {
mavlink_and_console_log_info(mavlink_fd, CAL_QGC_DONE_MSG, "level");
return 0;