1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-12-18 10:22:18 +03:00

Merged upstream arduino branch

This commit is contained in:
Cristian Maglie
2012-10-18 15:50:09 +02:00
364 changed files with 153088 additions and 102 deletions

View File

@@ -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
#endif