X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fadc.c;h=abbd3bac5b93c90c2ad9304b0430165e32aa3805;hb=f31e81252594197944d593cb73c5a44856ee4893;hp=b7dad0ad59b31a940acecec248c91fd14ba8b2aa;hpb=210916486d18b3dc976c65c7b01b44bca446d856;p=bike-lights.git

diff --git a/firmware/adc.c b/firmware/adc.c
index b7dad0a..abbd3ba 100644
--- a/firmware/adc.c
+++ b/firmware/adc.c
@@ -21,15 +21,15 @@ 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);
@@ -62,6 +62,26 @@ static void start_next_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()
 {
 	unsigned char i;
@@ -79,24 +99,15 @@ void init_adc()
 
 	// 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