noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixdetachinterrupt' of https://github.com/vicatcu/Arduino

This commit is contained in:
Cristian Maglie 2015-05-26 00:21:58 +02:00
parent 777e726816 e9045d8b8a
commit f495be46b6
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/shared/revisions.txt
View File

@ -19,7 +19,8 @@ ARDUINO 1.6.5
[core]
* AVR: delayMicroseconds(..) doesn't hang if called with 0. Thanks @cano64
* AVR: delayMicroseconds(..), added support for 1Mhz, 12Mhz and 24Mhz. Thanks @cano64
* SAM: added watchdog routing for Due. Thanks @bobc
* AVR: added missing case in detachInterrupt(). Thanks @vicatcu
* SAM: added watchdog routine for Due. Thanks @bobc
ARDUINO 1.6.4 - 2015.05.06

12
hardware/arduino/avr/cores/arduino/WInterrupts.c
View File

@ -223,6 +223,18 @@ void detachInterrupt(uint8_t interruptNum) {
#warning detachInterrupt may need some more work for this cpu (case 1)
#endif
break;
case 2:
#if defined(EIMSK) && defined(INT2)
EIMSK &= ~(1 << INT2);
#elif defined(GICR) && defined(INT2)
GICR &= ~(1 << INT2); // atmega32
#elif defined(GIMSK) && defined(INT2)
GIMSK &= ~(1 << INT2);
#else
#warning detachInterrupt may need some more work for this cpu (case 2)
#endif
break;
#endif
}