Merge 3ca0b6a9d7 into 0e32d7dc76

Adafruit_GFX.cpp

@@ -172,6 +172,20 @@ void Adafruit_GFX::writeLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
   }
 }
 
+/**************************************************************************/
+/*!
+   @brief    Clear the display, overwrite in subclasses.
+*/
+/**************************************************************************/
+void Adafruit_GFX::clearDisplay() {}
+
+/**************************************************************************/
+/*!
+   @brief    Update the display, overwrite in subclasses.
+*/
+/**************************************************************************/
+void Adafruit_GFX::display() {}
+
 /**************************************************************************/
 /*!
    @brief    Start a display-writing routine, overwrite in subclasses.

Adafruit_GFX.h

@@ -10,7 +10,9 @@
 #include "gfxfont.h"
 
 #include <Adafruit_I2CDevice.h>
+#ifndef SKIP_SPI
 #include <Adafruit_SPIDevice.h>
+#endif
 
 /// A generic graphics superclass that can handle all sorts of drawing. At a
 /// minimum you can subclass and provide drawPixel(). At a maximum you can do a
@@ -43,6 +45,8 @@ public:
   virtual void writeLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
                          uint16_t color);
   virtual void endWrite(void);
+  virtual void clearDisplay(void);
+  virtual void display(void);
 
   // CONTROL API
   // These MAY be overridden by the subclass to provide device-specific

Adafruit_GrayOLED.cpp

@@ -15,7 +15,8 @@
  *
  */
 
-#if !defined(__AVR_ATtiny85__) // Not for ATtiny, at all
+// Not for ATtiny, at all
+#if !defined(__AVR_ATtiny85__) && !defined(__AVR_ATtiny84__)
 
 #include "Adafruit_GrayOLED.h"
 #include <Adafruit_GFX.h>

Adafruit_GrayOLED.h

@@ -24,7 +24,8 @@
 #ifndef _Adafruit_GRAYOLED_H_
 #define _Adafruit_GRAYOLED_H_
 
-#if !defined(__AVR_ATtiny85__) // Not for ATtiny, at all
+// Not for ATtiny, at all
+#if !defined(__AVR_ATtiny85__) && !defined(__AVR_ATtiny84__)
 
 #include <Adafruit_GFX.h>
 #include <Adafruit_I2CDevice.h>
@@ -96,5 +97,5 @@ private:
   TwoWire *_theWire = NULL; ///< The underlying hardware I2C
 };
 
-#endif // end __AVR_ATtiny85__
+#endif // end __AVR_ATtiny85__ __AVR_ATtiny84__
 #endif // _Adafruit_GrayOLED_H_

Adafruit_SPITFT.cpp

@@ -31,7 +31,8 @@
  * BSD license, all text here must be included in any redistribution.
  */
 
-#if !defined(__AVR_ATtiny85__) // Not for ATtiny, at all
+// Not for ATtiny, at all
+#if !defined(__AVR_ATtiny85__) && !defined(__AVR_ATtiny84__)
 
 #include "Adafruit_SPITFT.h"
 
@@ -2558,4 +2559,4 @@ inline void Adafruit_SPITFT::TFT_RD_LOW(void) {
 #endif // end !USE_FAST_PINIO
 }
 
-#endif // end __AVR_ATtiny85__
+#endif // end __AVR_ATtiny85__ __AVR_ATtiny84__

Adafruit_SPITFT.h

@@ -20,7 +20,8 @@
 #ifndef _ADAFRUIT_SPITFT_H_
 #define _ADAFRUIT_SPITFT_H_
 
-#if !defined(__AVR_ATtiny85__) // Not for ATtiny, at all
+// Not for ATtiny, at all
+#if !defined(__AVR_ATtiny85__) && !defined(__AVR_ATtiny84__)
 
 #include "Adafruit_GFX.h"
 #include <SPI.h>
@@ -526,5 +527,5 @@ protected:
   uint32_t _freq = 0; ///< Dummy var to keep subclasses happy
 };
 
-#endif // end __AVR_ATtiny85__
+#endif // end __AVR_ATtiny85__ __AVR_ATtiny84__
 #endif // end _ADAFRUIT_SPITFT_H_

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit GFX Library
-version=1.11.9
+version=1.11.10
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=Adafruit GFX graphics core library, this is the 'core' class that all our other graphics libraries derive from.