telescience: steal last adc channel for icp3 most recent value

[fw/altos] / src / avr / ao_adc_avr.c

diff --git a/src/avr/ao_adc_avr.c b/src/avr/ao_adc_avr.c
index 928cd3e13f55d654bdba4ab5e8d369446d6d8dd7..739a6d4ad95447937dca92e3e653549abd3bff85 100644 (file)
--- a/src/avr/ao_adc_avr.c
+++ b/src/avr/ao_adc_avr.c
@@ -16,6 +16,7 @@
  */
 
 #include "ao.h"
+#include "ao_pwmin.h"
 
 volatile __xdata struct ao_data        ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t                ao_data_head;
@@ -93,9 +94,13 @@ ISR(ADC_vect)
        value = ADCL;
        value |= (ADCH << 8);
        ao_data_ring[ao_data_head].adc.adc[ao_adc_channel] = value;
-       if (++ao_adc_channel < NUM_ADC)
+       if (++ao_adc_channel < NUM_ADC - 1)
                ao_adc_start();
        else {
+#if HAS_ICP3_COUNT
+               /* steal last adc channel for pwm input */
+               ao_data_ring[ao_data_head].adc.adc[ao_adc_channel] = ao_icp3_count;
+#endif
                ADCSRA = ADCSRA_INIT;
                ao_data_ring[ao_data_head].tick = ao_time();
                ao_data_head = ao_data_ring_next(ao_data_head);
@@ -125,42 +130,21 @@ ao_adc_dump(void) __reentrant
        static __xdata struct ao_data   packet;
        uint8_t i;
        ao_data_get(&packet);
-#ifdef TELEPYRO
-       printf("ADMUX:  %02x\n", ADMUX);
-       printf("ADCSRA: %02x\n", ADCSRA);
-       printf("ADCSRB: %02x\n", ADCSRB);
-       printf("DIDR0:  %02x\n", DIDR0);
-       printf("DIDR2:  %02x\n", DIDR2);
-       printf("PORTF:  %02x\n", PORTF);
-       printf("DDRF:   %02x\n", DDRF);
-       printf("PINF:   %02x\n", PINF);
-#endif
        printf("tick: %5u",  packet.tick);
        for (i = 0; i < NUM_ADC; i++)
                printf (" %2d: %5u", i, packet.adc.adc[i]);
        printf("\n");
-
-
-#ifdef TELEPYRO
-       ADMUX = 0x60;
-       ADCSRB = 0x00;
-       ADCSRA = 0xc6;
-       while (ADCSRA & 0x40)
-               ;
-       printf ("ADCL:  %02x\n", ADCL);
-       printf ("ADCH:  %02x\n", ADCH);
-       printf ("\n");
-#endif
 }
 
 __code struct ao_cmds ao_adc_cmds[] = {
-       { ao_adc_dump,  "a\0Display current ADC values" },
+       { ao_adc_dump,  "a\0ADC" },
        { 0, NULL },
 };
 
 void
 ao_adc_init(void)
 {
+       PRR0 &= ~(1 << PRADC);
        DIDR0 = 0xf3;
        DIDR2 = 0x3f;
        ADCSRB = ADCSRB_INIT;