projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make telemetrum-v1.1 compile with new ao_data structure
[fw/altos]
/
src
/
cc1111
/
ao_ignite.c
diff --git
a/src/cc1111/ao_ignite.c
b/src/cc1111/ao_ignite.c
index dd5290881e7af443539ac1b210a1d37108274be6..cf07dfe8ee212b373834660935e64b135a9e350f 100644
(file)
--- a/
src/cc1111/ao_ignite.c
+++ b/
src/cc1111/ao_ignite.c
@@
-16,6
+16,7
@@
*/
#include "ao.h"
*/
#include "ao.h"
+#include <ao_data.h>
__xdata struct ao_ignition ao_ignition[2];
__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)
{
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 {
__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;
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 = (AO_IGNITER_CLOSED>>1);
switch (igniter) {
case ao_igniter_drogue:
- value = adc.sense_d;
+ value =
packet.
adc.sense_d;
break;
case ao_igniter_main:
break;
case ao_igniter_main:
- value = adc.sense_m;
+ value =
packet.
adc.sense_m;
break;
}
if (value < AO_IGNITER_OPEN)
break;
}
if (value < AO_IGNITER_OPEN)