rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Code Issues Releases Activity

Support 3rd external interrupt on ATmega1284P (maniacbug)

Browse Source 
http://code.google.com/p/arduino/issues/detail?id=728
This commit is contained in:
David A. Mellis 2011-12-02 17:17:27 -05:00
parent 0d70c7272e
commit d7d0e304d5
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hardware/arduino/cores/arduino/WInterrupts.c
View File

@ -110,6 +110,21 @@ void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {
#warning attachInterrupt may need some more work for this cpu (case 1) #warning attachInterrupt may need some more work for this cpu (case 1)
#endif #endif
break; break;
case 2:
#if defined(EICRA) && defined(ISC20) && defined(ISC21) && defined(EIMSK)
EICRA = (EICRA & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
EIMSK |= (1 << INT2);
#elif defined(MCUCR) && defined(ISC20) && defined(ISC21) && defined(GICR)
MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
GICR |= (1 << INT2);
#elif defined(MCUCR) && defined(ISC20) && defined(GIMSK) && defined(GIMSK)
MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
GIMSK |= (1 << INT2);
#else
#warning attachInterrupt may need some more work for this cpu (case 1)
#endif
break;
#endif #endif
} }
} }
@ -237,6 +252,13 @@ SIGNAL(INT1_vect) {
intFunc[EXTERNAL_INT_1](); intFunc[EXTERNAL_INT_1]();
} }
#if defined(EICRA) && defined(ISC20)
SIGNAL(INT2_vect) {
if(intFunc[EXTERNAL_INT_2])
intFunc[EXTERNAL_INT_2]();
}
#endif
#endif #endif
/* /*

2
hardware/arduino/cores/arduino/wiring_private.h
View File

@ -54,6 +54,8 @@ extern "C"{
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define EXTERNAL_NUM_INTERRUPTS 8 #define EXTERNAL_NUM_INTERRUPTS 8
#elif defined(__AVR_ATmega1284P__)
#define EXTERNAL_NUM_INTERRUPTS 3
#else #else
#define EXTERNAL_NUM_INTERRUPTS 2 #define EXTERNAL_NUM_INTERRUPTS 2
#endif #endif