Merge branch 'dev'

Author: neu-rah

.gitignore

@@ -3,7 +3,7 @@
 .gcc-flags.json
 .piolibdeps
 src/main.cpp
-examples/debug
+/debug
 lib
 .travis.yml
 !/.travis.yml

README.md

@@ -208,15 +208,14 @@ Web browser (experimental) when using ESP devices
 ## Dependencies
 This library depends on the following libraries:
 
-- Streaming https://github.com/scottdky/Streaming (on debug mode)
-- Assert4a https://github.com/nettigo/Assert4a (on debug mode)
+- streamFlow https://github.com/neu-rah/streamFlow (on debug mode)
 
 Depending on the type of input or output, other libraries might be needed. Essentially any library needed for your devices.
 
 ## Limits
 
 - when using macros the menu is limited to 16 options (current macro limnit).
-- menus **must** have at least 2 options.
+- menus **must** have at least 2 options when built using macros.
 - maximum 127 options.
 - fast access (numeric keys) only supports 9 options (1 to 9)
 - prompts can overflow on panels with less than 4 characters width
@@ -255,7 +254,7 @@ multiple stream packing for input to mix encoder stream with encoder keyboard (u
   - More examples
   - Text edit fields with validation *
   - Pad style menus (horizontal list)
-  - inline pad menus can input custom formats like IP/Date/Time, experimental and just for devices that can position a cursor 
+  - inline pad menus can input custom formats like IP/Date/Time, experimental and just for devices that can position a cursor
   - Plugins, alternative menu items potentially device specific
   - Allow multiple concurrent menus
   - Support UCGLib displays

TODO.txt

@@ -1,36 +1,48 @@
 Arduino Menu Library
 
-- pad menu should exit at left (the least)
-  => can have edit blocks (non-preview)
-- implement dynamic attribute hidden and edit (only appears on edit)
-- central menu init
+- password fields
+- scroll long prompts (not for serial)
+- allow disabled items to receive events! for help print purposes
+- support frames
+- explore arrow keys for ansiSerial
+- alternative keys example
+- freelancer fields (can be polled without a menu structure, or a singular menu struct)
+  =>navNode needed to point o navTarget instead of menuNode <- NOT!
+  =>use an one option menu
+    - support 1 option menu on macros
+- use formatters for color application
+- detach panels from output, instead panels should be a gateway for output!
+- Web menu: index all handlers and let web call them by ID (forget the parser)
+  => how to index to a field value? handlers should have received the values => templates :S
+  feedback, use the same schema ids should update the state on a permanent web page
+  updates should be requested by the client along with the current page url/path (navNode)
+  then javascript should update the values received by id.
+  - constructing the callback table...
+    a)   navRoot.begin() but then webmenu had to register
+    b) * use esp8266Out.begin()
+
+- central menu init by calling menu begin
   => check's ex: if numeric input available then output numeric indexes
-+1 padMenu: printMenu needs to return idx_t instead of void
+- help texts
+  => multi-line fields to combine with menu preview
+- implement dynamic attribute hidden and edit (only appears on edit)
+
+
+DONE:
++ pad menu should exit at left (the least)
+  ? can have edit blocks (non-preview) => require new attribute
++ padMenu: printMenu needs to return idx_t instead of void
   => why not an area? because it would send menu to a 2d thing.. .and its already huge for AVR's
     and using and area => that all printTo had to return an area
   - done so on a dumb mode where int means width and using original width return
     change it later to width,height
--2 mark exit options
+x mark exit options
   -> then we can zero index them
   -> can omit them on in-line pad preview
   => abandoned! options are marked with _Exit system style but no more
     because kb accels would go very complicated
-- freelancer fields (can be polled without a menu structure, or a singular menu struct)
-  =>navNode needed to point o navTarget instead of menuNode <- NOT!
-  =>use an one option menu
-    - support 1 option menu on macros
-- use formatters for color application
+  => primary source of panels continues to be the output definition
 + remove title brackets
