projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao_pyro: Move delay_done out of pyro structure
[fw/altos]
/
src
/
kernel
/
ao_host.h
diff --git
a/src/kernel/ao_host.h
b/src/kernel/ao_host.h
index f32218228ca29b658ee4a6782204957f77ed9343..c974a9fe5f1e37c89261245bfa3ab945d1b8bdbf 100644
(file)
--- a/
src/kernel/ao_host.h
+++ b/
src/kernel/ao_host.h
@@
-32,7
+32,7
@@
* One set of samples read from the A/D converter
*/
struct ao_adc {
* One set of samples read from the A/D converter
*/
struct ao_adc {
-
uint16_t
tick; /* tick when the sample was read */
+
AO_TICK_TYPE
tick; /* tick when the sample was read */
int16_t accel; /* accelerometer */
int16_t pres; /* pressure sensor */
int16_t temp; /* temperature sensor */
int16_t accel; /* accelerometer */
int16_t pres; /* pressure sensor */
int16_t temp; /* temperature sensor */
@@
-41,12
+41,6
@@
struct ao_adc {
int16_t sense_m; /* main continuity sense */
};
int16_t sense_m; /* main continuity sense */
};
-#define const
-
-#define a (a)
-#define a (a)
-#define a (a)
-
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,