Xmega does not like RST as identifier

prenticedavid · May 25, 2018 · 7402a15 · 7402a15
1 parent 5f14746
commit 7402a15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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