poll redraw fix on lcd

still implementing fields

Author: neu-rah

menu.cpp

@@ -32,13 +32,15 @@ int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
           if (sel>0) {
             sel--;
             if (sel+1>=p.maxY) p.top=sel-p.maxY;
-            printMenu(p,canExit);
+            p.drawn=0;
+            //printMenu(p,canExit);
           }
         } else if (ch=='+') {
           if (sel<(sz-(canExit?0:1))) {
             sel++;
             if ((sz-sel+(canExit?1:0))>=p.maxY) p.top=sel-(canExit?1:0);
-            printMenu(p,canExit);
+            p.drawn=0;
+            //printMenu(p,canExit);
           }
         } else if (ch==27) {
         	op=-1;
@@ -65,6 +67,8 @@ void menu::activate(menuOut& p,Stream& c,bool canExit) {
 		activeMenu=this;
 		sel=0;
 		p.top=0;
+   	//c.flush();//reset the encoder
+   	//p.drawn=0;//redraw menu
 	}
   int op=-1;
   //do {
@@ -74,11 +78,14 @@ void menu::activate(menuOut& p,Stream& c,bool canExit) {
     	sel=op;
       if (data[op]->enabled) {
       	data[op]->activate(p,c,true);
-      	c.flush();//reset the encoder
-      	p.drawn=0;//redraw menu
+      	//c.flush();//reset the encoder
+      	//p.drawn=0;//redraw menu
       }
-    } else if (op==-1) //then exit
+    } else if (op==-1) {//then exit
     	activeMenu=previousMenu;
+		 	//c.flush();//reset the encoder
+		 	//p.drawn=0;//redraw menu
+    }
   //} while(op!=-1);
 }
 

menu.h

@@ -26,6 +26,7 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
   class prompt;
   class menu;
   class menuOut;
+  template <typename T> class menuField;
 
   #define CONCATENATE(arg1, arg2)   CONCATENATE1(arg1, arg2)
   #define CONCATENATE1(arg1, arg2)  CONCATENATE2(arg1, arg2)
@@ -97,16 +98,17 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     menu id (text,sizeof(id##_data)/sizeof(prompt*),id##_data);
 
   #define OP(...) OP_(__COUNTER__,__VA_ARGS__)
-  #define FIELD(...) FIELD_(__COUNTER__,__VA_ARGS__)
+  #define FIELD_INT(...) FIELD_INT_(__COUNTER__,__VA_ARGS__)
 
   #define DECL_OP_(cnt,...) prompt op##cnt(__VA_ARGS__);
-  #define DECL_FIELD_(cnt,...) menuField _menuField##cnt(__VA_ARGS__);
+  #define DECL_FIELD_INT_(cnt,...) menuField<int> _menuField_int##cnt(__VA_ARGS__);
   #define DECL_SUBMENU(id)
 
   #define DEF_OP_(cnt,...) &op##cnt
-  #define DEF_FIELD_(cnt,...) &_menuField##cnt
+  #define DEF_FIELD_INT_(cnt,...) &_menuField_int##cnt
   #define DEF_SUBMENU(id) &id
 
+  
   /////////////////////////////////////////////////////////
   // menu pure virtual output device, use derived
   // this base class represents the output device either derived to serial, LCD or other
@@ -132,6 +134,7 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     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(menuField<int> &o,bool selected,int idx,int posY,int width)=0;
 		virtual void printMenu(menu&,bool drawExit)=0;
   };
 
@@ -166,7 +169,7 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     const char *text;
     promptAction action;
     bool enabled;
-    prompt(const char * text):text(text),enabled(true) {}
+    prompt(const char * text,bool enabled=true):text(text),enabled(enabled) {}
     prompt(const char * text,promptAction action)
     	:text(text),action(action),enabled(true) {}
     virtual size_t printTo(Print& p) {p.print(text);return strlen(text);}

menuGFX.h

@@ -68,6 +68,9 @@ Use graphics screens (adafruit library based) as menu output
     	//gfx.setTextColor(o.enabled?enabledColor:disabledColor,selected?hiliteColor:bgColor);
     	gfx.print(o.text);
     }
+		virtual void print(menuField<int> &o,bool selected,int idx,int posY,int width) {
+			println("Ok, this is it");
+		}
 		virtual void printMenu(menu& m,bool drawExit) {
 			if (drawn!=&m) clear();
 			if (m.sel-top>=maxY) top=m.sel-maxY+1;//selected option outside device (bottom)

menuLCD.h

@@ -34,6 +34,9 @@ Use standard arduino LCD (LiquidCrystal library) as menu output
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			print(o.text);
 		}
+		virtual void print(menuField<int> &o,bool selected,int idx,int posY,int width) {
+			println("Ok, this is it");
+		}
 		virtual void printMenu(menu& m,bool drawExit) {
 			clear();
 			if (m.sel-top>=maxY) top=m.sel-maxY+1;//selected option outside device (bottom)

menuLCDs.h

@@ -36,7 +36,12 @@ as VirtualPins is not yet a standard I implemented this to support existing libr
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			print(o.text);
 		}
+		virtual void print(menuField<int> &o,bool selected,int idx,int posY,int width) {
+			println("Ok, this is it");
+		}
 		virtual void printMenu(menu& m,bool drawExit) {
+			if (drawn==&m) return;
+			Serial.println("menuLCD clear");
 			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)
@@ -48,6 +53,7 @@ as VirtualPins is not yet a standard I implemented this to support existing libr
 			}
 			if (drawExit&&i-top<maxY)
 				print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
+			drawn=&m;
 		}
   };
 #endif RSITE_ARDUINOP_MENU_LCD

menuPrint.h

@@ -35,6 +35,9 @@ menu output to Print device (ex: Serial)
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			println(o.text);
 		}
+		virtual void print(menuField<int> &o,bool selected,int idx,int posY,int width) {
+			println("Ok, this is it");
+		}
 		virtual void printMenu(menu& m,bool drawExit) {
 			clear();
 			int i=0;for(;i<m.sz;i++)