altos: Ensure flight code gets first crack at new ADC data

[fw/altos] / src / ao_adc.c

diff --git a/src/ao_adc.c b/src/ao_adc.c
index 49d2519e209d5c4f2faf594c5afb08da9da42af6..f577b4582afe02ca838500b2d3d9e5e344612835 100644 (file)
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -27,16 +27,10 @@ ao_adc_poll(void)
        ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
 }
 
-void
-ao_adc_sleep(void)
-{
-       ao_sleep(&ao_adc_ring);
-}
-
 void
 ao_adc_get(__xdata struct ao_adc *packet)
 {
-       uint8_t i = ao_adc_ring_prev(ao_adc_head);
+       uint8_t i = ao_adc_ring_prev(ao_flight_adc);
        memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
 }
 
@@ -65,7 +59,7 @@ ao_adc_isr(void) __interrupt 1
                /* record this conversion series */
                ao_adc_ring[ao_adc_head].tick = ao_time();
                ao_adc_head = ao_adc_ring_next(ao_adc_head);
-               ao_wakeup(ao_adc_ring);
+               ao_wakeup(DATA_TO_XDATA(&ao_adc_head));
        }
 }