Merge pull request esp8266#6 from esp8266/esp8266

me-no-dev · me-no-dev · commit 0ed22e3826bb · 2015-06-16T00:32:33.000+03:00
Esp8266
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring_digital.c b/hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring_digital.c
@@ -123,7 +123,11 @@ void interrupt_handler(void *arg) {
     while(!(changedbits & (1 << i))) i++;
     changedbits &= ~(1 << i);
     interrupt_handler_t *handler = &interrupt_handlers[i];
-    if(((handler->mode & 1) == digitalRead(i)) && handler->fn) handler->fn();
+    if (handler->fn && 
+        (handler->mode == CHANGE || 
+         (handler->mode & 1) == digitalRead(i))) {
+      handler->fn();
+    }
   }
   ETS_GPIO_INTR_ENABLE();
 }

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,11 @@ void interrupt_handler(void *arg) {`
`123`	`123`	`while(!(changedbits & (1 << i))) i++;`
`124`	`124`	`changedbits &= ~(1 << i);`
`125`	`125`	`interrupt_handler_t *handler = &interrupt_handlers[i];`
`126`		`- if(((handler->mode & 1) == digitalRead(i)) && handler->fn) handler->fn();`
	`126`	`+ if (handler->fn &&`
	`127`	`+ (handler->mode == CHANGE \|\|`
	`128`	`+ (handler->mode & 1) == digitalRead(i))) {`
	`129`	`+ handler->fn();`
	`130`	`+ }`
`127`	`131`	`}`
`128`	`132`	`ETS_GPIO_INTR_ENABLE();`
`129`	`133`	`}`