josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

analog.c: put in a few lessons learned. 

No functional change.
This commit is contained in:
Markus Hitter 2012-08-30 22:59:50 +02:00
parent bfe5e6f2fc
commit bfad6f12cd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
analog.c
View File

@ -39,7 +39,7 @@ static volatile uint16_t adc_result[AINDEX_MAX + 1] __attribute__ ((__section__
//! Configure all registers, start interrupt loop //! Configure all registers, start interrupt loop
void analog_init() { void analog_init() {
if (analog_mask > 0) { if (NUM_TEMP_SENSORS > 0) {
// clear ADC bit in power reduction register because of ADC use. // clear ADC bit in power reduction register because of ADC use.
#ifdef PRR #ifdef PRR
PRR &= ~MASK(PRADC); PRR &= ~MASK(PRADC);
@ -84,11 +84,15 @@ ISR(ADC_vect, ISR_NOBLOCK) {
uint8_t sreg_save = SREG; uint8_t sreg_save = SREG;
// emulate free-running mode but be more deterministic about exactly which result we have, since this project has long-running interrupts // emulate free-running mode but be more deterministic about exactly which result we have, since this project has long-running interrupts
if (analog_mask > 0) { if (NUM_TEMP_SENSORS > 0) {
// store next result // store next result
adc_result[AINDEX_CURRENT] = ADC; adc_result[AINDEX_CURRENT] = ADC;
// find next channel // find next channel
/* TODO: this is not exactly high performance. adc_result[] should be of
size NUM_TEMP_SENSORS only, along with an array of the corresponding
ADC channel(s). This also requires changes to the callers of
analog_read(). */
do { do {
adc_counter++; adc_counter++;
adc_counter &= AINDEX_MAX; adc_counter &= AINDEX_MAX;
@ -117,7 +121,7 @@ ISR(ADC_vect, ISR_NOBLOCK) {
\return analog reading, 10-bit right aligned \return analog reading, 10-bit right aligned
*/ */
uint16_t analog_read(uint8_t channel) { uint16_t analog_read(uint8_t channel) {
if (analog_mask > 0) { if (NUM_TEMP_SENSORS > 0) {
uint16_t r; uint16_t r;
uint8_t sreg; uint8_t sreg;