noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for issue #292 

Replaced direct register manipulation with calls to bitWrite(). Fixed TIMSK5 usage on Leonardo (as well as some other preprocessor statements).
This commit is contained in:
Jan 2015-04-13 20:36:28 +02:00
parent 331f5c832e
commit d27eb7e1c1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cores/arduino/Tone.cpp
View File

@ -390,7 +390,7 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
break; break;
#endif #endif
#if defined(TIMSK3) #if defined(OCR3A) && defined(TIMSK3) && defined(OCIE3A)
case 3: case 3:
OCR3A = ocr; OCR3A = ocr;
timer3_toggle_count = toggle_count; timer3_toggle_count = toggle_count;
@ -398,7 +398,7 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
break; break;
#endif #endif
#if defined(TIMSK4) #if defined(OCR4A) && defined(TIMSK4) && defined(OCIE4A)
case 4: case 4:
OCR4A = ocr; OCR4A = ocr;
timer4_toggle_count = toggle_count; timer4_toggle_count = toggle_count;
@ -455,21 +455,21 @@ void disableTimer(uint8_t _timer)
#endif #endif
break; break;
#if defined(TIMSK3) #if defined(TIMSK3) && defined(OCIE3A)
case 3: case 3:
TIMSK3 &= ~(1 << OCIE3A); bitWrite(TIMSK3, OCIE3A, 0);
break; break;
#endif #endif
#if defined(TIMSK4) #if defined(TIMSK4) && defined(OCIE4A)
case 4: case 4:
TIMSK4 &= ~(1 << OCIE4A); bitWrite(TIMSK4, OCIE4A, 0);
break; break;
#endif #endif
#if defined(TIMSK5) #if defined(TIMSK5) && defined(OCIE5A)
case 5: case 5:
TIMSK5 &= ~(1 << OCIE5A); bitWrite(TIMSK5, OCIE5A, 0);
break; break;
#endif #endif
} }