Simplified ICACHE_RAM_ATTR / IRAM_ATTR usage per review comment.

dok-net · dok-net · commit 9d20ef5295a7 · 2020-10-22T19:12:16.000+02:00
diff --git a/libraries/FunctionalInterrupt/examples/Functional/Functional.ino b/libraries/FunctionalInterrupt/examples/Functional/Functional.ino
@@ -1,5 +1,9 @@
 #include <FunctionalInterrupt.h>
 
+#ifndef IRAM_ATTR
+#define IRAM_ATTR ICACHE_RAM_ATTR
+#endif
+
 #if defined(ESP32)
 #define BUTTON1 16
 #define BUTTON2 17
@@ -32,21 +36,13 @@ class Button {
       detachInterrupt(PIN);
     }
 
-#if defined(ESP8266)
-    void ICACHE_RAM_ATTR buttonIsr()
-#elif defined(ESP32)
     void IRAM_ATTR buttonIsr()
-#endif
     {
       numberKeyPresses += 1;
       pressed = true;
     }
 
-#if defined(ESP8266)
-    static void ICACHE_RAM_ATTR buttonIsr_static(Button* const self)
-#elif defined(ESP32)
     static void IRAM_ATTR buttonIsr_static(Button* const self)
-#endif
     {
       self->buttonIsr();
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`#include <FunctionalInterrupt.h>`
`2`	`2`
	`3`	`+#ifndef IRAM_ATTR`
	`4`	`+#define IRAM_ATTR ICACHE_RAM_ATTR`
	`5`	`+#endif`
	`6`	`+`
`3`	`7`	`#if defined(ESP32)`
`4`	`8`	`#define BUTTON1 16`
`5`	`9`	`#define BUTTON2 17`
`@@ -32,21 +36,13 @@ class Button {`
`32`	`36`	`detachInterrupt(PIN);`
`33`	`37`	`}`
`34`	`38`
`35`		`-#if defined(ESP8266)`
`36`		`- void ICACHE_RAM_ATTR buttonIsr()`
`37`		`-#elif defined(ESP32)`
`38`	`39`	`void IRAM_ATTR buttonIsr()`
`39`		`-#endif`
`40`	`40`	`{`
`41`	`41`	`numberKeyPresses += 1;`
`42`	`42`	`pressed = true;`
`43`	`43`	`}`
`44`	`44`
`45`		`-#if defined(ESP8266)`
`46`		`- static void ICACHE_RAM_ATTR buttonIsr_static(Button* const self)`
`47`		`-#elif defined(ESP32)`
`48`	`45`	`static void IRAM_ATTR buttonIsr_static(Button* const self)`
`49`		`-#endif`
`50`	`46`	`{`
`51`	`47`	`self->buttonIsr();`
`52`	`48`	`}`