X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fadc.c;h=6ef638a5c79204f20251608db63371bfd51a3fc6;hb=9e483c6969d2cdce60f6dcc3d167fec889a48993;hp=4213ef56bc01b5114ee2c76f6ef16dfce1e7158d;hpb=dd1738d1117607d5a47050274d805748b11f48d1;p=bike-lights.git

diff --git a/firmware/adc.c b/firmware/adc.c
index 4213ef5..6ef638a 100644
--- a/firmware/adc.c
+++ b/firmware/adc.c
@@ -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
@@ -146,7 +157,7 @@ ISR(ADC_vect) { // IRQ handler
 	if (current_adc < N_PWMLEDS)
 		pwmled_adc(current_adc, adc_sum);
 	if (current_adc == AMBIENT_ADC)
-		ambient_adc(adc_sum);
+		ambient_adc(adcval);
 	if (current_adc == BATTERY_ADC)
 		battery_adc(adcval);