diff options
| author | Keith Packard <keithp@keithp.com> | 2012-05-27 17:24:09 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-05-27 17:24:09 -0600 |
| commit | ce8153472069ed56b24ac36f297ac569d1f767d4 (patch) | |
| tree | 5162696d765800ccc6ffe1018de395745e908df8 /src/cc1111/ao_ignite.c | |
| parent | ed635545e0b965901032ed2c3474ffe997c73de3 (diff) | |
altos: Make telemetrum-v1.1 compile with new ao_data structure
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/cc1111/ao_ignite.c')
| -rw-r--r-- | src/cc1111/ao_ignite.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cc1111/ao_ignite.c b/src/cc1111/ao_ignite.c index dd529088..cf07dfe8 100644 --- a/src/cc1111/ao_ignite.c +++ b/src/cc1111/ao_ignite.c @@ -16,6 +16,7 @@ */ #include "ao.h" +#include <ao_data.h> __xdata struct ao_ignition ao_ignition[2]; @@ -29,12 +30,12 @@ ao_ignite(enum ao_igniter igniter) __critical enum ao_igniter_status ao_igniter_status(enum ao_igniter igniter) { - __xdata struct ao_adc adc; + __xdata struct ao_data packet; __pdata int16_t value; __pdata uint8_t request, firing, fired; __critical { - ao_adc_get(&adc); + ao_data_get(&packet); request = ao_ignition[igniter].request; fired = ao_ignition[igniter].fired; firing = ao_ignition[igniter].firing; @@ -45,10 +46,10 @@ ao_igniter_status(enum ao_igniter igniter) value = (AO_IGNITER_CLOSED>>1); switch (igniter) { case ao_igniter_drogue: - value = adc.sense_d; + value = packet.adc.sense_d; break; case ao_igniter_main: - value = adc.sense_m; + value = packet.adc.sense_m; break; } if (value < AO_IGNITER_OPEN) |