Merge branch 'dev'

Author: neu-rah

README.md

@@ -255,7 +255,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
+  - 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,6 +1,8 @@
 Arduino Menu Library
 
-- implement attribute hidden
+- 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
   => check's ex: if numeric input available then output numeric indexes
 +1 padMenu: printMenu needs to return idx_t instead of void

examples/Serial/serialio/platformio.ini

@@ -11,25 +11,25 @@
 src_dir=serialio
 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

@@ -87,6 +87,18 @@ MENU(subMenu,"Sub-Menu",showEvent,anyEvent,noStyle
   ,EXIT("<Back")
 );
 
+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,_asPad
+  ,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";
@@ -103,6 +115,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/esp8266/WebMenu/WebMenu/WebMenu.ino

@@ -36,8 +36,20 @@ extern "C" {
 
 using namespace Menu;
 
-const char* ssid = "r-site.net";
-const char* password = "rsite.2011";
+#define ANALOG_PIN 4
+
+#ifndef MENU_SSID
+  #error "need to define WiFi SSID here"
+  #define MENU_SSID "r-site.net"
+#endif
+#ifndef MENU_PASS
+#error "need to define WiFi password here"
+  #define MENU_PASS ""
+#endif
+
+const char* ssid = MENU_SSID;
+const char* password = MENU_PASS;
+const char* serverName="192.168.1.79";
 #ifdef DEBUG
   // on debug mode I put aux files on external server to allow changes without SPIFF update
   // on this mode the browser MUST be instructed to accept cross domain files
@@ -76,8 +88,12 @@ result action2(eventMask event, navNode& nav, prompt &item) {
 }
 
 int ledCtrl=LOW;
+#define LEDPIN LED_BUILTIN
+void updLed() {
+  digitalWrite(LEDPIN,!ledCtrl);
+}
 
-TOGGLE(ledCtrl,setLed,"Led: ",doNothing,noEvent,noStyle//,doExit,enterEvent,noStyle
+TOGGLE(ledCtrl,setLed,"Led: ",updLed,enterEvent,noStyle//,doExit,enterEvent,noStyle
   ,VALUE("On",HIGH,doNothing,noEvent)
   ,VALUE("Off",LOW,doNothing,noEvent)
 );
@@ -97,13 +113,17 @@ CHOOSE(chooseTest,chooseMenu,"Choose",doNothing,noEvent,noStyle
   ,VALUE("Last",-1,doNothing,noEvent)
 );
 
+int timeOn=50;
+void updAnalog() {
+  analogWrite(ANALOG_PIN,map(timeOn,0,100,0,PWMRANGE));
+}
+
 //the menu
-int timeOn;
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   ,SUBMENU(setLed)
   ,OP("Action A",action1,enterEvent)
   ,OP("Action B",action2,enterEvent)
-  ,FIELD(timeOn,"On","ms",0,500,100,10, doNothing, noEvent, noStyle)
+  ,FIELD(timeOn,"On","ms",0,100,10,1, updAnalog, anyEvent, noStyle)
   ,SUBMENU(selMenu)
   ,SUBMENU(chooseMenu)
 );
@@ -124,37 +144,39 @@ NAVROOT(nav,mainMenu,MAX_DEPTH,serial,out);
 void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
   switch(type) {
     case WStype_DISCONNECTED:
-      USE_SERIAL.printf("[%u] Disconnected!\n", num);
+      //USE_SERIAL.printf("[%u] Disconnected!\n", num);
       break;
     case WStype_CONNECTED: {
         IPAddress ip = webSocket.remoteIP(num);
-        USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+        //USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
         webSocket.sendTXT(num, "console.log('ArduinoMenu Connected')");
       }
       break;
     case WStype_TEXT:
-      USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
+      //USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
       nav.async((const char*)payload);//this is slow!!!!!!!!
       break;
     case WStype_BIN: {
-        USE_SERIAL.printf("[WSc] get binary length: %u", length);
-        Serial<<endl;
-        /*for(int c=0;c<length;c++)
-          USE_SERIAL<<*(char*)(payload+c);*/
+        USE_SERIAL<<"[WSc] get binary length:"<<length<<"[";
+        for(int c=0;c<length;c++) {
+          USE_SERIAL.print(*(char*)(payload+c),HEX);
+          USE_SERIAL.write(',');
+        }
+        Serial<<"]"<<endl;
         uint16_t id=*(uint16_t*) payload++;
         idx_t len=*((idx_t*)++payload);
         idx_t* pathBin=(idx_t*)++payload;
         const char* inp=(const char*)(payload+len);
-        Serial<<"id:"<<id<<endl;
+        //Serial<<"id:"<<id<<endl;
         if (id==nav.active().hash()) {
-          Serial<<"id ok."<<endl;Serial.flush();
-          Serial<<"input:"<<inp<<endl;
+          //Serial<<"id ok."<<endl;Serial.flush();
+          //Serial<<"input:"<<inp<<endl;
           //StringStream inStr(inp);
           //while(inStr.available())
           nav.doInput(inp);
           webSocket.sendTXT(num, "binBusy=false;");//send javascript to unlock the state
-        } else Serial<<"id not ok!"<<endl;
-        Serial<<endl;
+        } //else Serial<<"id not ok!"<<endl;
+        //Serial<<endl;
       }
       break;
   }
