Fix for ESP8266

PaulStoffregen · Jun 25, 2019 · 26b691b · marcelstoer · Jun 25, 2019 · 26b691b
1 parent 5ccb951
commit 26b691b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/XPT2046_Touchscreen.cpp b/XPT2046_Touchscreen.cpp
@@ -43,11 +43,8 @@ bool XPT2046_Touchscreen::begin()
 	return true;
 }
 
-#ifdef ESP32
-void IRAM_ATTR isrPin( void )
-#else
+ISR_PREFIX
 void isrPin( void )
-#endif
 {
 	XPT2046_Touchscreen *o = isrPinptr;
 	o->isrWake = true;

diff --git a/XPT2046_Touchscreen.h b/XPT2046_Touchscreen.h
@@ -61,4 +61,15 @@ class XPT2046_Touchscreen {
 	uint32_t msraw=0x80000000;
 };
 
+#ifndef ISR_PREFIX
+  #if defined(ESP8266)
+    #define ISR_PREFIX ICACHE_RAM_ATTR
+  #elif defined(ESP32)
+    // TODO: should this also be ICACHE_RAM_ATTR ??
+    #define ISR_PREFIX IRAM_ATTR
+  #else
+    #define ISR_PREFIX
+  #endif
+#endif
+
 #endif