Fields, Choose and Toggle templates added

menuField: change value of numeric variable
menuChoose: Use menu navigation to select variable value
menuToggle: 'click' to change variable value cycling a list a values
menuValue: menu prompt holding a value for variable set
TODO: avoid unnecessary redraw

Author: neu-rah

menu.h

@@ -99,17 +99,42 @@ 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 CHOOSE(type,id,text,...)\
+    FOR_EACH(menuValue<type> DECL_VALUE,__VA_ARGS__)\
+    menuValue<type>* const id##_data[]={\
+      FOR_EACH(DEF,__VA_ARGS__)\
+    };\
+    menuChoice<type> id (text,sizeof(id##_data)/sizeof(prompt*),id##_data);*/
+
+  #define CHOOSE(target,id,text,...)\
+    FOR_EACH(menuValue<typeof(target)> DECL_VALUE,__VA_ARGS__)\
+    menuValue<typeof(target)>* const id##_data[]={\
+      FOR_EACH(DEF,__VA_ARGS__)\
+    };\
+    menuChoice<typeof(target)> id (text,sizeof(id##_data)/sizeof(prompt*),id##_data,target);
+  
+  #define TOGGLE(target,id,text,...)\
+    FOR_EACH(menuValue<typeof(target)> DECL_VALUE,__VA_ARGS__)\
+    menuValue<typeof(target)>* const id##_data[]={\
+      FOR_EACH(DEF,__VA_ARGS__)\
+    };\
+    menuToggle<typeof(target)> id (text,sizeof(id##_data)/sizeof(prompt*),id##_data,target);
+  
   #define OP(...) OP_(__COUNTER__,__VA_ARGS__)
   #define FIELD(...) FIELD_(__COUNTER__,__VA_ARGS__)
+  #define VALUE(...) VALUE_(__COUNTER__,__VA_ARGS__)
 
   #define DECL_OP_(cnt,...) prompt op##cnt(__VA_ARGS__);
   #define DECL_FIELD_(cnt,type,...) menuField<type> _menuField##cnt(__VA_ARGS__);
   #define DECL_SUBMENU(id)
+	#define DECL_VALUE(...) _##__VA_ARGS__
+	#define _VALUE_(cnt,...) choice##cnt(__VA_ARGS__);
 
   #define DEF_OP_(cnt,...) &op##cnt
   #define DEF_FIELD_(cnt,type,...) &_menuField##cnt
   #define DEF_SUBMENU(id) &id
-  
+  #define DEF_VALUE(id) &id
+  #define DEF_VALUE_(cnt,...) &choice##cnt
 
   /////////////////////////////////////////////////////////
   // menu pure virtual output device, use derived
@@ -168,17 +193,16 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
   class prompt {
     public:
     const char *text;
-    promptAction action;
+    static void nothing() {}
+    promptAction action=nothing;
     bool enabled;
     inline prompt(const char * text):text(text),enabled(true) {}
     inline prompt(const char * text,promptAction action)
     	:text(text),action(action),enabled(true) {}
     virtual size_t printTo(Print& p) {
-    	//Serial<<"printing prompt"<<endl;
     	p.print(text);return strlen(text);
     }
     virtual void activate(menuOut& p,Stream&c,bool) {
-    	//Serial<<"activating prompt "<<text<<endl;
     	action(*this,p,c);
     }
   };