Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for ATmega2560 and smoother transition when compare register is updated. #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for ATmega2560 and smoother transition when compare register is updated. #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions Tone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ volatile int32_t timer2_toggle_count;
volatile uint8_t *timer2_pin_port;
volatile uint8_t timer2_pin_mask;

#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
volatile int32_t timer3_toggle_count;
volatile uint8_t *timer3_pin_port;
volatile uint8_t timer3_pin_mask;
Expand All @@ -90,7 +90,7 @@ volatile uint8_t timer5_pin_mask;
#endif


#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)

#define AVAILABLE_TONE_PINS 6

Expand Down Expand Up @@ -192,7 +192,7 @@ ISR(TIMER2_COMPA_vect)



#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)

#ifdef WIRING
void Tone_Timer3_Interrupt(void)
Expand Down Expand Up @@ -272,6 +272,8 @@ void Tone::begin(uint8_t tonePin)
// All timers in CTC mode
// 8 bit timers will require changing prescalar values,
// whereas 16 bit timers are set to either ck/1 or ck/64 prescalar
//Serial.print("Timer: ");
//Serial.println(_timer);
switch (_timer)
{
#if !defined(__AVR_ATmega8__)
Expand All @@ -291,6 +293,7 @@ void Tone::begin(uint8_t tonePin)

case 1:
// 16 bit timer
//Serial.println("16 bit timer");
TCCR1A = 0;
TCCR1B = 0;
bitWrite(TCCR1B, WGM12, 1);
Expand All @@ -314,9 +317,10 @@ void Tone::begin(uint8_t tonePin)
#endif
break;

#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
case 3:
// 16 bit timer
//Serial.println("16 bit timer");
TCCR3A = 0;
TCCR3B = 0;
bitWrite(TCCR3B, WGM32, 1);
Expand All @@ -329,6 +333,7 @@ void Tone::begin(uint8_t tonePin)
break;
case 4:
// 16 bit timer
//Serial.println("16 bit timer");
TCCR4A = 0;
TCCR4B = 0;
bitWrite(TCCR4B, WGM42, 1);
Expand All @@ -341,6 +346,7 @@ void Tone::begin(uint8_t tonePin)
break;
case 5:
// 16 bit timer
//Serial.println("16 bit timer");
TCCR5A = 0;
TCCR5B = 0;
bitWrite(TCCR5B, WGM52, 1);
Expand Down Expand Up @@ -438,7 +444,7 @@ void Tone::play(uint16_t frequency, uint32_t duration)

if (_timer == 1)
TCCR1B = (TCCR1B & 0b11111000) | prescalarbits;
#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
else if (_timer == 3)
TCCR3B = (TCCR3B & 0b11111000) | prescalarbits;
else if (_timer == 4)
Expand Down Expand Up @@ -478,28 +484,48 @@ void Tone::play(uint16_t frequency, uint32_t duration)
OCR1A = ocr;
timer1_toggle_count = toggle_count;
bitWrite(TIMSK1, OCIE1A, 1);
//Check to see if the timer has already passed the new ocr value
if ( TCNT1 > ocr ){
TCNT1 = 0; //reset clock
//Serial.println("reset timer");
}
break;
case 2:
OCR2A = ocr;
timer2_toggle_count = toggle_count;
bitWrite(TIMSK2, OCIE2A, 1);
break;

#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
case 3:
OCR3A = ocr;
timer3_toggle_count = toggle_count;
bitWrite(TIMSK3, OCIE3A, 1);
//Check to see if the timer has already passed the new ocr value
if ( TCNT3 > ocr ){
TCNT3 = 0; //reset clock
//Serial.println("reset timer");
}
break;
case 4:
OCR4A = ocr;
timer4_toggle_count = toggle_count;
bitWrite(TIMSK4, OCIE4A, 1);
//Check to see if the timer has already passed the new ocr value
if ( TCNT4 > ocr ){
TCNT4 = 0; //reset clock
//Serial.println("reset timer");
}
break;
case 5:
OCR5A = ocr;
timer5_toggle_count = toggle_count;
bitWrite(TIMSK5, OCIE5A, 1);
//Check to see if the timer has already passed the new ocr value
if ( TCNT5 > ocr ){
TCNT5 = 0; //reset clock
//Serial.println("reset timer");
}
break;
#endif

Expand All @@ -524,7 +550,7 @@ void Tone::stop()
TIMSK2 &= ~(1 << OCIE2A);
break;

#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
case 3:
TIMSK3 &= ~(1 << OCIE3A);
break;
Expand Down Expand Up @@ -560,7 +586,7 @@ bool Tone::isPlaying(void)
returnvalue = (TIMSK2 & (1 << OCIE2A));
break;

#if defined(__AVR_ATmega1280__)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
case 3:
returnvalue = (TIMSK3 & (1 << OCIE3A));
break;
Expand Down