diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-08-28 12:05:57 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-08-28 12:05:57 -0600 |
| commit | 1afcdb1f26d10f535e4467174688191b0194377e (patch) | |
| tree | ee4412dae28490fb4c1d38631c2fbee9cf44a480 /src/kernel/ao_sample.h | |
| parent | 5376d4c904de57e289f12ee201690deebe34164b (diff) | |
| parent | b1cf0dab1e28433e06ab02cec033951ea0149ea3 (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'src/kernel/ao_sample.h')
| -rw-r--r-- | src/kernel/ao_sample.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/kernel/ao_sample.h b/src/kernel/ao_sample.h index da40187b..fbef031d 100644 --- a/src/kernel/ao_sample.h +++ b/src/kernel/ao_sample.h @@ -95,7 +95,12 @@ typedef int16_t ao_v_t; /* * Above this speed, baro measurements are unreliable */ -#define AO_MAX_BARO_SPEED 200 +#define AO_MAX_BARO_SPEED 248 + +/* The maximum amount (in a range of 0-256) to de-rate the + * baro sensor data based on speed. + */ +#define AO_MAX_SPEED_DISTRUST 160 #define ACCEL_NOSE_UP (ao_accel_2g >> 2) @@ -175,7 +180,9 @@ extern __xdata ao_v_t ao_max_height; /* max of ao_height */ extern __xdata ao_v_t ao_avg_height; /* running average of height */ extern __pdata ao_v_t ao_error_h; +#if !HAS_ACCEL extern __pdata ao_v_t ao_error_h_sq_avg; +#endif #if HAS_ACCEL extern __pdata ao_v_t ao_error_a; |