PCINT made compatible with arduino mega (Atmega2560)

and structured for wide compatibility by using arduino PCICR and PCMSKn map macros

Author: neu-rah

menu.cpp

@@ -8,6 +8,7 @@ Thread Safe: No
 Extensible: Yes
 
 Arduino generic menu system
+www.r-site.net
 */
 #include <Arduino.h>
 #include "menu.h"
@@ -18,6 +19,8 @@ char menu::disabledCursor='-';
 prompt menu::exitOption(menu::exit);
 menuNode* menuNode::activeNode=NULL;
 
+bool menuOut::needRedraw(menu& m,int i) {return (drawn!=&m)||(top!=lastTop)||(m.sel!=lastSel&&((i==m.sel)||(i==lastSel)));}
+
 //menu navigation engine
 //iteract with input until a selection is done, return the selection
 int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {

menu.h

@@ -17,6 +17,7 @@ Arduino generic menu system
 
 the menu system will read provided stream for input, it works for Serial,
 encoders, joysticks, keyboards (or touch?) a stream must be made out of them
+www.r-site.net
 */
 #ifndef RSITE_ARDUINOP_MENU_SYSTEM
   #define RSITE_ARDUINOP_MENU_SYSTEM
@@ -113,6 +114,9 @@ encoders, joysticks, keyboards (or touch?) a stream must be made out of them
     };\
     menuToggle<typeof(target)> id (text,sizeof(id##_data)/sizeof(prompt*),id##_data,target);
 
+	/*#define GET_MACRO(_1,_2,NAME,...) NAME
+	#define VALUE(...) GET_MACRO(__VA_ARGS__, EXPLICIT_VALUE, IMPLICIT_VALUE)(__VA_ARGS__)*/
+
   #define OP(...) OP_(__COUNTER__,__VA_ARGS__)
   #define FIELD(...) FIELD_(__COUNTER__,__VA_ARGS__)
   #define VALUE(...) VALUE_(__COUNTER__,__VA_ARGS__)
@@ -136,17 +140,31 @@ encoders, joysticks, keyboards (or touch?) a stream must be made out of them
     public:
     menu* drawn;//last drawn menu, avoiding clear/redraw on each nav. change
     int top;//top for this device
-    //device size
+    //device size (in characters)
     int maxX;
     int maxY;
-    //device resolution
+    //device resolution (pixels per character)
     int resX;
     int resY;
     //preventing uneeded redraws
-    int lastTop;
-    int lastSel;
-    menuOut(int x=0x7F,int y=0x7F,int resX=1,int resY=1)
+    int lastTop=-1;
+    int lastSel=-1;
+    
+    inline menuOut(int x=0x7F,int y=0x7F,int resX=1,int resY=1)
     	:maxX(x),maxY(y),top(0),resX(resX),resY(resY),drawn(0) {}
+
+    enum drawStyle {NORMAL=0,SELECTED,EDITING,TUNNING,DISABLED};
+		//just access the vars, its all public!
+  	/*
+    inline menuOut() {}
+  	inline menuOut& xmax(int x) {maxX=x;return *this;}
+  	inline menuOut& ymay(int y) {maxY=y;return *this;}
+ 	
+  	inline menuOut& xres(int x) {maxX=x;return *this;}
+  	inline menuOut& yres(int y) {maxY=y;return *this;}*/
+  	
+  //member functions
+    bool needRedraw(menu& m,int i);
     virtual void clear()=0;
     virtual void setCursor(int x,int y)=0;
     virtual void print(char ch)=0;
@@ -156,7 +174,7 @@ encoders, joysticks, keyboards (or touch?) a stream must be made out of them
     virtual void println(int)=0;
     virtual void print(double)=0;
     virtual void println(double)=0;
-    virtual void print(prompt &o,bool selected,int idx,int posY,int width)=0;
+    virtual void print(prompt &o,bool selected,int idx,int posY,int width);
 		virtual void printMenu(menu&,bool drawExit)=0;
   };
 
@@ -205,7 +223,7 @@ encoders, joysticks, keyboards (or touch?) a stream must be made out of them
 
   class menuNode:public prompt {//some basic information for menus and fields
   	public:
-    int width=16;//field or menu width
+    int width=32;//field or menu width
     //navigation and focus control
     static menuNode* activeNode;
     menu* previousMenu=NULL;

menuGFX.h

@@ -8,6 +8,7 @@ Thread Safe: No
 Extensible: Yes
 
 Use graphics screens (adafruit library based) as menu output
+www.r-site.net
 ***/
 #ifndef RSITE_ARDUINOP_MENU_GFX
 	#define RSITE_ARDUINOP_MENU_GFX
@@ -30,10 +31,10 @@ Use graphics screens (adafruit library based) as menu output
 
   class menuGFX:public menuOut {
     public:
-    uint16_t bgColor;
-    uint16_t enabledColor;
-    uint16_t disabledColor;
-    uint16_t hiliteColor;
+  	uint16_t hiliteColor=BLUE;
+  	uint16_t bgColor=SILVER;
+  	uint16_t enabledColor=WHITE;
+  	uint16_t disabledColor=RED;
     Adafruit_GFX& gfx;
     menuGFX(
     	Adafruit_GFX& gfx,
@@ -50,7 +51,14 @@ Use graphics screens (adafruit library based) as menu output
 	  	disabledColor(disabledColor),
 	  	hiliteColor(hiliteColor),
 	  	menuOut(gfx.width()/resX,gfx.height()/resY,resX,resY) {}
-    virtual void clear() {gfx.fillScreen(bgColor);gfx.setCursor(0,0);}
+	  	
+    virtual void clear() {
+    	//gfx.fillScreen(bgColor);
+    	Serial<<"max:"<<maxX<<","<<maxY<<endl
+    		<<"res:"<<resX<<","<<resY<<endl;
+    	gfx.fillRect(0,0,resX*maxX,resY*maxY,bgColor);
+    	gfx.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);}
@@ -60,27 +68,37 @@ Use graphics screens (adafruit library based) as menu output
     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) {
+    	Serial<<"menuGFX printing prompt "<<o.text<<endl;
     	gfx.fillRect(0,posY*resY,width*resX,resY,selected?hiliteColor:bgColor);
     	gfx.setTextColor(o.enabled?enabledColor:disabledColor);
     	gfx.setCursor(0,posY*resY);
     	o.printTo(gfx);
-    	println();
+    	//println();
     }
-    inline int needRedraw(menu& m,int i) {return (drawn!=&m)||(top!=lastTop)||(m.sel!=lastSel&&((i==m.sel)||(i==lastSel)));}
+    /*virtual void print(menuField &o,bool selected,int idx,int posY,int width) {
+			p.print(text);
+			p.print(activeNode==this?(tunning?'>':':'):' ');
+			p.print(value);
+			p.print(" ");
+			p.print(units);
+			p.print("  ");
+    }*/
+    /*drawStyle getStyle(prompt& p,bool selected,bool editing=false) {
+    	if (p.enabled)
+    		return selected?SELECTED:NORMAL;
+    	else return DISABLED;
+    }*/
 		virtual void printMenu(menu& m,bool drawExit) {
 			if (drawn!=&m) clear();//clear all screen when changing menu
 			if (m.sel-top>=maxY) top=m.sel-maxY+1;//selected option outside device (bottom)
 			else if (m.sel<top) top=m.sel;//selected option outside device (top)
-			int i=0;for(;i<m.sz;i++) {
-				if ((i>=top)&&((i-top)<maxY)) {
+			int i=top;for(;i<m.sz;i++) {
+				//if ((i>=top)&&((i-top)<maxY)) {
 				  if(i-top>=maxY) break;
 				  if (needRedraw(m,i)) {
-				  	Serial<<hex((long)drawn)<<" <-> "<<hex((long)&m)
-				  		<<(drawn!=&m)<<(top!=lastTop)<<(m.sel!=lastSel&&((i==m.sel)||(i==lastSel)))
-					  	<<" drawing option:"<<m.data[i]->text<<endl;
 				  	print(*m.data[i],i==m.sel,i+1,i-top,m.width);
 				  }
-				}
+				//}
 			}
 			if (drawExit&&i-top<maxY&&needRedraw(m,i))
 				print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);

menuLCD.h

@@ -8,6 +8,8 @@ Thread Safe: No
 Extensible: Yes
 
 Use standard arduino LCD (LiquidCrystal library) as menu output
+
+www.r-site.net
 ***/
 
 #ifndef RSITE_ARDUINOP_MENU_LCD
@@ -35,18 +37,22 @@ Use standard arduino LCD (LiquidCrystal library) as menu output
 			println();
 		}
 		virtual void printMenu(menu& m,bool drawExit) {
-			if (drawn==&m) return;
-			clear();
+		  Serial<<"Printing menu "<<m.text<<endl;
+			if (drawn!=&m) clear();//clear screen when changing menu
 			if (m.sel-top>=maxY) top=m.sel-maxY+1;//selected option outside device (bottom)
 			else if (m.sel<top) top=m.sel;//selected option outside device (top)
 			int i=0;for(;i<m.sz;i++) {
 				if ((i>=top)&&((i-top)<maxY)) {
-				  if(i-top>=maxY) break;
-				  print(*m.data[i],i==m.sel,i+1,i-top,m.width);
+				  //if(i-top>=maxY) break;
+				  if (needRedraw(m,i)) {
+				  	print(*m.data[i],i==m.sel,i+1,i-top,m.width);
+				  }
 				}
 			}
-			if (drawExit&&i-top<maxY)
+			if (drawExit&&i-top<maxY&&needRedraw(m,i))
 				print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
+			lastTop=top;
+			lastSel=m.sel;
 			drawn=&m;
 		}
   };

menuLCDs.h

@@ -10,6 +10,7 @@ Extensible: Yes
 implement menu output for Francisco Malpartida arduino LCD's 
  
 as VirtualPins is not yet a standard I implemented this to support existing libraries
+www.r-site.net
 ***/
 
 #ifndef RSITE_ARDUINOP_MENU_LCD
@@ -39,18 +40,21 @@ as VirtualPins is not yet a standard I implemented this to support existing libr
 			println();
 		}
 		virtual void printMenu(menu& m,bool drawExit) {
-			if (drawn==&m) return;
-			clear();
 			if (m.sel-top>=maxY) top=m.sel-maxY+1;//selected option outside device (bottom)
 			else if (m.sel<top) top=m.sel;//selected option outside device (top)
-			int i=0;for(;i<m.sz;i++) {
-				if ((i>=top)&&((i-top)<maxY)) {
+			if (drawn!=&m||top!=lastTop) clear();
+		  Serial<<"Printing menu "<<m.text<<endl;
+			int i=top;for(;i<m.sz;i++) {
+				//if ((i>=top)&&((i-top)<maxY)) {
 				  if(i-top>=maxY) break;
-				  print(*m.data[i],i==m.sel,i+1,i-top,m.width);
-				}
+				  if (needRedraw(m,i))
+				  	print(*m.data[i],i==m.sel,i+1,i-top,m.width);
+				//}
 			}
-			if (drawExit&&i-top<maxY)
+			if (drawExit&&i-top<maxY&&needRedraw(m,i))
 				print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
+			lastTop=top;
+			lastSel=m.sel;
 			drawn=&m;
 		}
   };

menuPrint.h

@@ -8,6 +8,7 @@ Thread Safe: No
 Extensible: Yes
 
 menu output to Print device (ex: Serial)
+www.r-site.net
 ***/
 
 #ifndef RSITE_ARDUINOP_MENU_PRINT