implemented menu width for GFX selection consistency

removed some bugs and fixed stream clean as part of the activate process

Author: neu-rah

Examples/menu_test/menu_test.ino

@@ -7,41 +7,43 @@
 #include "quadEncoder.h"//quadrature encoder driver and fake stream
 #include "keyStream.h"//keyboard driver and fake stream (for the encoder button)
 #include "chainStream.h"// concatenate multiple input streams (this allows adding a button to the encoder)
-#include "menuLCD.h"
-#include "menuPrint.h"
-#include <Adafruit_GFX.h>    // Co1re graphics library
-#include <Adafruit_ST7735.h> // Hardware-specific library
-#include <menuGFX.h>
-
-///////////////////////////////////////////////////////////////////////////
-//TFT + SD
-//#define sdCS  4
-#define tftCS 5
-#define dc    6
-#define rst   7  // you can also connect this to the Arduino reset
-
-Adafruit_ST7735 tft(tftCS, dc, rst);
-
-//#define LCD_SZ_X 16
-//#define LCD_SZ_Y 2
+#include "menuPrint.h"//Print (Serial) menu
 
 #define LCDWIRE_NONE 0
 #define LCDWIRE_VPINS_I2C 1
 #define LCDWIRE_VPINS_SPI 2
 #define LCDWIRE_I2C 3
 #define LCDWIRE_DIRECT 4
 
-//how the LCS was wired
+//how the LCD is wired
 //#define LCD_WIRE LCDWIRE_NONE
 //#define LCD_WIRE LCDWIRE_VPINS_I2C
-#define LCD_WIRE LCDWIRE_VPINS_SPI//not implemented
-//#define LCD_WIRE LCDWIRE_I2C//not implemented
-//#define LCD_WIRE LCDWIRE_DIRECT//not implemented
+#define LCD_WIRE LCDWIRE_VPINS_SPI//on shift registers thru vpins (same library)
+//#define LCD_WIRE LCDWIRE_I2C//not tested
+//#define LCD_WIRE LCDWIRE_DIRECT//not tested
+
+#define USE_TFT YES//YES|NO
+
+#if (USE_TFT == YES)
+  #include <Adafruit_GFX.h>    // Co1re graphics library
+  #include <Adafruit_ST7735.h> // Hardware-specific library
+  #include <menuGFX.h>
+
+  ///////////////////////////////////////////////////////////////////////////
+  //TFT + SD
+  //#define sdCS  4
+  #define tftCS 5
+  #define dc    6
+  #define rst   7  // you can also connect this to the Arduino reset
+  
+  Adafruit_ST7735 tft(tftCS, dc, rst);
+#endif
 
+#define vpinsSPI_CS 9//vpins SPI CS 
 #if (LCD_WIRE == LCDWIRE_VPINS_SPI)//LCD wired on shift registers using vpins
   #include <SPI.h>
   #include <VPinsSPI.h>
-  #define vpinsSPI_CS 9//vpins SPI CS 
+  #include "menuLCD.h"
   #define STCP 9//stcp or latch pin
 
   #define RS 26
@@ -53,6 +55,7 @@ Adafruit_ST7735 tft(tftCS, dc, rst);
 
 #if (LCD_WIRE == LCDWIRE_VPINS_I2C)// LCD is wired over i2c to another AVR that uses virtual pins and shift registers to control it and virtual port server to share it
   #include <Wire.h>
+  #include "menuLCD.h"
   //remote pins over I2C to VPort server
   #define vpinsSPI_CS srv_pb.pin(1)//vpins SPI CS 
   #define STCP srv_pb.pin(1)//stcp or latch pin
@@ -117,6 +120,7 @@ MENU(mainMenu,"Sistema",
   OP("Dutty",setDutty),
   OP("Disabled",disabledTest),
   OP("Handler test",completeHandlerTest),
+  /*OP("Handler test",completeHandlerTest),
   OP("Handler test",completeHandlerTest),
   OP("Handler test",completeHandlerTest),
   OP("Handler test",completeHandlerTest),
@@ -126,8 +130,7 @@ MENU(mainMenu,"Sistema",
   OP("Handler test",completeHandlerTest),
   OP("Handler test",completeHandlerTest),
   OP("Handler test",completeHandlerTest),
-  OP("Handler test",completeHandlerTest),
-  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),*/
   SUBMENU(subMenu)
 );
 
@@ -137,7 +140,7 @@ quadEncoderStream enc(quadEncoder,5);// simple quad encoder fake Stream
 
 //a keyboard with only one key :D, this is the encoder button
 keyMap encBtn_map[]={{-encBtn,13}};//negative pin numbers means we have a pull-up, this is on when low
-keyLook<2> encButton(encBtn_map);
+keyLook<1> encButton(encBtn_map);
 
 //multiple inputs allow conjugation of the quadEncoder with a single key keyboard that is the quadEncoder button
 Stream* in[]={&enc,&encButton};
@@ -149,11 +152,16 @@ chainStream<3> allIn(in3);
 
 //describing a menu output, alternatives so far are Serial or LiquidCrystal LCD
 menuPrint serial(Serial);
