From f60f17f79ae383a948a9cc4baa8bd0983fad6465 Mon Sep 17 00:00:00 2001 From: Shigeru KANEMOTO Date: Fri, 22 Jun 2012 23:09:29 +0900 Subject: [PATCH] Avoid TIMER3 conflict with Servo and tone(). --- libraries/Servo/Servo.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/Servo/Servo.h b/libraries/Servo/Servo.h index bf3e01215..8168494c3 100755 --- a/libraries/Servo/Servo.h +++ b/libraries/Servo/Servo.h @@ -65,9 +65,8 @@ typedef enum { _timer5, _timer1, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ; #elif defined(__AVR_ATmega32U4__) -#define _useTimer3 #define _useTimer1 -typedef enum { _timer3, _timer1, _Nbr_16timers } timer16_Sequence_t ; +typedef enum { _timer1, _Nbr_16timers } timer16_Sequence_t ; #elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__) #define _useTimer3 @@ -124,4 +123,4 @@ private: int8_t max; // maximum is this value times 4 added to MAX_PULSE_WIDTH }; -#endif \ No newline at end of file +#endif