dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Per the datasheet, "Beware that if doing a Read-Modify-Write on ADCSRA, a pending interrupt can be disabled." I don't know a good way to do this, but using ADIE seems to not be reliable.

Browse Source
This commit is contained in:
skarg
2010-10-22 17:12:30 +00:00
parent bfaec69757
commit 0953c8ada6
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/bdk-atxx4-mstp/adc.c
+2 -8
View File
@@ -86,9 +86,7 @@ void adc_enable(
{ {
if (Enabled_Channels) { if (Enabled_Channels) {
/* ADC interupt is already started */ /* ADC interupt is already started */
BIT_CLEAR(ADCSRA, ADIE);
BIT_SET(Enabled_Channels, index); BIT_SET(Enabled_Channels, index);
BIT_SET(ADCSRA, ADIE);
} else { } else {
if (index < ADC_CHANNELS_MAX) { if (index < ADC_CHANNELS_MAX) {
/* not running yet */ /* not running yet */
@@ -110,9 +108,7 @@ uint8_t adc_result_8bit(
if (index < ADC_CHANNELS_MAX) { if (index < ADC_CHANNELS_MAX) {
adc_enable(index); adc_enable(index);
BIT_CLEAR(ADCSRA, ADIE);
result = (uint8_t)(Sample_Result[index]>>2); result = (uint8_t)(Sample_Result[index]>>2);
BIT_SET(ADCSRA, ADIE);
} }
return result; return result;
@@ -125,9 +121,7 @@ uint16_t adc_result_10bit(
if (index < ADC_CHANNELS_MAX) { if (index < ADC_CHANNELS_MAX) {
adc_enable(index); adc_enable(index);
BIT_CLEAR(ADCSRA, ADIE);
result = Sample_Result[index]; result = Sample_Result[index];
BIT_SET(ADCSRA, ADIE);
} }
return result; return result;
@@ -143,12 +137,12 @@ void adc_init(
ADMUX = (0 << ADLAR) | (0 << REFS1) | (1 << REFS0); ADMUX = (0 << ADLAR) | (0 << REFS1) | (1 << REFS0);
/* ADEN = Enable /* ADEN = Enable
ADSC = Start conversion ADSC = Start conversion
ADIF = Interrupt Flag ADIF = Interrupt Flag - write 1 to clear!
ADIE = Interrupt Enable ADIE = Interrupt Enable
ADATE = Auto Trigger Enable ADATE = Auto Trigger Enable
*/ */
ADCSRA = (1 << ADEN) | (1 << ADIE) | ADCSRA = (1 << ADEN) | (1 << ADIE) |
(0 << ADIF) | (0 << ADATE) | ADPS_10BIT; (1 << ADIF) | (0 << ADATE) | ADPS_10BIT;
/* trigger selection bits /* trigger selection bits
0 0 0 Free Running mode 0 0 0 Free Running mode
0 0 1 Analog Comparator 0 0 1 Analog Comparator