adc: missing break statement

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

diff --git a/firmware/adc.c b/firmware/adc.c
index abbd3bac5b93c90c2ad9304b0430165e32aa3805..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;
@@ -33,7 +34,7 @@ static void inline setup_mux(unsigned char n)
                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;
@@ -94,7 +100,7 @@ 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
@@ -157,9 +163,11 @@ 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();
 }