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

Validation: Whitespace fixes

Browse Source
This commit is contained in:
Lorenz Meier
2016-12-17 13:45:28 +01:00
committed by Lorenz Meier
parent 10c6ae77ae
commit 6282c72d2e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
validation/data_validator.h
+4 -4
View File
@@ -101,13 +101,13 @@ public:
* @return the stored priority * @return the stored priority
*/ */
int priority() { return (_priority); } int priority() { return (_priority); }
/** /**
* Get the error state of this validator * Get the error state of this validator
* @return the bitmask with the error status * @return the bitmask with the error status
*/ */
uint32_t state() { return _error_mask; } uint32_t state() { return _error_mask; }
/** /**
* Reset the error state of this validator * Reset the error state of this validator
*/ */
@@ -144,9 +144,9 @@ public:
* @return The timeout interval in microseconds * @return The timeout interval in microseconds
*/ */
uint32_t get_timeout() const { return _timeout_interval; } uint32_t get_timeout() const { return _timeout_interval; }
/** /**
* Data validator error states * Data validator error states
*/ */
static constexpr uint32_t ERROR_FLAG_NO_ERROR = (0x00000000U); static constexpr uint32_t ERROR_FLAG_NO_ERROR = (0x00000000U);
static constexpr uint32_t ERROR_FLAG_NO_DATA = (0x00000001U); static constexpr uint32_t ERROR_FLAG_NO_DATA = (0x00000001U);
validation/data_validator_group.cpp
+5 -5
View File
@@ -252,7 +252,7 @@ DataValidatorGroup::print()
while (next != nullptr) { while (next != nullptr) {
if (next->used()) { if (next->used()) {
uint32_t flags = next->state(); uint32_t flags = next->state();
ECL_INFO("sensor #%u, prio: %d, state:%s%s%s%s%s%s", i, next->priority(), ECL_INFO("sensor #%u, prio: %d, state:%s%s%s%s%s%s", i, next->priority(),
((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" : ""),
@@ -260,7 +260,7 @@ DataValidatorGroup::print()
((flags & DataValidator::ERROR_FLAG_HIGH_ERRCOUNT) ? " HIGH_ERRCOUNT" : ""), ((flags & DataValidator::ERROR_FLAG_HIGH_ERRCOUNT) ? " HIGH_ERRCOUNT" : ""),
((flags & DataValidator::ERROR_FLAG_HIGH_ERRDENSITY) ? " HIGH_ERRDENSITY" : ""), ((flags & DataValidator::ERROR_FLAG_HIGH_ERRDENSITY) ? " HIGH_ERRDENSITY" : ""),
((flags == DataValidator::ERROR_FLAG_NO_ERROR) ? " OK" : "")); ((flags == DataValidator::ERROR_FLAG_NO_ERROR) ? " OK" : ""));
next->print(); next->print();
} }
next = next->sibling(); next = next->sibling();
@@ -279,7 +279,7 @@ DataValidatorGroup::failover_index()
{ {
DataValidator *next = _first; DataValidator *next = _first;
unsigned i = 0; unsigned i = 0;
while (next != nullptr) { while (next != nullptr) {
if (next->used() && (next->state() != DataValidator::ERROR_FLAG_NO_ERROR) && (i == (unsigned)_prev_best)) { if (next->used() && (next->state() != DataValidator::ERROR_FLAG_NO_ERROR) && (i == (unsigned)_prev_best)) {
return i; return i;
@@ -292,10 +292,10 @@ DataValidatorGroup::failover_index()
uint32_t uint32_t
DataValidatorGroup::failover_state() DataValidatorGroup::failover_state()
{ {
DataValidator *next = _first; DataValidator *next = _first;
unsigned i = 0; unsigned i = 0;
while (next != nullptr) { while (next != nullptr) {
if (next->used() && (next->state() != DataValidator::ERROR_FLAG_NO_ERROR) && (i == (unsigned)_prev_best)) { if (next->used() && (next->state() != DataValidator::ERROR_FLAG_NO_ERROR) && (i == (unsigned)_prev_best)) {
return next->state(); return next->state();
validation/data_validator_group.h
+2 -2
View File
@@ -96,14 +96,14 @@ public:
* @return the number of failovers * @return the number of failovers
*/ */
unsigned failover_count(); unsigned failover_count();
/** /**
* Get the index of the failed sensor in the group * Get the index of the failed sensor in the group
* *
* @return index of the failed sensor * @return index of the failed sensor
*/ */
int failover_index(); int failover_index();
/** /**
* Get the error state of the failed sensor in the group * Get the error state of the failed sensor in the group
* *