Merge 4efc6d90f6 into 0e32d7dc76

Update library.properties - bump version to 1.11.10
Allow using ATtiny84 (#455 )
2024-10-03 18:18:46 -04:00 · 2024-10-02 01:19:57 +05:30 · 2024-07-23 15:16:47 +01:00 · 2024-07-18 10:16:19 -04:00 · 2022-10-09 19:51:21 +02:00
6 changed files with 13 additions and 9 deletions
--- a/Adafruit_GrayOLED.cpp
+++ b/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>
--- a/Adafruit_GrayOLED.h
+++ b/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_
--- a/Adafruit_SPITFT.cpp
+++ b/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__
--- a/Adafruit_SPITFT.h
+++ b/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_
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Adafruit GFX Library ![Build Status](https://github.com/adafruit/Adafruit-GFX-Library/workflows/Arduino%20Library%20CI/badge.svg)
+# Adafruit GFX Library ![Build Status](https://github.com/adafruit/Adafruit-GFX-Library/workflows/Arduino%20Library%20CI/badge.svg) [![Documentation](https://github.com/adafruit/ci-arduino/blob/master/assets/doxygen_badge.svg)](https://adafruit.github.io/Adafruit-GFX-Library/html/index.html)

 This is the core graphics library for all our displays, providing a common set of graphics primitives (points, lines, circles, etc.). It needs to be paired with a hardware-specific library for each display device we carry (to handle the lower-level functions).

--- a/library.properties
+++ b/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.
Author	SHA1	Message	Date
Idar Lund	970c3ba807	Merge `4efc6d90f6` into `0e32d7dc76`	2024-10-02 01:19:57 +05:30
Tyeth Gundry	0e32d7dc76	Update library.properties - bump version to 1.11.10 Some checks failed Arduino Library CI / build (push) Has been cancelled Details	2024-07-23 15:16:47 +01:00
Zane Bauman	5080bec822	Allow using ATtiny84 (#455 ) Some checks failed Arduino Library CI / build (push) Has been cancelled Details	2024-07-18 10:16:19 -04:00
Idar Lund	4efc6d90f6	Add a doc status badge to the README. Add a doc status badge to the README.	2022-10-09 19:51:21 +02:00