projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Don't match product_altusmetrum for product_basestation or product_altimeter
[fw/altos]
/
src
/
core
/
ao_kalman.c
diff --git
a/src/core/ao_kalman.c
b/src/core/ao_kalman.c
index 59ffd8b27267f24c7165fb835d24815ba4af7907..7fd4f88992c09035e321b954b616819c85345379 100644
(file)
--- a/
src/core/ao_kalman.c
+++ b/
src/core/ao_kalman.c
@@
-40,9
+40,9
@@
static __pdata int32_t ao_k_accel;
__pdata int16_t ao_height;
__pdata int16_t ao_speed;
__pdata int16_t ao_accel;
__pdata int16_t ao_height;
__pdata int16_t ao_speed;
__pdata int16_t ao_accel;
-__
p
data int16_t ao_max_height;
+__
x
data int16_t ao_max_height;
static __pdata int32_t ao_avg_height_scaled;
static __pdata int32_t ao_avg_height_scaled;
-__
p
data int16_t ao_avg_height;
+__
x
data int16_t ao_avg_height;
__pdata int16_t ao_error_h;
__pdata int16_t ao_error_h_sq_avg;
__pdata int16_t ao_error_h;
__pdata int16_t ao_error_h_sq_avg;
@@
-292,7
+292,4
@@
ao_kalman(void)
else
#endif
ao_avg_height = (ao_avg_height_scaled + 63) >> 7;
else
#endif
ao_avg_height = (ao_avg_height_scaled + 63) >> 7;
-#ifdef AO_FLIGHT_TEST
- ao_sample_prev_tick = ao_sample_tick;
-#endif
}
}