diff options
| author | Martino Facchin <m.facchin@arduino.cc> | 2015-04-14 10:13:58 +0200 |
|---|---|---|
| committer | Martino Facchin <m.facchin@arduino.cc> | 2015-04-14 10:13:58 +0200 |
| commit | 6cbf4db4b695a9401311371bbc9a2f0496802496 (patch) | |
| tree | ac4530422fdcd87e2059ea1e8af491d009a8f031 /cores/arduino | |
| parent | 2dada5abb839d7ec994b21aeed1b2242471eb902 (diff) | |
| parent | 7e5b5bfcb5a1e9e501362084b25f2947e675e50c (diff) | |
Merge branch 'jipp-master'
Diffstat (limited to 'cores/arduino')
| -rw-r--r-- | cores/arduino/Tone.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp index ad09573..7216219 100644 --- a/cores/arduino/Tone.cpp +++ b/cores/arduino/Tone.cpp @@ -31,6 +31,7 @@ Version Modified By Date Comments 0007 M Sproul 10/08/29 Changed #ifdefs from cpu to register 0008 S Kanemoto 12/06/22 Fixed for Leonardo by @maris_HY 0009 J Reucker 15/04/10 Issue #292 Fixed problems with ATmega8 (thanks to Pete62) +0010 jipp 15/04/13 added additional define check #2923 *************************************************/ #include <avr/interrupt.h> @@ -152,7 +153,7 @@ static int8_t toneBegin(uint8_t _pin) // whereas 16 bit timers are set to either ck/1 or ck/64 prescalar switch (_timer) { - #if defined(TCCR0A) && defined(TCCR0B) + #if defined(TCCR0A) && defined(TCCR0B) && defined(WGM01) case 0: // 8 bit timer TCCR0A = 0; |