adc: missing break statement

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

diff --git a/firmware/adc.c b/firmware/adc.c
index fa0782c4248c6ee67917901cc1340dedfefea087..6db036af530b124e8aec9db50e668b6802d669a9 100644 (file)
--- a/firmware/adc.c
+++ b/firmware/adc.c
@@ -6,8 +6,9 @@
 #define AMBIENT_ADC N_PWMLEDS
 #define BATTERY_ADC (N_PWMLEDS + 1)
 #define ADC1_GAIN20 (N_PWMLEDS + 2)
+#define BUTTON_ADC  (N_PWMLEDS + 2)
 
-#define NUM_ADCS 6
+#define NUM_ADCS 7
 volatile static unsigned char current_adc;
 static uint16_t adc_sum;
 static unsigned char sum_shift;
@@ -21,19 +22,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);
@@ -43,6 +44,11 @@ static void inline setup_mux(unsigned char n)
                ADMUX = _BV(REFS1) | _BV(MUX3) | _BV(MUX2) | _BV(MUX0);
                sum_shift = 0; // 1 measurement
                break;
+       case 6: // buttons: 1.1V, ADC3, single-ended
+               PORTA |= _BV(PA3); // +5V to the voltage splitter
+               ADMUX = _BV(REFS1) | _BV(MUX1) | _BV(MUX0);
+               sum_shift = 0;
+               break;
        }
 
        adc_sum = 0;
@@ -51,15 +57,35 @@ 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);
+}
+
+/*
+ * Single synchronous ADC conversion.
+ * Has to be called with IRQs disabled (or with the ADC IRQ disabled).
+ */
+static uint16_t read_adc_sync()
+{
+       uint16_t rv;
+
+       ADCSRA |= _BV(ADSC); // start the conversion
+
+       // wait for the conversion to finish
+       while((ADCSRA & _BV(ADIF)) == 0)
+               ;
+
+       rv = ADCW;
+       ADCSRA |= _BV(ADIF); // clear the IRQ flag
+
+       return rv;
 }
 
 void init_adc()
@@ -74,32 +100,25 @@ void init_adc()
        // ADCSRB |= _BV(GSEL); // gain 8 or 32
 
        // Disable digital input on all bits used by ADC
-       DIDR0 = _BV(ADC0D) | _BV(ADC1D) | _BV(ADC2D)
+       DIDR0 = _BV(ADC0D) | _BV(ADC1D) | _BV(ADC2D) | _BV(ADC3D)
                | _BV(ADC4D) | _BV(ADC5D) | _BV(ADC6D);
 
        // 1.1V, ADC1,1, gain 20
        ADMUX = _BV(REFS1) | _BV(MUX3) | _BV(MUX2) | _BV(MUX0);
-       ADCSRA |= _BV(ADSC);
 
        /* Do first conversion and drop the result */
-       while ((ADCSRA & _BV(ADIF)) == 0)
-               ;
-       ADCSRA |= _BV(ADIF); // clear the IRQ flag
+       read_adc_sync();
 
        adc1_gain20_offset = 0;
 
        for (i = 0; i < (1 << ADC1_GAIN20_OFFSET_SHIFT); i++) {
-               ADCSRA |= _BV(ADSC);
-
-               while ((ADCSRA & _BV(ADIF)) == 0)
-                       ;
-               adc1_gain20_offset += ADCW
+               adc1_gain20_offset += read_adc_sync()
                        - (adc1_gain20_offset >> ADC1_GAIN20_OFFSET_SHIFT);
-
-               ADCSRA |= _BV(ADIF); // clear the IRQ flag
        }
 
        ADCSRA |= _BV(ADIE); // enable IRQ
+
+       start_next_adc();
 }
 
 void susp_adc()
@@ -144,20 +163,12 @@ 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);
+       if (current_adc == BUTTON_ADC)
+               button_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
-}
-