-- detach panels from output, instead panels should be a gateway for output!
-  => primary source continues to be the output definition
-- scroll long prompts (not for serial)
-- allow disabled items to receive events! for help print purposes
-- help texts
-  => multi-line fields to combine with menu preview
-- password fields
-- support frames
-- explore arrow keys for ansiSerial
-- alternative keys example
 + separate functions as parentDraw, isMenu, asPad, etc... are inefficient
   => added `is` and `has` functions to deal with systemStyles, styles and events
 + check uint8_t types -> wrap and non-wrap ok

examples/Serial/ansiSerial/ansiSerial/ansiSerial.ino

@@ -227,17 +227,24 @@ MENU(subMenu,"Sub-Menu",doNothing,noEvent,noStyle
   ,EXIT("<Back")
 );
 
-// extern menu mainMenu;
-// TOGGLE((mainMenu[1].enabled),togOp,"Op 2:",doNothing,noEvent,noStyle
-//   ,VALUE("Enabled",enabledStatus,doNothing,noEvent)
-//   ,VALUE("disabled",disabledStatus,doNothing,noEvent)
-// );
+uint16_t year=2017;
+uint16_t month=10;
+uint16_t day=7;
+
+//define a pad style menu (single line menu)
+//here with a set of fields to enter a date in YYYY/MM/DD format
+altMENU(menu,birthDate,"Birth",doNothing,noEvent,noStyle,(systemStyles)(_asPad|Menu::_menuData|Menu::_canNav|_parentDraw)
+  ,FIELD(year,"","/",1900,3000,20,1,doNothing,noEvent,noStyle)
+  ,FIELD(month,"","/",1,12,1,0,doNothing,noEvent,wrapStyle)
+  ,FIELD(day,"","",1,31,1,0,doNothing,noEvent,wrapStyle)
+);
 
 char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
 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)

examples/Serial/ansiSerial/platformio.ini

@@ -11,25 +11,25 @@
 src_dir=ansiSerial
 lib_dir=~/Arduino/Libraries
 
-; [env:nanoatmega328]
-; platform = atmelavr
-; board = nanoatmega328
-; framework = arduino
-; upload_port=/dev/ttyUSB*
-; upload_flags=-V
-; build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -DNODEBUG
+[env:nanoatmega328]
+platform = atmelavr
+board = nanoatmega328
+framework = arduino
+upload_port=/dev/ttyUSB*
+upload_flags=-V
+build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -DNODEBUG
 
 ; [env:teensy31]
 ; platform = teensy
 ; board = teensy31
 ; framework = arduino
 ; build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -lstdc++
 
-[env:due]
-platform = atmelsam
-board = due
-framework = arduino
-build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -DNODEBUG -DNOTRACE
+; [env:due]
+; platform = atmelsam
+; board = due
+; framework = arduino
+; build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -DNODEBUG -DNOTRACE
 
 ;[env:esp01_1m]
 ;platform = espressif8266

examples/Serial/serialio/serialio/serialio.ino

@@ -93,7 +93,8 @@ uint16_t day=7;
 
 //define a pad style menu (single line menu)
 //here with a set of fields to enter a date in YYYY/MM/DD format
