Merge pull request #35 from zeitue/master

Added ifdef to allow Teensy 4.1 to work
adafruit · Oct 5, 2021 · 046155b · 046155b
2 parents a3f9d0e + a19291a
commit 046155b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/TouchScreen.h b/TouchScreen.h
@@ -7,14 +7,15 @@
 #define _ADAFRUIT_TOUCHSCREEN_H_
 #include <stdint.h>
 
-#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32U4__) ||              \
-    defined(TEENSYDUINO) || defined(__AVR_ATmega2560__) ||                     \
-    defined(__AVR_ATmega4809__)
+#if (defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32U4__) ||             \
+     defined(TEENSYDUINO) || defined(__AVR_ATmega2560__) ||                    \
+     defined(__AVR_ATmega4809__)) &&                                           \
+    !defined(__IMXRT1062__)
 typedef volatile uint8_t RwReg;
 #elif defined(ARDUINO_STM32_FEATHER)
 typedef volatile uint32 RwReg;
 #elif defined(NRF52_SERIES) || defined(ESP32) || defined(ESP8266) ||           \
-    defined(ARDUINO_ARCH_STM32)
+    defined(ARDUINO_ARCH_STM32) || defined(__IMXRT1062__)
 typedef volatile uint32_t RwReg;
 #else
 typedef volatile uint32_t RwReg;