Merge 6da3d76da5 into 126007f2c5

Adafruit_GrayOLED.cpp

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

Adafruit_GrayOLED.h

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

Adafruit_SPITFT.cpp

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

Adafruit_SPITFT.h

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

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit GFX Library
-version=1.11.10
+version=1.11.9
 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.