From 7402a15a9166c8152c1c27a5891cfd8df25e825d Mon Sep 17 00:00:00 2001 From: prenticedavid Date: Fri, 25 May 2018 17:10:13 +0100 Subject: [PATCH] Xmega does not like RST as identifier --- MCUFRIEND_kbv.cpp | 2 +- MCUFRIEND_kbv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MCUFRIEND_kbv.cpp b/MCUFRIEND_kbv.cpp index 051c027..23e1ce2 100644 --- a/MCUFRIEND_kbv.cpp +++ b/MCUFRIEND_kbv.cpp @@ -54,7 +54,7 @@ #define USING_16BIT_BUS 0 #endif -MCUFRIEND_kbv::MCUFRIEND_kbv(int CS, int RS, int WR, int RD, int RST):Adafruit_GFX(240, 320) +MCUFRIEND_kbv::MCUFRIEND_kbv(int CS, int RS, int WR, int RD, int _RST):Adafruit_GFX(240, 320) { // we can not access GPIO pins until AHB has been enabled. } diff --git a/MCUFRIEND_kbv.h b/MCUFRIEND_kbv.h index 5053d4b..db142b8 100644 --- a/MCUFRIEND_kbv.h +++ b/MCUFRIEND_kbv.h @@ -20,7 +20,7 @@ class MCUFRIEND_kbv : public Adafruit_GFX { public: // MCUFRIEND_kbv(int CS=A3, int RS=A2, int WR=A1, int RD=A0, int RST=A4); //shield wiring - MCUFRIEND_kbv(int CS=0, int RS=0, int WR=0, int RD=0, int RST=0); //dummy arguments + MCUFRIEND_kbv(int CS=0, int RS=0, int WR=0, int RD=0, int _RST=0); //dummy arguments void reset(void); // you only need the constructor void begin(uint16_t ID = 0x9341); // you only need the constructor virtual void drawPixel(int16_t x, int16_t y, uint16_t color); // and these three