Fixing Servo library on the ATmega8 by changing assignments to TIMSK and TIFR into bitwise-or's. Otherwise, this broke millis() by disabling the timer 0 overflow interrupt.

1 files changed, 4 insertions, 4 deletions

diff --git a/libraries/Servo/Servo.cpp b/libraries/Servo/Servo.cpp
index 32cc0e7..9f58d64 100755
--- a/libraries/Servo/Servo.cpp
+++ b/libraries/Servo/Servo.cpp
@@ -128,11 +128,11 @@ static void initISR(servoTimer_t timer)
     TCCR1B = _BV(CS11);     // set prescaler of 8 

     TCNT1 = 0;              // clear the timer count 

 #if defined(__AVR_ATmega8__)

-    TIFR = _BV(OCF1A);      // clear any pending interrupts; 

-    TIMSK =  _BV(OCIE1A) ;  // enable the output compare interrupt    

+    TIFR |= _BV(OCF1A);      // clear any pending interrupts; 

+    TIMSK |=  _BV(OCIE1A) ;  // enable the output compare interrupt    

 #else

-    TIFR1 = _BV(OCF1A);     // clear any pending interrupts; 

-    TIMSK1 =  _BV(OCIE1A) ; // enable the output compare interrupt 

+    TIFR1 |= _BV(OCF1A);     // clear any pending interrupts; 

+    TIMSK1 |=  _BV(OCIE1A) ; // enable the output compare interrupt 

 #endif

   } 

 #if defined(__AVR_ATmega1280__)