starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[avr] connect the analog comp to the input capture noise canceler for spike suppression

This commit is contained in:
Bart Van Der Meerssche 2011-02-15 23:26:54 +01:00
parent 35e79ca1bf
commit a90b7a8dce
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mote/v2/avr/main.c
View File

@ -239,11 +239,8 @@ ISR(TIMER1_COMPA_vect)
DBG_ISR_END(); DBG_ISR_END();
} }
ISR(ANALOG_COMP_vect) ISR(TIMER1_CAPT_vect)
{ {
if (!(ACSR & (1 << ACO)))
return;
disable_led(); disable_led();
event.brown_out++; event.brown_out++;
@ -318,6 +315,12 @@ void setup_timer1(void)
// Enable output compare match interrupt for timer1 (DS p.136) // Enable output compare match interrupt for timer1 (DS p.136)
TIMSK1 |= (1<<OCIE1A); TIMSK1 |= (1<<OCIE1A);
// Activate the input capture noise canceler and trigger the IC on a positive edge (DS p.133)
TCCR1B |= (1<<ICNC1) | (1<<ICES1);
// Enable input capture interrupt (DS p.136)
TIMSK1 |= (1<<ICIE1);
DBG_OC1A_TOGGLE(); DBG_OC1A_TOGGLE();
} }
@ -330,8 +333,8 @@ void setup_analog_comparator(void)
DIDR1 |= (1<<AIN1D) | (1<<AIN0D); DIDR1 |= (1<<AIN1D) | (1<<AIN0D);
// comparing AIN1 (Vcc/4.4) to bandgap reference (1.1V) // comparing AIN1 (Vcc/4.4) to bandgap reference (1.1V)
// bandgap select | AC interrupt enable | AC interrupt on rising edge (DS p.243) // select bandgap reference and enable input capture function in timer1 (DS p.244 & 116)
ACSR |= (1<<ACBG) | (1<<ACIE) | (1<<ACIS1) | (1<<ACIS0); ACSR |= (1<<ACBG) | (1<<ACIC);
} }
void calculate_power(volatile struct state_struct *pstate) void calculate_power(volatile struct state_struct *pstate)
@ -382,9 +385,9 @@ int main(void)
setup_datastructs(); setup_datastructs();
setup_led(); setup_led();
setup_adc(); setup_adc();
setup_timer1();
setup_pulse_input(); setup_pulse_input();
setup_analog_comparator(); setup_analog_comparator();
setup_timer1();
// initialize the CTRL buffers // initialize the CTRL buffers
ctrlInit(); ctrlInit();