Fix for 656a33e

dok-net · dok-net · commit a71651f45800 · 2021-04-28T14:15:25.000+02:00
diff --git a/libraries/FunctionalInterrupt/examples/Functional/Functional.ino b/libraries/FunctionalInterrupt/examples/Functional/Functional.ino
@@ -3,10 +3,6 @@
 
 //#include <FunctionalInterrupt.h>
 
-#ifndef IRAM_ATTR
-#define IRAM_ATTR ICACHE_RAM_ATTR
-#endif
-
 #if defined(ESP32)
 #define BUTTON1 16
 #define BUTTON2 17
diff --git a/libraries/FunctionalInterrupt/examples/ScheduledFunctional/ScheduledFunctional.ino b/libraries/FunctionalInterrupt/examples/ScheduledFunctional/ScheduledFunctional.ino
@@ -1,9 +1,5 @@
 #include <FunctionalInterrupt.h>
 
-#ifndef IRAM_ATTR
-#define IRAM_ATTR ICACHE_RAM_ATTR
-#endif
-
 #if defined(ESP32)
 #define BUTTON1 16
 #define BUTTON2 17
diff --git a/libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp b/libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp
@@ -16,7 +16,7 @@ namespace
         InterruptInfo interruptInfo;
     };
 
-    void ICACHE_RAM_ATTR interruptScheduleFunctional(const InterruptScheduleFunctionalArg& arg)
+    void IRAM_ATTR interruptScheduleFunctional(const InterruptScheduleFunctionalArg& arg)
     {
         ScheduleLambdaArg lambdaArg{ arg.scheduledIntRoutine, { arg.pin } };
         lambdaArg.interruptInfo.value = digitalRead(arg.pin);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace`
`16`	`16`	`InterruptInfo interruptInfo;`
`17`	`17`	`};`
`18`	`18`
`19`		`- void ICACHE_RAM_ATTR interruptScheduleFunctional(const InterruptScheduleFunctionalArg& arg)`
	`19`	`+ void IRAM_ATTR interruptScheduleFunctional(const InterruptScheduleFunctionalArg& arg)`
`20`	`20`	`{`
`21`	`21`	`ScheduleLambdaArg lambdaArg{ arg.scheduledIntRoutine, { arg.pin } };`
`22`	`22`	`lambdaArg.interruptInfo.value = digitalRead(arg.pin);`