Fixed GFX display broken by UTFT implementation

Author: neu-rah

examples/gfx_menu/gfx_menu.ino

@@ -41,8 +41,8 @@ ruihfazevedo@[email protected]
   #define rst   7
   ////////////////////////////////////////////
   // ENCODER (aka rotary switch) PINS
-  #define encA 12
-  #define encB 10
+  #define encA 10
+  #define encB 12
   #define encBtn 13
 #elif defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
   ///////////////////////////////////////////////////////////////////////////

menu.h

@@ -166,8 +166,8 @@ www.r-site.net
     virtual void print(char ch)=0;
     virtual void print(const char *text)=0;
     virtual void println(const char *text="")=0;
-    virtual void print(int)=0;
-    virtual void println(int)=0;
+    virtual void print(unsigned long)=0;
+    virtual void println(unsigned long)=0;
     virtual void print(double)=0;
     virtual void println(double)=0;
     virtual void print(prompt &o,bool selected,int idx,int posY,int width);

menuFields.h

@@ -54,7 +54,7 @@ www.r-site.net
 		virtual void printTo(menuOut& p) {
 			p.print(text);
 			p.print(activeNode==this?(tunning?'>':':'):' ');
-			p.print(value);
+			p.print((unsigned long)value);
 			p.print(" ");
 			p.print(units);
 			p.print("  ");

menuGFX.h

@@ -54,24 +54,24 @@ www.r-site.net
 
     virtual void clearLine(int ln) {
     	gfx.fillRect(0,ln*resY,resX*maxX,resY,bgColor);
-    	gfx.setCursor(0,ln*resY);
+    	setCursor(0,ln);
     }
     virtual void clear() {
     	gfx.fillRect(0,0,resX*maxX,resY*maxY,bgColor);
-    	gfx.setCursor(0,0);
+    	setCursor(0,0);
     }
     virtual void setCursor(int x,int y) {gfx.setCursor(x*resX,y*resY);}
     virtual void print(char ch) {gfx.print(ch);}
     virtual void print(const char *text) {gfx.print(text);}
     virtual void println(const char *text="") {gfx.println(text);};
-    virtual void print(int i) {gfx.print(i);};
-    virtual void println(int i) {gfx.println(i);};
+    virtual void print(unsigned long i) {gfx.print(i);};
+    virtual void println(unsigned long i) {gfx.println(i);};
     virtual void print(double i) {gfx.print(i);};
     virtual void println(double i) {gfx.println(i);};
     virtual void print(prompt &o,bool selected,int idx,int posY,int width) {
     	gfx.fillRect(0,posY*resY,maxX*resX,resY,selected?hiliteColor:bgColor);
     	gfx.setTextColor(o.enabled?enabledColor:disabledColor);
-    	gfx.setCursor(0,posY);//*resY);
+    	setCursor(0,posY);
     	o.printTo(*this);
     	println();
     }

menuLCD.h

@@ -22,17 +22,17 @@ www.r-site.net
     LiquidCrystal& lcd;
     menuLCD(LiquidCrystal& lcd,int x=16,int y=1):lcd(lcd),menuOut(x,y) {}
     virtual void clearLine(int ln) {
-    	lcd.setCursor(0,ln);
+    	setCursor(0,ln);
     	for(int n=0;n<maxX;n++) print(' ');
-    	lcd.setCursor(0,ln);
+    	setCursor(0,ln);
     }
     virtual void clear() {lcd.clear();}
     virtual void setCursor(int x,int y) {lcd.setCursor(x*resX,y*resY);}
     virtual void print(char ch) {lcd.print(ch);}
     virtual void print(const char *text) {lcd.print(text);}
     virtual void println(const char *text="") {lcd.print(text);};
-    virtual void print(int i) {lcd.print(i);};
-    virtual void println(int i) {lcd.println(i);};
+    virtual void print(unsigned long i) {lcd.print(i);};
+    virtual void println(unsigned long i) {lcd.println(i);};
     virtual void print(double i) {lcd.print(i);};
     virtual void println(double i) {lcd.println(i);};
 		virtual void print(prompt &o,bool selected,int idx,int posY,int width) {

menuLCDs.h

@@ -25,17 +25,17 @@ www.r-site.net
     LCD& lcd;
     menuLCD(LCD& lcd,int x=16,int y=1):lcd(lcd),menuOut(x,y) {}
     virtual void clearLine(int ln) {
-			lcd.setCursor(0,ln);
+			setCursor(0,ln);
     	for(int n=0;n<maxX;n++) print(' ');
-			lcd.setCursor(0,ln);
+			setCursor(0,ln);
     }//clear current line
     virtual void clear() {lcd.clear();}
     virtual void setCursor(int x,int y) {lcd.setCursor(x*resX,y*resY);}
     virtual void print(char ch) {lcd.print(ch);}
     virtual void print(const char *text) {lcd.print(text);}
     virtual void println(const char *text="") {lcd.print(text);};
-    virtual void print(int i) {lcd.print(i);};
-    virtual void println(int i) {lcd.println(i);};
+    virtual void print(unsigned long i) {lcd.print(i);};
+    virtual void println(unsigned long i) {lcd.println(i);};
     virtual void print(double i) {lcd.print(i);};
     virtual void println(double i) {lcd.println(i);};
 		virtual void print(prompt &o,bool selected,int idx,int posY,int width) {

menuPrint.h

@@ -25,13 +25,13 @@ www.r-site.net
     virtual void print(char ch) {device.print(ch);}
     virtual void print(const char *text) {device.print(text);}
     virtual void println(const char *text="") {device.println(text);}
-    virtual void print(int i) {device.print(i);};
-    virtual void println(int i) {device.println(i);};
+    virtual void print(unsigned long i) {device.print(i);};
+    virtual void println(unsigned long i) {device.println(i);};
     virtual void print(double i) {device.print(i);};
     virtual void println(double i) {device.println(i);};
 		virtual void print(prompt &o,bool selected,int idx,int posY,int width) {
       print(idx<10?" ":"");
-      print(idx);
+      print((unsigned long)idx);
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			o.printTo(*this);
 			println();