ambient light: make three measurements

[bike-lights.git] / firmware / adc.c

diff --git a/firmware/adc.c b/firmware/adc.c
index fa0782c4248c6ee67917901cc1340dedfefea087..4213ef56bc01b5114ee2c76f6ef16dfce1e7158d 100644 (file)
--- a/firmware/adc.c
+++ b/firmware/adc.c
@@ -21,19 +21,19 @@ static void inline setup_mux(unsigned char n)
        switch (n) {
        case 0: // pwmled 1: 1.1V, ADC0,1 (PA0,1), gain 20
                ADMUX = _BV(REFS1) | _BV(MUX3) | _BV(MUX1) | _BV(MUX0);
-               sum_shift = 3; // 8 measurements
+               sum_shift = PWMLED_ADC_SHIFT;
                break;
        case 1: // pwmled 2: 1.1V, ADC2,1 (PA2,1), gain 20
                ADMUX = _BV(REFS1) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
-               sum_shift = 3; // 8 measurements
+               sum_shift = PWMLED_ADC_SHIFT;
                break;
        case 2: // pwmled 3: 1.1V, ADC4 (PA5), single-ended
                ADMUX = _BV(REFS1) | _BV(MUX2);
-               sum_shift = 3; // 8 measurements
+               sum_shift = PWMLED_ADC_SHIFT;
                break;
        case 3: // ambient light: 1.1V, ADC5 (PA6), single-ended
                ADMUX = _BV(REFS1) | _BV(MUX2) | _BV(MUX0);
-               sum_shift = 0; // 1 measurement
+               sum_shift = 3; // 3 measurements
                break;
        case 4: // batt voltage: 1.1V, ADC6 (PA7), single-ended
                ADMUX = _BV(REFS1) | _BV(MUX2) | _BV(MUX1);
@@ -51,15 +51,15 @@ static void inline setup_mux(unsigned char n)
 
 static void start_next_adc()
 {
-       if (current_adc > 0) {
+       if (current_adc > 0)
                current_adc--;
-               // set up mux, start one-shot conversion
-               setup_mux(current_adc);
-               ADCSRA |= _BV(ADSC);
-       } else {
-               current_adc = NUM_ADCS;
+       else
                // TODO: kick the watchdog here.
-       }
+               current_adc = NUM_ADCS-1;
+
+       // set up mux, start one-shot conversion
+       setup_mux(current_adc);
+       ADCSRA |= _BV(ADSC);
 }
 
 void init_adc()
@@ -100,6 +100,8 @@ void init_adc()
        }
 
        ADCSRA |= _BV(ADIE); // enable IRQ
+
+       start_next_adc();
 }
 
 void susp_adc()
@@ -144,20 +146,10 @@ ISR(ADC_vect) { // IRQ handler
        if (current_adc < N_PWMLEDS)
                pwmled_adc(current_adc, adc_sum);
        if (current_adc == AMBIENT_ADC)
-               ambient_adc(adcval);
+               ambient_adc(adc_sum);
        if (current_adc == BATTERY_ADC)
                battery_adc(adcval);
        
        start_next_adc();
 }
 
-void timer_start_adcs()
-{
-       if (current_adc == NUM_ADCS) // Don't start if in progress
-               start_next_adc();
-#if 0
-       else
-               log_byte(0x99);
-#endif
-}
-