@@ -164,12 +186,14 @@ void pageStart() {
   server.sendHeader("Cache-Control","no-cache, no-store, must-revalidate");
   server.sendHeader("Pragma","no-cache");
   server.sendHeader("Expires","0");
-  serverOut<<
-    "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n"
-    "<?xml-stylesheet type=\"text/xsl\" href=\""
-    xslt
-    "\"?>\r\n<menuLib>\r\n";
-    "<menuLib>\r\n";
+  serverOut
+    <<"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n"
+      "<?xml-stylesheet type=\"text/xsl\" href=\""
+      xslt
+      "\"?>\r\n<menuLib>\r\n"
+      "<sourceURL>"
+    <<serverName
+    <<"</sourceURL>";
 }
 
 void pageEnd() {
@@ -242,6 +266,10 @@ bool handleMenu(){
 }
 
 void setup(){
+  pinMode(LEDPIN,OUTPUT);
+  updLed();
+  pinMode(ANALOG_PIN,OUTPUT);
+  analogWriteRange(255);
   //options=&myOptions;//menu options
   Serial.begin(115200);
   while(!Serial)
@@ -260,16 +288,18 @@ void setup(){
   // Serial.setDebugOutput(0);
   // while(!Serial);
   // delay(10);
-  wifi_station_set_hostname((char*)"ArduinoMenu");
+  // wifi_station_set_hostname((char*)serverName);
   Serial.println("");
   Serial.println("Arduino menu webserver example");
 
   SPIFFS.begin();
 
+  //WiFi.hostname(serverName);//not good
+
   Serial.print("Connecting to ");
   Serial.println(ssid);
 
-  WiFiMulti.addAP("r-site.net", "rsite.2011");
+  WiFiMulti.addAP(ssid, password);
   while(WiFiMulti.run() != WL_CONNECTED) delay(100);
   // WiFi.begin(ssid, password);
   // Wait for connection

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

@@ -29,6 +29,11 @@ a:hover {
   border: 1px solid #fff;
 }
 
+input[type=range] {
+  display:inline-block !important;
+  width:62% !important;
+  background-color:#000800;
+}
 
 /*
  * Base structure

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"></xsl:variable>
+  <xsl:variable name="auxFilesSrc">http://neurux:8080</xsl:variable>
 
   <xsl:template match="/">
     <html>
@@ -22,6 +22,10 @@
         <meta name="description" content="ArduinoMenu Example IOT/OTA for ESP8266"/>
         <meta name="author" content="Rui Azevedo [email protected] (www.r-site.net)"/>
         <title>ArduinoMenu library OTA</title>
+        <script>
+          <xsl:text>var sourceURL="</xsl:text><xsl:value-of select="/menuLib/sourceURL"/><xsl:text>";</xsl:text>
+          <xsl:text>console.log("sourceURL:",sourceURL);</xsl:text>
+        </script>
         <link rel="icon" type="image/png" href="/logo.png"/>
         <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha256-/SIrNqv8h6QGKDuNoLGA4iret+kyesCkHGzVUUV0shc=" crossorigin="anonymous"></script>
         <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"/>
@@ -118,15 +122,13 @@
   </xsl:template>
 
   <xsl:template match="field">
-    <li>
       <xsl:element name="input">
         <xsl:copy-of select="node/@*"/>
         <xsl:copy-of select="../../@data-idx"/>
         <xsl:attribute name="class">menu-range-field</xsl:attribute>
         <xsl:attribute name="type">range</xsl:attribute>
         <xsl:attribute name="value"><xsl:apply-templates/></xsl:attribute>
       </xsl:element>
-    </li>
   </xsl:template>
 
   <xsl:template match="*">

examples/esp8266/WebMenu/WebMenu/data/r-site.js

@@ -13,9 +13,9 @@ function init() {
   s.change(updateSelect)
 }*/
 
-wsSrc="192.168.1.64"
+wsSrc=sourceURL;//"192.168.1.79";
 
-var connection = {}
+var connection = {};
 function menuIn(o) {connection.send(o.id.split('~').join('/')+"/"+o.value);}
 
 function sendBinValue(nr,path,value) {

examples/esp8266/WebMenu/platformio.ini

@@ -24,4 +24,4 @@ platform = espressif8266
 board = esp12e
 framework = arduino
 upload_speed=921600
-build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -lstdc++ -DDEBUG
+build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -lstdc++ -DNODEBUG -DMENU_SSID="\"r-site.net\"" -DMENU_PASS="\"rsite.2011\""