Merge pull request #11 from fpistm/arduino_core_stm32

Add support for STM32 MCU based boards to TFT library
arduino-libraries · Oct 26, 2017 · d52cb5d · d52cb5d
2 parents bbcde05 + 10e6ef9
commit d52cb5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/utility/Adafruit_ST7735.h b/src/utility/Adafruit_ST7735.h
@@ -139,7 +139,8 @@ class Adafruit_ST7735 : public Adafruit_GFX {
 #ifdef SPI_HAS_TRANSACTION
   SPISettings spisettings;
 #endif
-#if defined(ARDUINO_ARCH_SAM) || defined(__ARDUINO_ARC__)
+#if defined(ARDUINO_ARCH_SAM) || defined(__ARDUINO_ARC__) || \
+    defined(ARDUINO_ARCH_STM32)
   volatile uint32_t *dataport, *clkport, *csport, *rsport;
   uint32_t  _cs, _rs, _rst, _sid, _sclk,
            datapinmask, clkpinmask, cspinmask, rspinmask,

diff --git a/src/utility/glcdfont.c b/src/utility/glcdfont.c
@@ -1,4 +1,5 @@
-#if !defined(ARDUINO_ARCH_SAM) && !defined(__ARDUINO_ARC__)
+#if !defined(ARDUINO_ARCH_SAM) && !defined(__ARDUINO_ARC__) && \
+    !defined(ARDUINO_ARCH_STM32)
 #include <avr/io.h>
 #endif
 #include <avr/pgmspace.h>