projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
test
/
ao_flight_test.c
diff --git
a/src/test/ao_flight_test.c
b/src/test/ao_flight_test.c
index d12652b49617126a5d9177877f800c5886f84b4a..fc1dfa8fe6b759b1def1caccc3ffdfa78429210b 100644
(file)
--- a/
src/test/ao_flight_test.c
+++ b/
src/test/ao_flight_test.c
@@
-390,7
+390,7
@@
typedef int16_t accel_t;
uint16_t ao_serial_number;
int16_t ao_flight_number;
uint16_t ao_serial_number;
int16_t ao_flight_number;
-extern
uint16_t
ao_sample_tick;
+extern
AO_TICK_TYPE
ao_sample_tick;
#if HAS_BARO
extern alt_t ao_sample_height;
#if HAS_BARO
extern alt_t ao_sample_height;
@@
-404,8
+404,8
@@
extern alt_t ao_sample_alt;
double ao_sample_qangle;
double ao_sample_qangle;
-
int
ao_sample_prev_tick;
-
uint16_t
prev_tick;
+
AO_TICK_TYPE
ao_sample_prev_tick;
+
AO_TICK_TYPE
prev_tick;
#include "ao_kalman.c"
#include "ao_kalman.c"