Add in existing flight pieces: flight/report/log

[fw/altos] / ao_adc.c

diff --git a/ao_adc.c b/ao_adc.c
index d45e10b1f7de252000ff0ad9066f67bd879ced0a..8834f26e10c2f52ef1b2cb8f1c06e29faed5d3a2 100644 (file)
--- a/ao_adc.c
+++ b/ao_adc.c
@@ -18,10 +18,33 @@
 
 #include "ao.h"
 
-__xdata struct ao_adc  ao_adc_ring[ADC_RING];
-__data uint8_t         ao_adc_head;
+volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
+volatile __data uint8_t                ao_adc_head;
 
-void ao_adc_isr(void) interrupt 1
+void
+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_head;
+       if (i == 0)
+               i = AO_ADC_RING;
+       i--;
+       memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
+}
+
+void
+ao_adc_isr(void) interrupt 1
 {
        uint8_t sequence;
        uint8_t __xdata *a;
@@ -35,15 +58,16 @@ void ao_adc_isr(void) interrupt 1
                ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
        } else {
                /* record this conversion series */
-               ao_adc_ring[ao_adc_head].tick = ao_time;
+               ao_adc_ring[ao_adc_head].tick = ao_time();
                ao_adc_head++;
-               if (ao_adc_head == ADC_RING)
+               if (ao_adc_head == AO_ADC_RING)
                        ao_adc_head = 0;
                ao_wakeup(ao_adc_ring);
        }
 }
 
-void ao_adc_init(void)
+void
+ao_adc_init(void)
 {
        ADCCFG = ((1 << 0) |    /* acceleration */
                  (1 << 1) |    /* pressure */
@@ -57,17 +81,3 @@ void ao_adc_init(void)
        IEN0 |= IEN0_ADCIE;
 }
 
-void ao_adc_poll(void)
-{
-       ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
-}
-
-void ao_adc_get(__xdata struct ao_adc *packet)
-{
-       uint8_t i = ao_adc_head;
-       if (i == 0)
-               i = ADC_RING;
-       i--;
-       memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
-}
-