diff options
| author | amcewen <amcewen@bcs.org.uk> | 2011-06-11 21:27:18 +0100 |
|---|---|---|
| committer | amcewen <amcewen@bcs.org.uk> | 2011-06-11 21:27:18 +0100 |
| commit | 58aaa903f8aaaf7735ca2df803ec028b420a754b (patch) | |
| tree | d2548a6d793dd615c47cec573f331aeb23314833 /cores/arduino/wiring.c | |
| parent | edee02eaf19c4d13324959e6db881dc327342561 (diff) | |
| parent | a239d2c541094ef5445159360ae5d2d6a93dbf00 (diff) | |
Merge remote branch 'upstream/new-extension'
Moved my fork to the Arduino 1.0 codebase
Diffstat (limited to 'cores/arduino/wiring.c')
| -rwxr-xr-x | cores/arduino/wiring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c index b90d07e..ce4cad6 100755 --- a/cores/arduino/wiring.c +++ b/cores/arduino/wiring.c @@ -212,10 +212,10 @@ void init() // note, however, that fast pwm mode can achieve a frequency of up // 8 MHz (with a 16 MHz clock) at 50% duty cycle +#if defined(TCCR1B) && defined(CS11) && defined(CS10) TCCR1B = 0; // set timer 1 prescale factor to 64 -#if defined(TCCR1B) && defined(CS11) && defined(CS10) sbi(TCCR1B, CS11); sbi(TCCR1B, CS10); #elif defined(TCCR1) && defined(CS11) && defined(CS10) |