diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2012-10-18 15:50:09 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2012-10-18 15:50:09 +0200 |
| commit | 6a45ba48ab1f2d0a168373a02ba7fded40a3470e (patch) | |
| tree | 163448869b4dfcbce95dc877ffff61a709fba6b6 /libraries | |
| parent | c313b54c00635f1be14a1b09617dc9b8b562e589 (diff) | |
| parent | 6d296e0faba5b9910084c307a3f93cb2653bf7f8 (diff) | |
Merged upstream arduino branch
Diffstat (limited to 'libraries')
| -rwxr-xr-x | libraries/Servo/Servo.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libraries/Servo/Servo.h b/libraries/Servo/Servo.h index bf3e012..8168494 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 |