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

diff --git a/firmware/adc.c b/firmware/adc.c
index ba30e5c..4213ef5 100644
--- a/firmware/adc.c
+++ b/firmware/adc.c
@@ -12,7 +12,8 @@ volatile static unsigned char current_adc;
 static uint16_t adc_sum;
 static unsigned char sum_shift;
 static unsigned char adc_vals;
-static uint16_t adc1_gain20_offset_x16;
+#define ADC1_GAIN20_OFFSET_SHIFT	6
+static uint16_t adc1_gain20_offset;
 
 static void inline setup_mux(unsigned char n)
 {
@@ -20,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 = 2; // 4 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);
@@ -40,7 +41,7 @@ static void inline setup_mux(unsigned char n)
 		break;
 	case 5: // gain stage offset: 1.1V, ADC1,1, gain 20
 		ADMUX = _BV(REFS1) | _BV(MUX3) | _BV(MUX2) | _BV(MUX0);
-		sum_shift = 3; // 8 measurements
+		sum_shift = 0; // 1 measurement
 		break;
 	}
 
@@ -50,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()
@@ -85,19 +86,22 @@ void init_adc()
 		;
 	ADCSRA |= _BV(ADIF); // clear the IRQ flag
 
-	adc1_gain20_offset_x16 = 0;
+	adc1_gain20_offset = 0;
 
-	for (i = 0; i < 16; i++) {
+	for (i = 0; i < (1 << ADC1_GAIN20_OFFSET_SHIFT); i++) {
 		ADCSRA |= _BV(ADSC);
 
 		while ((ADCSRA & _BV(ADIF)) == 0)
 			;
-		adc1_gain20_offset_x16 += ADCW;
+		adc1_gain20_offset += ADCW
+			- (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()
@@ -128,31 +132,24 @@ ISR(ADC_vect) { // IRQ handler
 
 	if (current_adc == ADC1_GAIN20) {
 		// running average
-		adc1_gain20_offset_x16 += adcval
-			- (adc1_gain20_offset_x16 >> 4);
+		adc1_gain20_offset += adcval
+			- (adc1_gain20_offset >> ADC1_GAIN20_OFFSET_SHIFT);
 	} else if (current_adc == 0 || current_adc == 1) {
-		uint16_t offset = adc1_gain20_offset_x16 >> 4;
-		if (adcval >= offset)
-			adcval -= offset;
+		uint16_t offset = adc1_gain20_offset
+			>> (ADC1_GAIN20_OFFSET_SHIFT - sum_shift);
+		if (adc_sum > offset)
+			adc_sum -= offset;
 		else
-			adcval = 0;
+			adc_sum = 0;
 	}
 
 	if (current_adc < N_PWMLEDS)
-		pwmled_adc(current_adc, adcval);
+		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();
-	else
-		log_byte(0x99);
-}
-