From f02fe720a64473494ac355b28f24a9fca4677174 Mon Sep 17 00:00:00 2001 From: Taylor Ramirez Date: Tue, 5 Oct 2021 11:02:01 -0500 Subject: [PATCH 1/2] Added ifdef to allow Teensy 4.1 to work --- TouchScreen.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TouchScreen.h b/TouchScreen.h index 44e9269..db64084 100644 --- a/TouchScreen.h +++ b/TouchScreen.h @@ -7,14 +7,14 @@ #define _ADAFRUIT_TOUCHSCREEN_H_ #include -#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32U4__) || \ +#if (defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32U4__) || \ defined(TEENSYDUINO) || defined(__AVR_ATmega2560__) || \ - defined(__AVR_ATmega4809__) + 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; From a19291a2657f4cd3cc4de4beb2498b492e603220 Mon Sep 17 00:00:00 2001 From: Taylor Ramirez Date: Tue, 5 Oct 2021 14:29:53 -0500 Subject: [PATCH 2/2] Ran clang-format --- TouchScreen.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/TouchScreen.h b/TouchScreen.h index db64084..c528718 100644 --- a/TouchScreen.h +++ b/TouchScreen.h @@ -7,9 +7,10 @@ #define _ADAFRUIT_TOUCHSCREEN_H_ #include -#if (defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32U4__) || \ - defined(TEENSYDUINO) || defined(__AVR_ATmega2560__) || \ - defined(__AVR_ATmega4809__)) && !defined(__IMXRT1062__) +#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;