non-blocking poll function

also stated fiels...

Author: neu-rah

Examples/I2C_menu/I2C_menu.ino

@@ -25,5 +25,5 @@ void setup()
 void loop()
 {
   //serial can use numbers or +/- and Enter to navigate
-  mainMenu.activate(menu_lcd,Serial);
+  mainMenu.run(menu_lcd,Serial);
 }

Examples/serial_menu/serial_menu.ino

@@ -1,12 +1,14 @@
 #include "menu.h"//menu macros and objects
 #include "menuPrint.h"
 
+#define LEDPIN 13
+
 ///////////////////////////////////////////////////////////////////////////
 //functions to wire as menu actions
 
 void none() {}
-void ledOn() {digitalWrite(13,1);}
-void ledOff() {digitalWrite(13,0);}
+void ledOn() {digitalWrite(LEDPIN,1);}
+void ledOff() {digitalWrite(LEDPIN,0);}
 
 /////////////////////////////////////////////////////////////////////////
 // MENU DEFINITION
@@ -22,13 +24,13 @@ menuPrint menu_out(Serial);//describe output device
 void setup() {
   Serial.begin(9600);
   Serial.println("menu system test");
-  pinMode(13,OUTPUT);
+  pinMode(LEDPIN,OUTPUT);
   menu::exit="Saida";
   mainMenu.data[2]->enabled=false;
 }
 
 void loop() {
-  mainMenu.activate(menu_out,Serial);
+  mainMenu.run(menu_out,Serial);
   Serial.println("");
   Serial.println("Restarting...");
 }

menu.cpp

@@ -16,13 +16,15 @@ const char* menu::exit="Exit";
 char menu::enabledCursor='>';
 char menu::disabledCursor='-';
 prompt menu::exitOption(menu::exit);
+menu* menu::activeMenu=NULL;
 
 //menu navigation engine
 //iteract with input until a selection is done, return the selection
 int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
   int op=-2;
-  do {
-    while(!c.available());
+  //do {
+    //while(!c.available());
+    if (!c.available()) return op;
     if (c.peek()!=13) {
       if(c.available()) {
         int ch=c.read();
@@ -48,7 +50,7 @@ int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
     //add some delays to be sure we do not have more characters NL or CR on the way
     //delay might be adjusted to vope with stream speed
     delay(50);while (c.peek()==13||c.peek()==10) {c.read();delay(50);}//discard ENTER and CR
-  } while(op==-2);//repeat until we have a valid option (can be Exit/Esc)
+  //} while(op==-2);//repeat until we have a valid option (can be Exit/Esc)
   return op;
 }
 
@@ -58,10 +60,14 @@ int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
 // draw: call target device object
 //input scan: call the navigation function (self)
 void menu::activate(menuOut& p,Stream& c,bool canExit) {
-  sel=0;
-  p.top=0;
+	if (activeMenu!=this) {
+		previousMenu=activeMenu;
+		activeMenu=this;
+		sel=0;
+		p.top=0;
+	}
   int op=-1;
-  do {
+  //do {
     printMenu(p,canExit);
     op=menuKeys(p,c,canExit);
     if (op>=0&&op<sz) {
@@ -71,8 +77,14 @@ void menu::activate(menuOut& p,Stream& c,bool canExit) {
       	c.flush();//reset the encoder
       	p.drawn=0;//redraw menu
       }
-    }
-  } while(op!=-1);
+    } else if (op==-1) //then exit
+    	activeMenu=previousMenu;
+  //} while(op!=-1);
+}
+
+void menu::poll(menuOut& p,Stream& c,bool canExit) {
+	if (!activeMenu) activeMenu=this;
+	activeMenu->activate(p,c,activeMenu==this?canExit:true);
 }
 
 //todo: preparing functions for touch screen support

menu.h

@@ -97,9 +97,14 @@ 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 DECL_OP_(cnt,...) prompt op##cnt(__VA_ARGS__);
+  #define DECL_FIELD_(cnt,...) menuField _menuField##cnt(__VA_ARGS__);
   #define DECL_SUBMENU(id)
+  
   #define DEF_OP_(cnt,...) &op##cnt
+  #define DEF_FIELD_(cnt,...) &_menuField##cnt
   #define DEF_SUBMENU(id) &id
 
   /////////////////////////////////////////////////////////
@@ -175,17 +180,21 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     static const char *exit;//text used for exit option
     static char enabledCursor;//character to be used as navigation cursor
     static char disabledCursor;//to be used when navigating over disabled options
-    static prompt exitOption;//option tro append to every menu allowing exit when no escape button/key is available
+    static prompt exitOption;//option to append to menu allowing exit when no escape button/key is available
+    static menu* activeMenu;
+    menu* previousMenu;
     const int sz;
     int sel;//selection
     prompt* const* data PROGMEM;
-    menu(const char * text,int sz,prompt* const data[]):prompt(text),sz(sz),data(data),sel(0),width(16) {}
+    menu(const char * text,int sz,prompt* const data[]):prompt(text),sz(sz),data(data),sel(0),width(16),previousMenu(NULL) {}
 
     int menuKeys(menuOut &p,Stream& c,bool drawExit);
     inline void printMenu(menuOut& p,bool drawExit) {p.printMenu(*this,drawExit);}
 
     void activate(menuOut& p,Stream& c,bool canExit=false);
 
+    void poll(menuOut& p,Stream& c,bool canExit=false);
+    
     //some funcs to support touch... TODO: test them
     // this functions will probably move to touch class...
     // will be here now for test while i wait for my touch screen to arrive.....