Merged master into ekf_params

This commit is contained in:
Lorenz Meier
2014-04-26 15:19:21 +02:00
6 changed files with 26 additions and 19 deletions
@@ -837,21 +837,21 @@ FixedwingEstimator::task_main()
case 1:
{
const char* str = "NaN in states, resetting";
warnx("%s%s", ekfname, str);
warnx("%s", str);
mavlink_log_critical(_mavlink_fd, "%s%s", ekfname, str);
break;
}
case 2:
{
const char* str = "stale IMU data, resetting";
warnx("%s%s", ekfname, str);
warnx("%s", str);
mavlink_log_critical(_mavlink_fd, "%s%s", ekfname, str);
break;
}
case 3:
{
const char* str = "switching to dynamic state";
warnx("%s%s", ekfname, str);
warnx("%s", str);
mavlink_log_critical(_mavlink_fd, "%s%s", ekfname, str);
break;
}
@@ -859,7 +859,7 @@ FixedwingEstimator::task_main()
default:
{
const char* str = "unknown reset condition";
warnx("%s%s", ekfname, str);
warnx("%s", str);
mavlink_log_critical(_mavlink_fd, "%s%s", ekfname, str);
}
}