fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 05:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

voted_senors_update: fix style after rebase

Browse Source
This commit is contained in:
Beat Küng
2016-12-14 19:57:54 +01:00
committed by Lorenz Meier
parent d4da626e78
commit 66925bc065
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sensors/voted_sensors_update.cpp
+10 -10
View File
@@ -617,13 +617,13 @@ bool VotedSensorsUpdate::check_failover(SensorData &sensor, const char *sensor_n
} else { } else {
mavlink_log_emergency(&_mavlink_log_pub, "%s #%i failover: %s%s%s%s%s!", mavlink_log_emergency(&_mavlink_log_pub, "%s #%i failover: %s%s%s%s%s!",
sensor_name, sensor_name,
sensor.voter.failover_index(), sensor.voter.failover_index(),
((flags & DataValidator::ERROR_FLAG_NO_DATA) ? " No data" : ""), ((flags & DataValidator::ERROR_FLAG_NO_DATA) ? " No data" : ""),
((flags & DataValidator::ERROR_FLAG_STALE_DATA) ? " Stale data" : ""), ((flags & DataValidator::ERROR_FLAG_STALE_DATA) ? " Stale data" : ""),
((flags & DataValidator::ERROR_FLAG_TIMEOUT) ? " Data timeout" : ""), ((flags & DataValidator::ERROR_FLAG_TIMEOUT) ? " Data timeout" : ""),
((flags & DataValidator::ERROR_FLAG_HIGH_ERRCOUNT) ? " High error count" : ""), ((flags & DataValidator::ERROR_FLAG_HIGH_ERRCOUNT) ? " High error count" : ""),
((flags & DataValidator::ERROR_FLAG_HIGH_ERRDENSITY) ? " High error density" : "")); ((flags & DataValidator::ERROR_FLAG_HIGH_ERRDENSITY) ? " High error density" : ""));
} }
sensor.last_failover_count = sensor.voter.failover_count(); sensor.last_failover_count = sensor.voter.failover_count();
@@ -648,9 +648,9 @@ bool VotedSensorsUpdate::check_vibration()
} else if (hrt_elapsed_time(&_vibration_warning_timestamp) > 10000 * 1000) { } else if (hrt_elapsed_time(&_vibration_warning_timestamp) > 10000 * 1000) {
_vibration_warning = true; _vibration_warning = true;
mavlink_log_critical(&_mavlink_log_pub, "HIGH VIBRATION! g: %d a: %d m: %d", mavlink_log_critical(&_mavlink_log_pub, "HIGH VIBRATION! g: %d a: %d m: %d",
(int)(100 * _gyro.voter.get_vibration_factor(cur_time)), (int)(100 * _gyro.voter.get_vibration_factor(cur_time)),
(int)(100 * _accel.voter.get_vibration_factor(cur_time)), (int)(100 * _accel.voter.get_vibration_factor(cur_time)),
(int)(100 * _mag.voter.get_vibration_factor(cur_time))); (int)(100 * _mag.voter.get_vibration_factor(cur_time)));
ret = true; ret = true;
} }