Merge pull request #16 from sethten/master

Add ESP8266 support
adafruit · Feb 9, 2017 · df16148 · df16148
2 parents 8d760c5 + 31581f8
commit df16148
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Adafruit_ILI9340.cpp b/Adafruit_ILI9340.cpp
@@ -36,7 +36,7 @@
   #define SET_BIT(port, bitMask) *(port) |= (bitMask)
   #define CLEAR_BIT(port, bitMask) *(port) &= ~(bitMask)
 #endif
-#if defined(__arm__) && defined(CORE_TEENSY)
+#if (defined(__arm__) && defined(CORE_TEENSY)) || defined(ESP8266)
   #define USE_SPI_LIBRARY
   #define SET_BIT(port, bitMask) digitalWrite(*(port), HIGH);
   #define CLEAR_BIT(port, bitMask) digitalWrite(*(port), LOW);
@@ -171,7 +171,7 @@ void Adafruit_ILI9340::begin(void) {
   csport    = digitalPinToPort(_cs);
   dcport    = digitalPinToPort(_dc);
 #endif
-#if defined(__arm__) && defined(CORE_TEENSY)
+#if (defined(__arm__) && defined(CORE_TEENSY)) || defined(ESP8266)
   mosiport = &_mosi;
   clkport = &_sclk;
   rsport = &_rst;
@@ -183,7 +183,7 @@ void Adafruit_ILI9340::begin(void) {
 
   if(hwSPI) { // Using hardware SPI
     SPI.begin();
-#ifdef __AVR__
+#if defined(__AVR__) || defined(ESP8266)
     SPI.setClockDivider(SPI_CLOCK_DIV2); // 8 MHz (full! speed!)
 #endif
 #if defined(__SAM3X8E__)

diff --git a/Adafruit_ILI9340.h b/Adafruit_ILI9340.h
@@ -171,7 +171,7 @@ class Adafruit_ILI9340 : public Adafruit_GFX {
   uint32_t  _cs, _dc, _rst, _mosi, _miso, _sclk,
             mosipinmask, clkpinmask, cspinmask, dcpinmask;
 #endif //  #if defined(__SAM3X8E__)
-#if defined(__arm__) && defined(CORE_TEENSY)
+#if (defined(__arm__) && defined(CORE_TEENSY)) || defined(ESP8266)
   volatile uint8_t *mosiport, *clkport, *dcport, *rsport, *csport;
   uint8_t  _cs, _dc, _rst, _mosi, _miso, _sclk,
            mosipinmask, clkpinmask, cspinmask, dcpinmask;