diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp
index 686b0391e..90e257483 100644
--- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp
+++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp
@@ -364,8 +364,12 @@ const unsigned char lut_partial_update[] =
 #define PIN_OUT_SET 0x60000304
 #define PIN_OUT_CLEAR 0x60000308
 
-#define PWRITE xdigitalWrite
-
+#ifdef ESP32
+#define SSPI_USEANYPIN 1
+#define PWRITE digitalWrite
+#else
+#define PWRITE ydigitalWrite
+#endif
 
 #ifndef SSPI_USEANYPIN
 // uses about 2.75 usecs, 365 kb /sec
@@ -388,6 +392,7 @@ void ICACHE_RAM_ATTR Epd::fastSPIwrite(uint8_t d,uint8_t dc) {
 }
 #else
 
+#ifndef ESP32
 extern void ICACHE_RAM_ATTR xdigitalWrite(uint8_t pin, uint8_t val) {
   //stopWaveform(pin);
   if(pin < 16){
@@ -398,6 +403,7 @@ extern void ICACHE_RAM_ATTR xdigitalWrite(uint8_t pin, uint8_t val) {
     else GP16O &= ~1;
   }
 }
+#endif
 
 // about 13 us => 76 kb / sec
 // can use any pin
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp
index 8c8d037c5..c65f4ffd5 100755
--- a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp
+++ b/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp
@@ -502,12 +502,15 @@ const unsigned char lut_wb_quick[] PROGMEM =
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-
-
 #define PIN_OUT_SET 0x60000304
 #define PIN_OUT_CLEAR 0x60000308
 
+#ifdef ESP32
+#define SSPI_USEANYPIN 1
+#define PWRITE digitalWrite
+#else
 #define PWRITE ydigitalWrite
+#endif
 
 #ifndef SSPI_USEANYPIN
 // uses about 2.75 usecs, 365 kb /sec
@@ -530,6 +533,7 @@ void ICACHE_RAM_ATTR Epd42::fastSPIwrite(uint8_t d,uint8_t dc) {
 }
 #else
 
+#ifndef ESP32
 extern void ICACHE_RAM_ATTR ydigitalWrite(uint8_t pin, uint8_t val) {
   //stopWaveform(pin);
   if(pin < 16){
@@ -540,6 +544,7 @@ extern void ICACHE_RAM_ATTR ydigitalWrite(uint8_t pin, uint8_t val) {
     else GP16O &= ~1;
   }
 }
+#endif
 // about 13 us => 76 kb / sec
 // can use any pin
 void Epd42::fastSPIwrite(uint8_t d,uint8_t dc) {