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

data_validator cleanup: use dimensions variable, use static for some constants (#167)

Browse Source
This commit is contained in:
Beat Küng
2016-06-30 13:28:01 +02:00
committed by Lorenz Meier
parent 0cc0008927
commit 5e0a229ee8
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
validation/data_validator.h
+12 -11
View File
@@ -46,6 +46,8 @@
class __EXPORT DataValidator {
public:
static const unsigned dimensions = 3;
DataValidator(DataValidator *prev_sibling = nullptr);
virtual ~DataValidator();
@@ -61,7 +63,7 @@ public:
*
* @param val Item to put
*/
void put(uint64_t timestamp, float val[3], uint64_t error_count, int priority);
void put(uint64_t timestamp, float val[dimensions], uint64_t error_count, int priority);
/**
* Get the next sibling in the group
@@ -147,7 +149,6 @@ public:
static constexpr uint32_t ERROR_FLAG_HIGH_ERRDENSITY = (0x00000001U << 4);
private:
static const unsigned _dimensions = 3;
uint32_t _error_mask; /**< sensor error state */
uint64_t _time_last; /**< last timestamp */
uint64_t _timeout_interval; /**< interval in which the datastream times out in us */
@@ -155,17 +156,17 @@ private:
uint64_t _error_count; /**< error count */
int _error_density; /**< ratio between successful reads and errors */
int _priority; /**< sensor nominal priority */
float _mean[_dimensions]; /**< mean of value */
float _lp[3]; /**< low pass value */
float _M2[3]; /**< RMS component value */
float _rms[3]; /**< root mean square error */
float _value[3]; /**< last value */
float _vibe[3]; /**< vibration level, in sensor unit */
float _mean[dimensions]; /**< mean of value */
float _lp[dimensions]; /**< low pass value */
float _M2[dimensions]; /**< RMS component value */
float _rms[dimensions]; /**< root mean square error */
float _value[dimensions]; /**< last value */
float _vibe[dimensions]; /**< vibration level, in sensor unit */
float _value_equal_count; /**< equal values in a row */
DataValidator *_sibling; /**< sibling in the group */
const unsigned NORETURN_ERRCOUNT = 10000; /**< if the error count reaches this value, return sensor as invalid */
const float ERROR_DENSITY_WINDOW = 100.0f; /**< window in measurement counts for errors */
const unsigned VALUE_EQUAL_COUNT_MAX = 100; /**< if the sensor value is the same (accumulated also between axes) this many times, flag it */
static const constexpr unsigned NORETURN_ERRCOUNT = 10000; /**< if the error count reaches this value, return sensor as invalid */
static const constexpr float ERROR_DENSITY_WINDOW = 100.0f; /**< window in measurement counts for errors */
static const constexpr unsigned VALUE_EQUAL_COUNT_MAX = 100; /**< if the sensor value is the same (accumulated also between axes) this many times, flag it */
/* we don't want this class to be copied */
DataValidator(const DataValidator&);