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
/
stm
/
ao_adc_stm.c
diff --git
a/src/stm/ao_adc_stm.c
b/src/stm/ao_adc_stm.c
index 02187205eb18a82b4256c9669c33ee5cde2bb4ee..ea9e25e48a9f94d0438c7d4ca03e908be1c89c99 100644
(file)
--- a/
src/stm/ao_adc_stm.c
+++ b/
src/stm/ao_adc_stm.c
@@
-104,14
+104,22
@@
ao_adc_poll(void)
void
ao_adc_get(__xdata struct ao_adc *packet)
{
void
ao_adc_get(__xdata struct ao_adc *packet)
{
+#if HAS_FLIGHT
+ uint8_t i = ao_data_ring_prev(ao_sample_data);
+#else
uint8_t i = ao_data_ring_prev(ao_data_head);
uint8_t i = ao_data_ring_prev(ao_data_head);
+#endif
memcpy(packet, (void *) &ao_data_ring[i].adc, sizeof (struct ao_adc));
}
void
ao_data_get(__xdata struct ao_data *packet)
{
memcpy(packet, (void *) &ao_data_ring[i].adc, sizeof (struct ao_adc));
}
void
ao_data_get(__xdata struct ao_data *packet)
{
+#if HAS_FLIGHT
+ uint8_t i = ao_data_ring_prev(ao_sample_data);
+#else
uint8_t i = ao_data_ring_prev(ao_data_head);
uint8_t i = ao_data_ring_prev(ao_data_head);
+#endif
memcpy(packet, (void *) &ao_data_ring[i], sizeof (struct ao_data));
}
memcpy(packet, (void *) &ao_data_ring[i], sizeof (struct ao_data));
}