Merge branch 'dev'

Author: neu-rah

README.md

@@ -278,7 +278,9 @@ multiple stream packing for input to mix encoder stream with encoder keyboard (u
 
 ##### Options
 
-**invertFieldKeys** option removed, invertion is now supported by specific menuIn objects.
+<del>**invertFieldKeys** option removed, invertion is now supported by specific menuIn objects.</del>
+
+_regression: still needed to ease simple input cases._
 
 **numValueInput** moved to menuIn object
 

examples/LCDs/LiquidCrystal/LiquidCrystal/LiquidCrystal.ino

@@ -126,8 +126,8 @@ TOGGLE((mainMenu[1].enabled),togOp,"Op 2:",doNothing,noEvent,noStyle
   ,VALUE("disabled",disabledStatus,doNothing,noEvent)
 );*/
 
-char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";
 
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle

examples/LCDs/Malpartida/I2C/I2C/I2C.ino

@@ -130,8 +130,8 @@ http://playground.arduino.cc/Code/LCD3wires
     ,VALUE("disabled",disabledStatus,doNothing,noEvent)
   );*/
 
-  char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-  char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+  const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+  const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
   char buf1[]="0x11";
 
   MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle

examples/LCDs/PCF8574/PCF8574/PCF8574.ino

@@ -127,8 +127,8 @@ TOGGLE((mainMenu[1].enabled),togOp,"Op 2:",doNothing,noEvent,noStyle
   ,VALUE("disabled",disabledStatus,doNothing,noEvent)
 );*/
 
-char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";
 
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle

examples/Serial/ansiSerial/ansiSerial/ansiSerial.ino

@@ -55,7 +55,7 @@ const colorDef<uint8_t> colors[] MEMMODE={
 // outputsList out(outputs,1);
 
 MENU_OUTPUTS(out,MAX_DEPTH
-  ,ANSISERIAL_OUT(Serial,colors,{1,1,16,10},{18,1,16,10},{36,1,16,10})
+  ,ANSISERIAL_OUT(Serial,colors,{1,1,26,10},{28,1,16,10},{46,1,16,10})
   ,NONE//must have 2 items at least
 );
 
@@ -239,16 +239,15 @@ altMENU(menu,birthDate,"Birth",doNothing,noEvent,noStyle,(systemStyles)(_asPad|M
   ,FIELD(day,"","",1,31,1,0,doNothing,noEvent,wrapStyle)
 );
 
-char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";
 
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
-  ,SUBMENU(birthDate)
   ,OP("Op1",action1,anyEvent)
   ,OP("Op2",action2,enterEvent)
-  //,SUBMENU(togOp)
   ,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
+  ,SUBMENU(birthDate)
   ,SUBMENU(subMenu)
   ,SUBMENU(setLed)
   ,OP("LED On",ledOn,enterEvent)

examples/Serial/serialio/platformio.ini

@@ -9,7 +9,7 @@
 
 [platformio]
 src_dir=serialio
-lib_dir=~/Arduino/Libraries
+; lib_dir=~/Arduino/Libraries
 
 [env:nanoatmega328]
 platform = atmelavr

examples/Serial/serialio/serialio/serialio.ino

@@ -23,7 +23,7 @@ result showEvent(eventMask e,navNode& nav,prompt& item) {
   return proceed;
 }
 
-int test=55;
+float test=55;
 
 result action1(eventMask e) {
   Serial.print(e);
@@ -100,12 +100,11 @@ PADMENU(birthDate,"Birth",doNothing,noEvent,noStyle
   ,FIELD(day,"","",1,31,1,0,doNothing,noEvent,wrapStyle)
 );
 
-char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";
 
 MENU(mainMenu,"Main menu",zZz,noEvent,wrapStyle
-  ,SUBMENU(birthDate)
   ,OP("Op1",action1,anyEvent)
   ,OP("Op2",action2,enterEvent)
   ,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
@@ -117,6 +116,7 @@ MENU(mainMenu,"Main menu",zZz,noEvent,wrapStyle
   ,SUBMENU(chooseMenu)
   ,OP("Alert test",doAlert,enterEvent)
   ,EDIT("Hex",buf1,hexNr,doNothing,noEvent,noStyle)
+  ,SUBMENU(birthDate)
   ,EXIT("<Back")
 );
 

examples/TFT/TFT/TFT.ino

@@ -33,8 +33,8 @@ using namespace Menu;
 
 TFT tft(CS, DC, RST);
 
-char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";//<-- menu will edit this text
 
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle

examples/U8G2/U8G2/U8G2.ino

@@ -138,8 +138,8 @@ MENU(subMenu,"Sub-Menu",doNothing,noEvent,noStyle
   ,EXIT("<Back")
 );
 
-char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";
 
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle

examples/U8GLib/U8Glib/U8GLib.ino

@@ -116,8 +116,8 @@ MENU(subMenu,"Sub-Menu",showEvent,anyEvent,noStyle
   ,EXIT("<Back")
 );
 
-char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
-char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";
 
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle