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

protect ANALOG_MASK from arithmetic errors via de-macro-isation

This commit is contained in:
Michael Moon 2011-02-07 20:47:32 +11:00
parent e4fc55289b
commit b5299c4d69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
analog.c
View File

@ -55,7 +55,7 @@ void analog_init() {
adc_running_mask = 1; adc_running_mask = 1;
AIO0_DDR &= ~(ANALOG_MASK); AIO0_DDR &= ~(ANALOG_MASK);
DIDR0 = ANALOG_MASK & 0x3F; DIDR0 = (ANALOG_MASK) & 0x3F;
// now we start the first conversion and leave the rest to the interrupt // now we start the first conversion and leave the rest to the interrupt
ADCSRA |= MASK(ADIE) | MASK(ADSC); ADCSRA |= MASK(ADIE) | MASK(ADSC);
@ -73,7 +73,7 @@ ISR(ADC_vect, ISR_NOBLOCK) {
adc_counter = ANALOG_START; adc_counter = ANALOG_START;
adc_running_mask = ANALOG_START_MASK; adc_running_mask = ANALOG_START_MASK;
} }
} while ((adc_running_mask & ANALOG_MASK) == 0); } while ((adc_running_mask & (ANALOG_MASK)) == 0);
// start next conversion // start next conversion
ADMUX = (adc_counter) | REFERENCE; ADMUX = (adc_counter) | REFERENCE;