diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2012-06-27 13:51:16 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2012-06-27 13:51:16 +0200 |
| commit | 2d2050eabeaff7109ba89fdd0100556c981cf373 (patch) | |
| tree | 1f6d9725b59aa02e5400a8117eeec3206d88047d /cores/arduino/wiring.c | |
| parent | 324023a67afd1691f12ead4388d7cdf1a9d1a6ef (diff) | |
| parent | 31c24577835b0a9c7a1291ffbda1b61d96818511 (diff) | |
Merged master
Diffstat (limited to 'cores/arduino/wiring.c')
| -rw-r--r--[-rwxr-xr-x] | cores/arduino/wiring.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c index e7f7cde..ac8bb6f 100755..100644 --- a/cores/arduino/wiring.c +++ b/cores/arduino/wiring.c @@ -278,12 +278,21 @@ void init() sbi(TCCR3B, CS30); sbi(TCCR3A, WGM30); // put timer 3 in 8-bit phase correct pwm mode #endif - + +#if defined(TCCR4A) && defined(TCCR4B) && defined(TCCR4D) /* beginning of timer4 block for 32U4 and similar */ + sbi(TCCR4B, CS42); // set timer4 prescale factor to 64 + sbi(TCCR4B, CS41); + sbi(TCCR4B, CS40); + sbi(TCCR4D, WGM40); // put timer 4 in phase- and frequency-correct PWM mode + sbi(TCCR4A, PWM4A); // enable PWM mode for comparator OCR4A + sbi(TCCR4C, PWM4D); // enable PWM mode for comparator OCR4D +#else /* beginning of timer4 block for ATMEGA1280 and ATMEGA2560 */ #if defined(TCCR4B) && defined(CS41) && defined(WGM40) sbi(TCCR4B, CS41); // set timer 4 prescale factor to 64 sbi(TCCR4B, CS40); sbi(TCCR4A, WGM40); // put timer 4 in 8-bit phase correct pwm mode #endif +#endif /* end timer4 block for ATMEGA1280/2560 and similar */ #if defined(TCCR5B) && defined(CS51) && defined(WGM50) sbi(TCCR5B, CS51); // set timer 5 prescale factor to 64 |