Merge remote-tracking branch 'uniarch/master' into multiarch

[fw/altos] / src / cc1111 / ao_adc.c

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 786dfd11d292dc45830061eca1d380554d4ef5ba..6aa6e0185675ae2bf03ad2e82182bb871b1cda0e 100644 (file)
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -41,7 +41,11 @@ ao_adc_poll(void)
 void
 ao_adc_get(__xdata struct ao_adc *packet)
 {
+#if HAS_FLIGHT
        uint8_t i = ao_adc_ring_prev(ao_sample_adc);
+#else
+       uint8_t i = ao_adc_ring_prev(ao_adc_head);
+#endif
        memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
 }