-altMENU(menu,birthDate,"Birth",doNothing,noEvent,noStyle,_asPad
+//altMENU(menu,birthDate,"Birth",doNothing,noEvent,noStyle,(systemStyles)(_asPad|Menu::_menuData|Menu::_canNav|_parentDraw)
+PADMENU(birthDate,"Birth",doNothing,noEvent,noStyle
   ,FIELD(year,"","/",1900,3000,20,1,doNothing,noEvent,noStyle)
   ,FIELD(month,"","/",1,12,1,0,doNothing,noEvent,wrapStyle)
   ,FIELD(day,"","",1,31,1,0,doNothing,noEvent,wrapStyle)
@@ -104,6 +105,7 @@ 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)
@@ -115,7 +117,6 @@ 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/esp8266/WebMenu/WebMenu/WebMenu.ino

@@ -115,7 +115,7 @@ CHOOSE(chooseTest,chooseMenu,"Choose",doNothing,noEvent,noStyle
 
 int timeOn=50;
 void updAnalog() {
-  analogWrite(ANALOG_PIN,map(timeOn,0,100,0,PWMRANGE));
+  analogWrite(ANALOG_PIN,map(timeOn,0,100,0,255/*PWMRANGE*/));
 }
 
 //the menu
@@ -268,8 +268,9 @@ bool handleMenu(){
 void setup(){
   pinMode(LEDPIN,OUTPUT);
   updLed();
+  analogWriteRange(1023);
   pinMode(ANALOG_PIN,OUTPUT);
-  analogWriteRange(255);
+  updAnalog();
   //options=&myOptions;//menu options
   Serial.begin(115200);
   while(!Serial)

examples/esp8266/WebMenu/WebMenu/data/menu.css

@@ -1,6 +1,14 @@
-/*
- * Globals
- */
+html,
+body {
+  height: 100%;
+  background-color: #132;
+}
+body {
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 3px rgba(0,0,0,.5);
+  font-size: 18px;
+}
 
 /* Links */
 a,
@@ -9,6 +17,10 @@ a:hover {
   color: #fff;
 }
 
+.aml_op {
+  font-size:1.3em;
+}
+
 .actionBtn {
   display:inline-block;
   padding:1em;
@@ -39,17 +51,6 @@ input[type=range] {
  * Base structure
  */
 
-html,
-body {
-  height: 100%;
-  background-color: #132;
-}
-body {
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 3px rgba(0,0,0,.5);
-}
-
 select {color: black;}
 
 /* Extra markup and styles for table-esque vertical and horizontal centering */
@@ -84,11 +85,15 @@ select {color: black;}
   margin-bottom: 10px;
 }
 
+ul {
+  list-style-type: none;
+}
+
 .masthead-nav > li {
   display: inline-block;
 }
 .masthead-nav > li + li {
-  margin-left: 20px;
+  margin-left: 0.5em;
 }
 .masthead-nav > li > a {
   padding-right: 0;

examples/esp8266/WebMenu/WebMenu/data/menu.xslt

@@ -10,7 +10,7 @@
     this is usefull for develop/debug
     to use external server the browser must be intructed to accept cross domain files
   -->
-  <xsl:variable name="auxFilesSrc">http://neurux:8080</xsl:variable>
+  <xsl:variable name="auxFilesSrc"></xsl:variable>
 
   <xsl:template match="/">
     <html>
@@ -45,7 +45,7 @@
             <div class="cover-container">
               <div class="masthead clearfix">
                 <div class="inner">
-                  <h3 class="masthead-brand">ArduinoMenu library</h3>
+                  <a href="/"><h3 class="masthead-brand">ArduinoMenu library</h3></a>
                   <nav>
                     <ul class="nav masthead-nav">
                       <li class="active"><a href="https://github.com/neu-rah/ArduinoMenu">Home</a></li>
@@ -57,7 +57,8 @@
               </div>
 
               <div class="inner cover">
-                <h2><img src="logo.png" height="48px"/>on ESP8266 (dev mode!)</h2>
+                <h2><img src="logo.png" height="48px"/>on ESP8266</h2>
+                (dev mode!)
                 <xsl:apply-templates/>
               </div>
 

src/macros.h

@@ -157,6 +157,7 @@ Menu::utftOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH);
 Menu::outputsList id(id##_outPtrs,sizeof(id##_outPtrs)/sizeof(Menu::menuOut*));
 
 #define MENU(id,text,aFn,mask,style,...) altMENU(Menu::menu,id,text,aFn,mask,style,(Menu::_menuData|Menu::_canNav),__VA_ARGS__)
+#define PADMENU(id,text,aFn,mask,style,...) altMENU(Menu::menu,id,text,aFn,mask,style,(Menu::_asPad|Menu::_menuData|Menu::_canNav|Menu::_parentDraw),__VA_ARGS__)
 #define altMENU(objType,id,text,aFn,mask,style,ss,...)\
   FOR_EACH(DECL,__VA_ARGS__)\
   constMEM char id##_text[] MEMMODE=text;\