Unverified Commit 69433286 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

adctest: switch to getPin_mV helper function

parent 65856cb6

src/app/adctest/main.cc

+2 −47
Original line number Diff line number Diff line
@@ -17,54 +17,9 @@ void loop(void) 
	kout << "Temperature " << temp << " m°C" <<  endl;



	for (uint8_t admux_sel = 0; admux_sel < 8; admux_sel++) {

		// measure with avcc reference

		ADMUX = _BV(REFS0) | admux_sel;



		// Enable ADC with /64 prescaler

		ADCSRA = _BV(ADEN) | _BV(ADPS2);



		// Start conversion

		ADCSRA |= _BV(ADSC);



		// wait until conversion is complete

		while (ADCSRA & _BV(ADSC)) ;



		uint8_t adcr_l = ADCL;

		uint8_t adcr_h = ADCH;

		uint16_t adcr = adcr_l + (adcr_h << 8);

		uint16_t vadc = (uint32_t)vcc * adcr / 1023L;



		kout << "ADC" << admux_sel << "        " << vadc << " mV vs AVCC" << endl;

		kout << "ADC" << admux_sel << "        " << adc.getPin_mV(admux_sel, vcc) << " mV vs AVCC" << endl;

		kout << "ADC" << admux_sel << "        " << adc.getPin_mV(admux_sel) << " mV vs 1.1V bandgap" << endl;

	}



	// enable bandgap; wait for it to stabilise

	ADMUX = _BV(REFS1) |  _BV(REFS0);

	ADCSRA = _BV(ADEN) | _BV(ADPS2);

	arch.delay_ms(1);



	for (uint8_t admux_sel = 0; admux_sel < 8; admux_sel++) {

		// measure with bandgap reference

		ADMUX = _BV(REFS1) | _BV(REFS0) | admux_sel;



		// Enable ADC with /64 prescaler

		ADCSRA = _BV(ADEN) | _BV(ADPS2);



		// Start conversion

		ADCSRA |= _BV(ADSC);



		// wait until conversion is complete

		while (ADCSRA & _BV(ADSC)) ;



		uint8_t adcr_l = ADCL;

		uint8_t adcr_h = ADCH;

		uint16_t adcr = adcr_l + (adcr_h << 8);

		uint16_t vadc = 1100L * adcr / 1023L;



		kout << "ADC" << admux_sel << "        " << vadc << " mV vs 1.1V bandgap" << endl;

	}



	// disable ADC

	ADCSRA &= ~_BV(ADEN);

}



int main(void)