bugfix: serial refresh on serial (reflexivity)

Author: neu-rah

src/menuFields.h

@@ -169,61 +169,45 @@ v2.0 -   Calling action on every elements
     //this kind of information... till there we can not use paralle output devices! RA2016
     menuSelect(const char *text,unsigned int sz,menuValue<T>* const data[],T& target):
       menuVariant<T>(target,text,sz,data) {menuVariant<T>::sync();}
-    virtual bool needRedraw(menuOut&p,bool selected) {
-      if (selected) {
-        bool nr=lastDrawnOp!=menu::sel;//||((menuValue<T>*)pgmPtrNear(menu::data[menu::sel]))->value==menuVariant<T>::target;
-        //T v=((menuValue<T>*)pgmPtrNear(menu::data[menu::sel]))->value;
-        //if (nr) Serial<<"Variant need redraw:"<<*this<<endl
-        /*Serial
-          <<"       value:"<<v<<endl
-          <<"      target:"<<menuVariant<T>::target
-          <<"         sel:"<<menu::sel
-          <<"     lastSel:"<<p.lastSel
-          <<" lastDrawnOp:"<<lastDrawnOp
-          <<endl;;*/
-        //p.lastSel=menu::sel;
-        lastDrawnOp=menu::sel;
-        return nr;
-      }
-      return ((menuValue<T>*)pgmPtrNear(menu::data[menu::sel]))->value!=menuVariant<T>::target;
-    }
     virtual void printTo(menuOut& p) {
-      //Serial<<"drawing menuSelect"<<endl;
       menuVariant<T>::sync();
       print_P(p,menu::text);
       p.print(menu::activeNode==this?':':' ');
       ((prompt*)pgmPtrNear(menu::data[menu::sel]))->printTo(p);
     }
-    promptFeedback activate(menuOut& p,Stream& c,bool) {
-      if (menu::activeNode!=this) {
-        //Serial<<"first select"<<endl;
-        if (menuVariant<T>::action(*this,p,c)) return true;
-        this->setPosition(menuNode::activeNode->ox,menuNode::activeNode->oy);
-        this->menu::previousMenu=(menu*)menu::activeNode;
-        menu::activeNode=this;
-         this->canExit=false;
-        if (p.top>menu::sel) p.top=menu::sel;
-        else if (menu::sel+1>p.maxY) p.top=menu::sel-p.maxY+1;
-        p.lastSel=-1;//redraw only affected option
-      }
-      int op=menu::menuKeys(p,c,false);
-      menu::previousMenu->menu::printMenu(p,menu::previousMenu->canExit);
-      if (op>=0&&op<this->menu::sz) {
-        //Serial<<"Selecting op:"<<op<<endl;
-        this->menu::sel=op;
-        menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(this->menu::data[op]);
-        if (cp->enabled) {
-          this->menuVariant<T>::target=cp->value;
-          cp->activate(p,c,true);
-          p.lastSel=-1;//redraw only affected option
-          //and exit
-          this->menu::activeNode=this->menu::previousMenu;
-           c.flush();//reset the encoder
-        }
-      }
-      //Serial<<"sel:"<<menu::sel<<" op:"<<op<<endl;
-      return false;
-    }
+		promptFeedback activate(menuOut& p,Stream& c,bool) {
+			if (menu::activeNode!=this) {
+				if (menuVariant<T>::action(*this,p,c)) return true;
+			  this->setPosition(menuNode::activeNode->ox,menuNode::activeNode->oy);
+				menu::previousMenu=(menu*)menu::activeNode;
+				menu::activeNode=this;
+			 	this->canExit=false;
+				if (p.top>menu::sel) p.top=menu::sel;
+				else if (menu::sel+1>p.maxY) p.top=menu::sel-p.maxY+1;
+				p.lastSel=-1;//redraw only affected option
+			}
+			int lsel=menu::sel;
+			int op=menu::menuKeys(p,c,false);
+			if (op>=0&&op<this->menu::sz) {
+				menu::sel=op;
+				menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(this->menu::data[op]);
+				if (cp->enabled) {
+					menuVariant<T>::target=cp->value;
+					cp->activate(p,c,true);
+					p.lastSel=-1;//redraw only affected option
+					//and exit
+					this->menu::activeNode=this->menu::previousMenu;
+				 	c.flush();//reset the encoder
+				}
+			}
+			if (menu::sel!=lsel) {
+				menuVariant<T>::target=((menuValue<T>*)&menu::operator[](menu::sel))->value;
+				p.lastSel=-1;//redraw only affected option
+			}
+			menu::previousMenu->menu::printMenu(p,menu::previousMenu->canExit);
+			//Serial<<"sel:"<<menu::sel<<" op:"<<op<<endl;
+			return false;
+		}
   };
 
   template<typename T>

src/menuPrint.h

@@ -12,8 +12,8 @@ www.r-site.net
 ***/
 
 #ifndef RSITE_ARDUINOP_MENU_PRINT
-	#define RSITE_ARDUINOP_MENU_PRINT
-	#include "menu.h"
+  #define RSITE_ARDUINOP_MENU_PRINT
+  #include "menu.h"
 
   class menuPrint:public menuOut {
     public:
@@ -23,24 +23,26 @@ www.r-site.net
     virtual void clear() {device.println("");device.println("");}
     virtual void setCursor(int x,int y) {device.println("");}
     virtual size_t write(uint8_t ch) {return device.write(ch);}
-		virtual void printPrompt(prompt &o,bool selected,int idx,int posX,int posY,int width) {
+    virtual void printPrompt(prompt &o,bool selected,int idx,int posX,int posY,int width) {
       print(idx<10?" ":"");
       print((unsigned long)idx);
-			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
-			o.printTo(*this);
-			println();
-		}
-		virtual void printMenu(menu& m,bool drawExit) {
-			if (drawn==&m&&m.sel==lastSel) return;
-			clear();
-			int i=0;
-			for(;i<m.sz;i++)
-				printPrompt(*(prompt*)pgmPtrNear(m.data[i]),i==m.sel,i+1,i-top,0,m.width);
-			if (drawExit) printPrompt(menu::exitOption,m.sel==m.sz,i,0,i-top,m.width);
-			lastTop=top;
-			lastSel=m.sel;
-			drawn=&m;
-		}
-  };
+      print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
+      o.printTo(*this);
+      println();
+    }
+    virtual void printMenu(menu& m,bool drawExit) {
+      bool any=false;
+      for(int i=0;i<m.sz;i++) any|=m[i].needRedraw(*this,i==m.sel);
+      if ((!any)&&drawn==&m&&m.sel==lastSel) return;
+      clear();
+      int i=0;
+      for(;i<m.sz;i++)
+        printPrompt(*(prompt*)pgmPtrNear(m.data[i]),i==m.sel,i+1,i-top,0,m.width);
+      if (drawExit) printPrompt(menu::exitOption,m.sel==m.sz,i,0,i-top,m.width);
+      lastTop=top;
+      lastSel=m.sel;
+      drawn=&m;
+    }
+};
 
 #endif RSITE_ARDUINOP_MENU_PRINT