From eeb47b07d9abb0badc6b2b9d900c9801539c55eb Mon Sep 17 00:00:00 2001 From: prenticedavid Date: Sat, 7 Sep 2019 23:17:59 +0100 Subject: [PATCH] require USE_XPRO_MEGA4809 macro for SPECIAL --- utility/mcufriend_special.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utility/mcufriend_special.h b/utility/mcufriend_special.h index 7264908..ab7e9f9 100644 --- a/utility/mcufriend_special.h +++ b/utility/mcufriend_special.h @@ -16,6 +16,7 @@ //#define USE_MY_BLUEPILL //#define USE_ADIGITALEU_TEENSY //#define USE_MIKROELEKTRONIKA +//#define USE_XPRO_MEGA4809 /* HX8347A tWC =100ns tWRH = 35ns tRCFM = 450ns tRC = ? ns @@ -127,7 +128,7 @@ ST7789V tWC = 66ns tWRH = 15ns tRCFM = 450ns tRC = 160ns #define PIN_OUTPUT(p, b) (p).DIR |= (1<<(b)) //################################# XPRO-4809 with XPRO-Shield_Adapter ############################ -#elif defined(__AVR_ATmega4809__) && !defined(USE_BLD_BST_MEGA4809) // XPRO-4809 with XPRO-Shield_Adapter +#elif defined(__AVR_ATmega4809__) && !defined(USE_BLD_BST_MEGA4809) && defined(USE_XPRO_MEGA4809) // XPRO-4809 with XPRO-Shield_Adapter #warning XPRO-4809 with XPRO-Shield_Adapter using PORT.OUTSET #define RD_PORT PORTD // #define RD_PIN 2 @@ -174,7 +175,7 @@ ST7789V tWC = 66ns tWRH = 15ns tRCFM = 450ns tRC = 160ns #define PIN_HIGH(p, b) (p).OUTSET = (1<<(b)) #define PIN_OUTPUT(p, b) (p).DIRSET = (1<<(b)) -#elif defined(__AVR_ATmega4809__) && defined(USE_BLD_BST_MEGA4809) // XPRO-4809 with XPRO-Shield_Adapter +#elif defined(__AVR_ATmega4809__) && defined(USE_BLD_BST_MEGA4809) && defined(USE_XPRO_MEGA4809) // XPRO-4809 with XPRO-Shield_Adapter #warning XPRO-4809 with XPRO-Shield_Adapter using VPORT.OUT and BLD/BST #define RD_PORT VPORTD // #define RD_PIN 2