Skip to content

Commit bde7204

Browse files
committed
Revert errors in changes from 23.12.20
1 parent fcccbff commit bde7204

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/private/IRTimer.hpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void disableSendPWMByTimer() {
146146
***************************************/
147147
// Arduino Duemilanove, Diecimila, LilyPad, Mini, Fio, Nano, etc
148148
#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328PB__) || defined(__AVR_ATmega168__) \
149-
|| defined(__AVR_ATmega88P__) || defined(__AVR_ATmega88PB__) || defined(__AVR_ATmega8__)
149+
|| defined(__AVR_ATmega88P__) || defined(__AVR_ATmega88PB__)
150150
# if !defined(IR_USE_AVR_TIMER1) && !defined(IR_USE_AVR_TIMER2)
151151
//#define IR_USE_AVR_TIMER1 // send pin = pin 9
152152
#define IR_USE_AVR_TIMER2 // send pin = pin 3
@@ -184,7 +184,7 @@ void disableSendPWMByTimer() {
184184
# endif
185185

186186
// ATmega8u2, ATmega16U2, ATmega32U2
187-
#elif defined(__AVR_ATmega8U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__)
187+
#elif defined(__AVR_ATmega8U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega8__)
188188
# if !defined(IR_USE_AVR_TIMER1)
189189
#define IR_USE_AVR_TIMER1 // send pin = pin C6
190190
# endif
@@ -303,20 +303,15 @@ void disableSendPWMByTimer() {
303303
#if defined(IR_USE_AVR_TIMER1)
304304

305305
# if defined(TIMSK1)
306-
void timerEnableReceiveInterrupt() {
307-
TIMSK1 = _BV(OCIE1A); // Timer/Counter1, Output Compare A Match Interrupt Enable
308-
}
309-
void timerDisableReceiveInterrupt() {
310-
TIMSK1 &= ~_BV(OCIE1A);
311-
}
312-
# else
306+
#define TIMSK TIMSK1 // use the value of TIMSK1 for the statements below
307+
# endif
308+
313309
void timerEnableReceiveInterrupt() {
314310
TIMSK |= _BV(OCIE1A);
315311
}
316312
void timerDisableReceiveInterrupt() {
317313
TIMSK &= ~_BV(OCIE1A);
318314
}
319-
# endif
320315

321316
# if defined(USE_TIMER_CHANNEL_B)
322317
# if defined(TIMER1_COMPB_vect)

0 commit comments

Comments
 (0)