-menuLCD lcd(lcd1,16,2);
-menuGFX gfx(tft);
+#if (LCD_WIRE!=LCDWIRE_NONE)
+  menuLCD lcd(lcd1,16,2);
+#endif
+#if (USE_TFT == YES)
+  menuGFX gfx(tft);
+#endif
+menuPrint menuSerialOut(Serial);//describe output device
 
 //menuOut* out[]={&lcd,&serial};
-//chainOut<2> allOut(out);
+//chainOut<2> allOut(out);//not implemented multiple outputs... useless i think
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -163,11 +171,15 @@ void setup() {
   Serial.begin(9600);
   Serial.println("menu system test");
 
+#if ((LCD_WIRE != LCDWIRE_NONE) || (USE_TFT == YES))
   pinMode(vpinsSPI_CS,OUTPUT);
   digitalWrite(vpinsSPI_CS,LOW);
+#endif
 
 #if (LCD_WIRE == LCDWIRE_VPINS_SPI)
   SPI.begin();
+  lcd1.begin(16,2);
+  lcd1.print("Menu test");
 #endif
 
 #if (LCD_WIRE == LCDWIRE_VPINS_I2C)
@@ -176,11 +188,10 @@ void setup() {
   srv_vpa.begin();// wait for server ready (all on same server, so)
   //srv_vpb.begin();// wait for server ready
   Serial.println("all servers ready!");
-#endif
 
-  lcd1.begin(16,2);
-  lcd1.print("Menu test");
+#endif
 
+#if (USE_TFT == YES)
   digitalWrite(vpinsSPI_CS,HIGH);
   digitalWrite(tftCS,HIGH);
   tft.initR(INITR_BLACKTAB);
@@ -191,17 +202,10 @@ void setup() {
   tft.fillScreen(ST7735_BLACK);
   tft.print("Menu test on GFX");
   tft.setCursor(0,10);
-  
-  digitalWrite(vpinsSPI_CS,LOW);
-  digitalWrite(tftCS,LOW);
-  lcd1.setCursor(0,1);
-  lcd1.print(mainMenu.width);
-  digitalWrite(vpinsSPI_CS,HIGH);
-  digitalWrite(tftCS,HIGH);
-  
   //update limits after screen rotation
   gfx.maxX=tft.width()/gfx.resX;
   gfx.maxY=tft.height()/gfx.resY;
+#endif
 
   pinMode(encBtn, INPUT);
   digitalWrite(encBtn,1);
@@ -212,14 +216,25 @@ void setup() {
 ///////////////////////////////////////////////////////////////////////////////
 // testing the menu system
 void loop() {
-  gfx.clear();
-  tft.print("DEBUG");
-  //mainMenu.activate(Serial,Serial);//show menu to Serial and read keys from Serial
-  //mainMenu.activate(lcd,allIn);//show menu on LCD and use multiple inputs to navigate (defined encoder, encoder button, serial)
-  mainMenu.activate(gfx,allIn);//show menu on LCD and use multiple inputs to navigate (defined encoder, encoder button, serial)
-  //mainMenu.activate(lcd1,allIn);//show menu on LCD and multiple inputs to navigate, defaults to LCD 16x1
-  //mainMenu.activate(lcd,Serial);//very bad combination!
-  //mainMenu.activate(Serial,enc);//bad combination! shopw menu on serial and navigate using quadEncoder
+  //mainMenu.activate(menuSerialOut,Serial);//show menu to Serial and read keys from Serial
+  //Serial.println("");
+  //Serial.println("Restarting...");
+  
+  #if (LCD_WIRE != LCDWIRE_NONE)
+    //digitalWrite(vpinsSPI_CS,LOW);
+    //digitalWrite(tftCS,LOW);
+    //mainMenu.activate(lcd,allIn);//show menu on LCD and use multiple inputs to navigate (defined encoder, encoder button, serial)
+    //mainMenu.activate(lcd1,allIn);//show menu on LCD and multiple inputs to navigate, defaults to LCD 16x1
+    //mainMenu.activate(lcd,Serial);//very bad combination!
+    //mainMenu.activate(Serial,enc);//bad combination! shopw menu on serial and navigate using quadEncoder
+  #endif
+  
+  #if (USE_TFT == YES)
+    digitalWrite(vpinsSPI_CS,HIGH);
+    digitalWrite(tftCS,HIGH);
+    mainMenu.activate(gfx,allIn);//show menu on LCD and use multiple inputs to navigate (defined encoder, encoder button, serial)
+  #endif
+  
 }
 
 void nothing() {}
@@ -268,9 +283,9 @@ void setValue(prompt &p,menuOut &o, Stream &i,int &value,const char* text,const
         last=pos;
       }
       //func();
-    //}
+    }
     delay(100);
     while(encButton.read()==13);
-  }
+  //}
 }
 

Examples/serial_menu/serial_menu.ino

@@ -31,7 +31,4 @@ void loop() {
   mainMenu.activate(menu_out,Serial);
   Serial.println("");
   Serial.println("Restarting...");
-  Serial.println("");
-  Serial.flush();//send all data
-  while(Serial.available()) Serial.read();//clean the stream
 }

menu.cpp

@@ -41,47 +41,21 @@ int menu::menuKeys(menuOut &p,Stream& c) {
   return op;
 }
 
-void menu::printMenu(menuOut& p) {
-  p.clear();
-  //if (p.style==menuOut::enumerated) {p.print(text); p.print("==========================");}
-  if (sel-p.top>=p.maxY) p.top=sel-p.maxY+1;//selected option outside device (bottom)
-  else if (sel<p.top) p.top=sel;//selected option outside device (top)
-  int i=0;for(;i<sz;i++) {
-    if ((i>=p.top)&&((i-p.top)<p.maxY)) {
-      //p.setCursor(0,i-p.top);
-      if(i-p.top>=p.maxY) break;
-      /*if (p.style==menuOut::enumerated) {
-        p.print(i<10?" ":"");
-        p.print(i+1);
-      }*/
-      p.print(*data[i],i==sel,i+1,i-p.top,width);
-      /*p.print((i==sel)?data[i]->enabled?menu::enabledCursor:menu::disabledCursor:' ');
-      p.print(data[i]->text);*/
-    }
-  }
-  if (i-p.top<p.maxY) {
-    //p.setCursor(0,i-p.top);
-    /*if (p.style==menuOut::enumerated) 
-      p.print(" 0");*/
-    p.print(exitOption,sel==sz,0,i-p.top,width);
-    /*p.print(sel==sz?menu::enabledCursor:' ');
-    p.println(menu::exit);*/
-  }
-}
-  
 void menu::activate(menuOut& p,Stream& c) {
   sel=0;
   p.top=0;
   int op=-1;
   do {
     printMenu(p);
+		c.flush();//reset the encoder
+		while(c.available()) c.read();//clean the stream
     op=menuKeys(p,c);
     if (op>=0&&op<sz) {
     	sel=op;
-      if (data[op]->enabled) data[op]->activate(p,c);
+      if (data[op]->enabled)
+      	data[op]->activate(p,c);
+      	p.drawn=0;//redraw menu
     }
-		c.flush();//reset the encoder
-		while(c.available()) c.read();//clean the stream
   } while(op!=-1);
 }
 

menu.h

@@ -100,22 +100,16 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
   // this base class represents the output device either derived to serial, LCD or other
   class menuOut {
     public:
+    menu* drawn;//last drawn menu, avoiding clear/redraw on each nav. change
     int top;//top for this device
     //device size
     int maxX;
     int maxY;
     //device resolution
     int resX;
     int resY;
-    /*enum styles {
-      enumerated, //print numbers or references for options, adequated keyboard or file input
-      cursor,//print a cursor at selected option, tracking device (encoder)
-      point,//pointing device (not implemented)
-    } style;*/
-    //menuOut(menuOut::styles style=menuOut::enumerated):maxX(0),maxY(0),style(style),top(0) {}
-    //menuOut(menuOut::styles style=menuOut::enumerated,int width=0x7F,int x=0x7F,int y=0x7F,int resX=1,int resY=1):maxX(x),maxY(y),style(style),top(0),resX(resX),resY(resY) {}
     menuOut(int x=0x7F,int y=0x7F,int resX=1,int resY=1)
-    	:maxX(x),maxY(y),top(0),resX(resX),resY(resY) {}
+    	:maxX(x),maxY(y),top(0),resX(resX),resY(resY),drawn(0) {}
     virtual void clear()=0;
     virtual void setCursor(int x,int y)=0;
     virtual void print(char ch)=0;
@@ -124,6 +118,7 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     virtual void print(int)=0;
     virtual void println(int)=0;
     virtual void print(prompt &o,bool selected,int idx,int posY,int width)=0;
+		virtual void printMenu(menu&)=0;
   };
 
   ////////////////////////////////////////////////////////////////////
@@ -178,7 +173,7 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     menu(const char * text,int sz,prompt* const data[]):prompt(text),sz(sz),data(data),sel(0),width(16) {}
 
     int menuKeys(menuOut &p,Stream& c);
-    void printMenu(menuOut& p);
+    void printMenu(menuOut& p) {p.printMenu(*this);}
 
     void activate(menuOut& p,Stream& c);
   };

menuLCD.h

@@ -20,6 +20,19 @@
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			print(o.text);
 		}
+		virtual void printMenu(menu& m) {
+			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(i-top>=maxY) break;
+				  print(*m.data[i],i==m.sel,i+1,i-top,m.width);
+				}
+			}
+			if (i-top<maxY)
+				print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
+		}
   };
 #endif RSITE_ARDUINOP_MENU_LCD
 

menuPrint.h

@@ -21,6 +21,12 @@
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			println(o.text);
 		}
+		virtual void printMenu(menu& m) {
+			clear();
+			int i=0;for(;i<m.sz;i++)
+				  print(*m.data[i],i==m.sel,i+1,i-top,m.width);
+			print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
+		}
   };
 
 #endif RSITE_ARDUINOP_MENU_PRINT