diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-04-03 13:51:04 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-04-03 13:51:04 +0200 |
| commit | ee90e68e86dd61d86f5d17b69080338328765b22 (patch) | |
| tree | e620c0edc2690ab789b665e567910640597aa6fe /libraries/Wire/utility | |
| parent | 0ecdc5ebc96ad4c7c548c438a03d9ce00679db8b (diff) | |
| parent | f50c307be280dc6ece9e70c43b301c1db36291a0 (diff) | |
Merged 1.0.5
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
app/src/processing/app/Base.java
build/shared/revisions.txt
hardware/arduino/avr/cores/arduino/malloc.c
hardware/arduino/cores/arduino/avr-libc/malloc.c
hardware/arduino/cores/arduino/malloc.c
todo.txt
Diffstat (limited to 'libraries/Wire/utility')
| -rw-r--r-- | libraries/Wire/utility/twi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/Wire/utility/twi.c b/libraries/Wire/utility/twi.c index 6b2db3c..201d7d1 100644 --- a/libraries/Wire/utility/twi.c +++ b/libraries/Wire/utility/twi.c @@ -360,7 +360,7 @@ void twi_releaseBus(void) twi_state = TWI_READY; } -SIGNAL(TWI_vect) +ISR(TWI_vect) { switch(TW_STATUS){ // All Master |