diff options
| author | Shigeru KANEMOTO <sgk@switch-science.com> | 2012-06-22 11:27:56 +0900 |
|---|---|---|
| committer | Shigeru KANEMOTO <sgk@switch-science.com> | 2012-08-08 18:27:40 +0900 |
| commit | 4293079076b319f1762481bb31c5fce74c97dc7a (patch) | |
| tree | 1866502fe12c24c900837da0cf883a75b1b1860c /cores/arduino/Tone.cpp | |
| parent | ef7a66b84596267e91ee98a39d653ada60be2175 (diff) | |
Fix for tone() on Leonardo.
Diffstat (limited to 'cores/arduino/Tone.cpp')
| -rwxr-xr-x | cores/arduino/Tone.cpp | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp index 20eed3f..9bb6fe7 100755 --- a/cores/arduino/Tone.cpp +++ b/cores/arduino/Tone.cpp @@ -29,6 +29,7 @@ Version Modified By Date Comments 09/11/25 Fixed timer0 from being excluded 0006 D Mellis 09/12/29 Replaced objects with functions 0007 M Sproul 10/08/29 Changed #ifdefs from cpu to register +0008 S Kanemoto 12/06/22 Fixed for Leonardo by @maris_HY *************************************************/ #include <avr/interrupt.h> @@ -85,10 +86,10 @@ volatile uint8_t timer5_pin_mask; #endif -// MLS: This does not make sense, the 3 options are the same #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #define AVAILABLE_TONE_PINS 1 +#define USE_TIMER2 const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 3, 4, 5, 1, 0 */ }; static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255, 255, 255, 255 */ }; @@ -96,13 +97,23 @@ static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255, 255, 255, 25 #elif defined(__AVR_ATmega8__) #define AVAILABLE_TONE_PINS 1 +#define USE_TIMER2 const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1 */ }; static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255 */ }; +#elif defined(__AVR_ATmega32U4__) + +#define AVAILABLE_TONE_PINS 1 +#define USE_TIMER3 + +const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 3 /*, 1 */ }; +static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255 */ }; + #else #define AVAILABLE_TONE_PINS 1 +#define USE_TIMER2 // Leave timer 0 to last. const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1, 0 */ }; @@ -480,8 +491,7 @@ void noTone(uint8_t _pin) digitalWrite(_pin, 0); } -#if 0 -#if !defined(__AVR_ATmega8__) +#ifdef USE_TIMER0 ISR(TIMER0_COMPA_vect) { if (timer0_toggle_count != 0) @@ -501,6 +511,7 @@ ISR(TIMER0_COMPA_vect) #endif +#ifdef USE_TIMER1 ISR(TIMER1_COMPA_vect) { if (timer1_toggle_count != 0) @@ -520,6 +531,7 @@ ISR(TIMER1_COMPA_vect) #endif +#ifdef USE_TIMER2 ISR(TIMER2_COMPA_vect) { @@ -541,12 +553,10 @@ ISR(TIMER2_COMPA_vect) // *timer2_pin_port &= ~(timer2_pin_mask); // keep pin low after stop } } +#endif - -//#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) -#if 0 - +#ifdef USE_TIMER3 ISR(TIMER3_COMPA_vect) { if (timer3_toggle_count != 0) @@ -563,7 +573,10 @@ ISR(TIMER3_COMPA_vect) *timer3_pin_port &= ~(timer3_pin_mask); // keep pin low after stop } } +#endif + +#ifdef USE_TIMER4 ISR(TIMER4_COMPA_vect) { if (timer4_toggle_count != 0) @@ -580,7 +593,10 @@ ISR(TIMER4_COMPA_vect) *timer4_pin_port &= ~(timer4_pin_mask); // keep pin low after stop } } +#endif + +#ifdef USE_TIMER5 ISR(TIMER5_COMPA_vect) { if (timer5_toggle_count != 0) @@ -597,5 +613,4 @@ ISR(TIMER5_COMPA_vect) *timer5_pin_port &= ~(timer5_pin_mask); // keep pin low after stop } } - #endif |