Merge pull request #34 from joshuajnoble/master

adding Attiny84 for Arduino Tiny
This commit is contained in:
joshua noble
2013-07-23 16:51:07 -07:00

View File

@@ -61,6 +61,9 @@
#elif defined(__AVR_ATmega8P__) || defined(__AVR_ATmega8__) #elif defined(__AVR_ATmega8P__) || defined(__AVR_ATmega8__)
#define IR_USE_TIMER1 // tx = pin 9 #define IR_USE_TIMER1 // tx = pin 9
#elif defined( __AVR_ATtinyX4__ )
#define IR_USE_TIMER1 // tx = pin 6
// Arduino Duemilanove, Diecimila, LilyPad, Mini, Fio, etc // Arduino Duemilanove, Diecimila, LilyPad, Mini, Fio, etc
#else #else
//#define IR_USE_TIMER1 // tx = pin 9 //#define IR_USE_TIMER1 // tx = pin 9
@@ -271,7 +274,13 @@ extern volatile irparams_t irparams;
#define TIMER_ENABLE_INTR (TIMSK1 = _BV(OCIE1A)) #define TIMER_ENABLE_INTR (TIMSK1 = _BV(OCIE1A))
#define TIMER_DISABLE_INTR (TIMSK1 = 0) #define TIMER_DISABLE_INTR (TIMSK1 = 0)
#endif #endif
#if defined(__AVR_ATtinyX4__)
#define TIMER_INTR_NAME TIM1_COMPA_vect
#else
#define TIMER_INTR_NAME TIMER1_COMPA_vect #define TIMER_INTR_NAME TIMER1_COMPA_vect
#endif
#define TIMER_CONFIG_KHZ(val) ({ \ #define TIMER_CONFIG_KHZ(val) ({ \
const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ const uint16_t pwmval = SYSCLOCK / 2000 / (val); \
TCCR1A = _BV(WGM11); \ TCCR1A = _BV(WGM11); \
@@ -291,6 +300,8 @@ extern volatile irparams_t irparams;
#define TIMER_PWM_PIN 11 /* Arduino Mega */ #define TIMER_PWM_PIN 11 /* Arduino Mega */
#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__) #elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__)
#define TIMER_PWM_PIN 13 /* Sanguino */ #define TIMER_PWM_PIN 13 /* Sanguino */
#elif defined(__AVR_ATtinyX4__)
#define TIMER_PWM_PIN 6 /* ATTiny84 */
#else #else
#define TIMER_PWM_PIN 9 /* Arduino Duemilanove, Diecimila, LilyPad, etc */ #define TIMER_PWM_PIN 9 /* Arduino Duemilanove, Diecimila, LilyPad, etc */
#endif #endif