Deriving menuOut from Arduino Print, reducing the library footprint

Author: neu-rah

menu.cpp

@@ -36,15 +36,11 @@ int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
       if (sel>0) {
         sel--;
         if (sel+1>=p.maxY) p.top=sel-p.maxY;
-        //p.drawn=0;
-        //printMenu(p,canExit);
       }
     } else if (ch==menu::upCode) {
       if (sel<(sz-(canExit?0:1))) {
         sel++;
         if ((sz-sel+(canExit?1:0))>=p.maxY) p.top=sel-(canExit?1:0);
-        //p.drawn=0;
-        //printMenu(p,canExit);
       }
     } else if (ch==menu::escCode) {
     	op=-1;
@@ -54,6 +50,7 @@ int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
   if (!((op>=0&&op<sz)||(canExit&&op==-1))) op=-2;//validate the option
   //add some delays to be sure we do not have more characters NL or CR on the way
   //delay might be adjusted to cope with stream speed
+  //TODO: guess we dont need this.. check it out
   delay(50);while (c.peek()==menu::enterCode/*||c.peek()==10*/) {c.read();delay(50);}//discard ENTER and CR
   return op;
 }

menu.h

@@ -138,7 +138,7 @@ www.r-site.net
   /////////////////////////////////////////////////////////
   // menu pure virtual output device, use derived
   // this base class represents the output device either derived to serial, LCD or other
-  class menuOut {
+  class menuOut:public Print {
     public:
 
     menu* drawn;//last drawn menu, avoiding clear/redraw on each nav. change
@@ -159,18 +159,19 @@ www.r-site.net
     enum drawStyle {NORMAL=0,SELECTED,EDITING,TUNNING,DISABLED};
 
   //member functions
+    virtual size_t write(uint8_t) = 0;
     bool needRedraw(menu& m,int i);
     virtual void clearLine(int ln)=0;
     virtual void clear()=0;
     virtual void setCursor(int x,int y)=0;
-    virtual void print(char ch)=0;
+    /*virtual void print(char ch)=0;
     virtual void print(const char *text)=0;
     virtual void println(const char *text="")=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);
+    virtual void println(double)=0;*/
+    virtual void printPrompt(prompt &o,bool selected,int idx,int posY,int width);
 		virtual void printMenu(menu&,bool drawExit)=0;
   };
 

menuFields.h

@@ -1,12 +1,6 @@
 /********************
+www.r-site.net
 Nov. 2014 Rui Azevedo - ruihfazevedo(@rrob@)gmail.com
-creative commons license 3.0: Attribution-ShareAlike CC BY-SA
-This software is furnished "as is", without technical support, and with no 
-warranty, express or implied, as to its usefulness for any purpose.
-
-Thread Safe: No
-Extensible: Yes
-
 implementing menu fields as options that show a value
 value (variable reference) can be changed by either using:
 	menuField - for numeric varibles between range and optinally with a tune speed
@@ -16,7 +10,14 @@ value (variable reference) can be changed by either using:
 class menuValue is used as a menu prompt with an associated value for menuChoose and menuToggle
 
 this classes are implemented as templates to accomodate virtually any value type
-www.r-site.net
+
+creative commons license 3.0: Attribution-ShareAlike CC BY-SA
+This software is furnished "as is", without technical support, and with no 
+warranty, express or implied, as to its usefulness for any purpose.
+
+Thread Safe: No
+Extensible: Yes
+
 ***/
 
 #ifndef RSITE_ARDUINOP_MENU_FIELDS
@@ -55,10 +56,8 @@ www.r-site.net
 		virtual void printTo(menuOut& p) {
 			p.print(text);
 			p.print(activeNode==this?(tunning?'>':':'):' ');
-			p.print((unsigned long)value);
-			p.print(" ");
+			p.print(value);
 			p.print(units);
-			p.print("  ");
 		}
 		void clamp() {
       if (value<low) value=low;

menuGFX.h

@@ -73,7 +73,7 @@ www.r-site.net
     	gfx.setTextColor(o.enabled?enabledColor:disabledColor);
     	setCursor(0,posY);
     	o.printTo(*this);
-    	println();
+    	//println();
     }
 		virtual void printMenu(menu& m,bool drawExit) {
 			if (drawn!=&m) clear();//clear all screen when changing menu