diff options
| author | amcewen <amcewen@bcs.org.uk> | 2011-08-28 20:28:53 +0100 |
|---|---|---|
| committer | amcewen <amcewen@bcs.org.uk> | 2011-08-28 20:28:53 +0100 |
| commit | 8ce77304f796e077f594859f270f9f024dc05605 (patch) | |
| tree | 285233e5b57f0029551056b1951e4e539b265951 /cores/arduino/wiring.c | |
| parent | e852be3e97763e621a0f8014a3db4bf92a650b50 (diff) | |
| parent | f9d50a793010db3a2968262f35d34edaf048a650 (diff) | |
Merge branch 'master' into wifly_integration
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) |