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
/
kernel
/
ao_flight.h
diff --git
a/src/kernel/ao_flight.h
b/src/kernel/ao_flight.h
index af6b0c55bedd465ed209b8284d503808c35911f5..bc74bf9c7d9366ea03dc951d42295abc2eee80f4 100644
(file)
--- a/
src/kernel/ao_flight.h
+++ b/
src/kernel/ao_flight.h
@@
-39,18
+39,10
@@
enum ao_flight_state {
};
extern enum ao_flight_state ao_flight_state;
};
extern enum ao_flight_state ao_flight_state;
-extern
uint16_t
ao_boost_tick;
-extern
uint16_t
ao_launch_tick;
+extern
AO_TICK_TYPE
ao_boost_tick;
+extern
AO_TICK_TYPE
ao_launch_tick;
extern uint16_t ao_motor_number;
extern uint16_t ao_motor_number;
-#if HAS_IMU || HAS_MMA655X
-#define HAS_SENSOR_ERRORS 1
-#endif
-
-#if HAS_SENSOR_ERRORS
-extern uint8_t ao_sensor_errors;
-#endif
-
extern uint16_t ao_launch_time;
extern uint8_t ao_flight_force_idle;
extern uint16_t ao_launch_time;
extern uint8_t ao_flight_force_idle;