diff --git a/Adafruit_ST7735.cpp b/Adafruit_ST7735.cpp index 47a1769..a8acde8 100755 --- a/Adafruit_ST7735.cpp +++ b/Adafruit_ST7735.cpp @@ -25,6 +25,7 @@ Adafruit_ST7735::Adafruit_ST7735(int8_t cs, int8_t dc, int8_t rst) : Adafruit_ST77xx(cs, dc, rst) { } +#if !defined(ESP8266) /*! @brief Instantiate Adafruit ST7735 driver with selectable hardware SPI @param spiClass Pointer to an SPI device to use (e.g. &SPI1) @@ -35,6 +36,7 @@ Adafruit_ST7735::Adafruit_ST7735(int8_t cs, int8_t dc, int8_t rst) : Adafruit_ST7735::Adafruit_ST7735(SPIClass *spiClass, int8_t cs, int8_t dc, int8_t rst) : Adafruit_ST77xx(spiClass, cs, dc, rst) { } +#endif // end !ESP8266 // SCREEN INITIALIZATION *************************************************** diff --git a/Adafruit_ST7735.h b/Adafruit_ST7735.h index 1fa44dd..3dfcd86 100755 --- a/Adafruit_ST7735.h +++ b/Adafruit_ST7735.h @@ -53,7 +53,9 @@ class Adafruit_ST7735 : public Adafruit_ST77xx { Adafruit_ST7735(int8_t cs, int8_t dc, int8_t mosi, int8_t sclk, int8_t rst); Adafruit_ST7735(int8_t cs, int8_t dc, int8_t rst); +#if !defined(ESP8266) Adafruit_ST7735(SPIClass *spiClass, int8_t cs, int8_t dc, int8_t rst); +#endif // end !ESP8266 // Differences between displays (usu. identified by colored tab on // plastic overlay) are odd enough that we need to do this 'by hand': diff --git a/Adafruit_ST7789.cpp b/Adafruit_ST7789.cpp index ea20115..44181b6 100644 --- a/Adafruit_ST7789.cpp +++ b/Adafruit_ST7789.cpp @@ -25,6 +25,7 @@ Adafruit_ST7789::Adafruit_ST7789(int8_t cs, int8_t dc, int8_t rst) : Adafruit_ST77xx(cs, dc, rst) { } +#if !defined(ESP8266) /*! @brief Instantiate Adafruit ST7789 driver with selectable hardware SPI @param spiClass Pointer to an SPI device to use (e.g. &SPI1) @@ -35,6 +36,7 @@ Adafruit_ST7789::Adafruit_ST7789(int8_t cs, int8_t dc, int8_t rst) : Adafruit_ST7789::Adafruit_ST7789(SPIClass *spiClass, int8_t cs, int8_t dc, int8_t rst) : Adafruit_ST77xx(spiClass, cs, dc, rst) { } +#endif // end !ESP8266 // SCREEN INITIALIZATION *************************************************** diff --git a/Adafruit_ST7789.h b/Adafruit_ST7789.h index 902fa6e..f02e832 100644 --- a/Adafruit_ST7789.h +++ b/Adafruit_ST7789.h @@ -9,7 +9,9 @@ class Adafruit_ST7789 : public Adafruit_ST77xx { Adafruit_ST7789(int8_t cs, int8_t dc, int8_t mosi, int8_t sclk, int8_t rst = -1); Adafruit_ST7789(int8_t cs, int8_t dc, int8_t rst); +#if !defined(ESP8266) Adafruit_ST7789(SPIClass *spiClass, int8_t cs, int8_t dc, int8_t rst); +#endif // end !ESP8266 void setRotation(uint8_t m); void init(uint16_t width, uint16_t height); diff --git a/Adafruit_ST77xx.cpp b/Adafruit_ST77xx.cpp index 626da38..f0f1992 100644 --- a/Adafruit_ST77xx.cpp +++ b/Adafruit_ST77xx.cpp @@ -60,6 +60,7 @@ Adafruit_ST77xx::Adafruit_ST77xx(int8_t cs, int8_t dc, int8_t rst) : Adafruit_SPITFT(ST7735_TFTWIDTH_128, ST7735_TFTHEIGHT_160, cs, dc, rst) { } +#if !defined(ESP8266) /**************************************************************************/ /*! @brief Instantiate Adafruit ST77XX driver with selectable hardware SPI @@ -73,6 +74,7 @@ Adafruit_ST77xx::Adafruit_ST77xx(SPIClass *spiClass, int8_t cs, int8_t dc, int8_t rst) : Adafruit_SPITFT(ST7735_TFTWIDTH_128, ST7735_TFTHEIGHT_160, spiClass, cs, dc, rst) { } +#endif // end !ESP8266 /**************************************************************************/ /*! diff --git a/Adafruit_ST77xx.h b/Adafruit_ST77xx.h index 6ec0f58..22133a3 100644 --- a/Adafruit_ST77xx.h +++ b/Adafruit_ST77xx.h @@ -89,8 +89,10 @@ class Adafruit_ST77xx : public Adafruit_SPITFT { Adafruit_ST77xx(int8_t _CS, int8_t _DC, int8_t _MOSI, int8_t _SCLK, int8_t _RST = -1, int8_t _MISO = -1); Adafruit_ST77xx(int8_t CS, int8_t RS, int8_t RST = -1); +#if !defined(ESP8266) Adafruit_ST77xx(SPIClass *spiClass, int8_t CS, int8_t RS, int8_t RST = -1); +#endif // end !ESP8266 void setAddrWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h); void setRotation(uint8_t r); diff --git a/library.properties b/library.properties index 7f5ff50..a1063c3 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit ST7735 and ST7789 Library -version=1.2.7 +version=1.2.8 author=Adafruit maintainer=Adafruit sentence=This is a library for the Adafruit ST7735 and ST7789 SPI displays.