fixing toggles over web/sockets

toggle updates SHOULD not do default action before update or we can have 
pulses on the output with a toggle preceeding an update.
This is an exception to the event schema. Toggle update is trigering an 
updateEvent right after.
This happens because we never "enter" a toggle but we need to skip 
entering default action (toggle) when updating.

Author: neu-rah

examples/esp8266/WebMenu/WebMenu/WebMenu.ino

@@ -60,12 +60,23 @@ menuOut& operator<<(menuOut& o,endlObj) {
 }
 
 //this version numbers MUST be the same as data/1.2
-#define CUR_VERSION "1.3"
+#define CUR_VERSION "1.4"
 #define APName "WebMenu"
+
+int ledCtrl=LOW;
+//on my esp12e led pin is 2
+#define LEDPIN 2
+//this is ok on other boards
+// #define LEDPIN LED_BUILTIN
+void updLed() {
+  _trace(Serial<<"update led state!"<<endl);
+  digitalWrite(LEDPIN,!ledCtrl);
+}
+
 #define ANALOG_PIN 4
 
-constexpr size_t wifiSSIDLen=64;
-constexpr size_t wifiPwdLen=32;
+// constexpr size_t wifiSSIDLen=64;
+// constexpr size_t wifiPwdLen=32;
 
 #ifndef MENU_SSID
   #error "need to define WiFi SSID here"
@@ -76,8 +87,8 @@ constexpr size_t wifiPwdLen=32;
   #define MENU_PASS ""
 #endif
 
-char wifiSSID[wifiSSIDLen+1];//="                                ";
-char wifiPwd [wifiPwdLen+1];//="                                ";
+// char wifiSSID[wifiSSIDLen+1];//="                                ";
+// char wifiPwd [wifiPwdLen+1];//="                                ";
 
 const char* ssid = MENU_SSID;
 const char* password = MENU_PASS;
@@ -108,15 +119,13 @@ result action2(eventMask event, navNode& nav, prompt &item) {
   return proceed;
 }
 
-int ledCtrl=LOW;
-#define LEDPIN LED_BUILTIN
-void updLed() {
-  digitalWrite(LEDPIN,!ledCtrl);
+void debugLedUpd() {
+  _trace(Serial<<"debug led update! "<<ledCtrl<<endl);
 }
 
-TOGGLE(ledCtrl,setLed,"Led: ",updLed,enterEvent,noStyle//,doExit,enterEvent,noStyle
-  ,VALUE("On",HIGH,doNothing,noEvent)
+TOGGLE(ledCtrl,setLed,"Led: ",updLed,(Menu::eventMask)(updateEvent|enterEvent),noStyle
   ,VALUE("Off",LOW,doNothing,noEvent)
+  ,VALUE("On",HIGH,doNothing,noEvent)
 );
 
 int selTest=0;
@@ -138,6 +147,7 @@ int duty=50;//%
 int timeOn=50;//ms
 void updAnalog() {
   // analogWrite(ANALOG_PIN,map(timeOn,0,100,0,255/*PWMRANGE*/));
+  analogWrite(ANALOG_PIN,map(duty,0,100,0,255/*PWMRANGE*/));
 }
 
 char* constMEM alphaNum MEMMODE=" 0123456789.ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz,\\|!\"#$%&/()=?~*^+-{}[]€";
@@ -182,7 +192,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   ,OP("Action A",action1,enterEvent)
   ,OP("Action B",action2,enterEvent)
   ,FIELD(duty,"Duty","%",0,100,10,1, updAnalog, anyEvent, noStyle)
-  ,FIELD(timeOn,"On","ms",0,100,10,1, updAnalog, anyEvent, noStyle)
+  // ,FIELD(timeOn,"On","ms",0,100,10,1, updAnalog, anyEvent, noStyle)
   ,EDIT("Name",name,alphaNumMask,doNothing,noEvent,noStyle)
   ,SUBMENU(birthDate)
   ,SUBMENU(selMenu)
@@ -353,8 +363,8 @@ void setup(){
   pinMode(LEDPIN,OUTPUT);
   updLed();
   // analogWriteRange(1023);
-  // pinMode(ANALOG_PIN,OUTPUT);
-  // updAnalog();
+  pinMode(ANALOG_PIN,OUTPUT);
+  updAnalog();
   //options=&myOptions;//menu options
   Serial.begin(115200);
   while(!Serial)

examples/esp8266/WebMenu/WebMenu/data/1.3/bootstrap.xslt renamed to examples/esp8266/WebMenu/WebMenu/data/1.4/bootstrap.xslt

@@ -18,7 +18,7 @@ function connectWS() {
       console.log("NO JSON!",e.data);
     }
     eval("lastResult="+e.data);
-    updatePage();
+    //updatePage();
   };
   return connection.readyState;
 }
@@ -103,21 +103,21 @@ function mkPath(m) {
 }
 
 function menu(o,cnt) {
-  if(connection.readyState!=1) {//not connected (yet)?
-    console.log("not connected yet...")
-    if (connection.readyState==3) {//disconnected?
-      console.log("connecting websocket");
-      connectWS();
-    }
-    setTimeout(function() {//check latter...
-      console.log("checking websocket connetion");
-      if (connection.readyState!=1&&cnt>5) {//give up?
-        alert("websocket disconnected, please refresh page");//TODO: put mutilang here
-        return;
-      } else menu(o,cnt?cnt+1:0);
-    },500);
-    return;
-  }
+  // if(connection.readyState!=1) {//not connected (yet)?
+  //   console.log("not connected yet...")
+  //   if (connection.readyState==3) {//disconnected?
+  //     console.log("connecting websocket");
+  //     connectWS();
+  //   }
+  //   setTimeout(function() {//check latter...
+  //     console.log("checking websocket connetion");
+  //     if (connection.readyState!=1&&cnt>5) {//give up?
+  //       alert("websocket disconnected, please refresh page");//TODO: put mutilang here
+  //       return;
+  //     } else menu(o,cnt?cnt+1:0);
+  //   },500);
+  //   return;
+  // }
   console.log("send ws",o);
   return connection.send(o);
 }
@@ -139,11 +139,11 @@ function updateLink_(e) {
   var n = $(e),
     o = n.attr("data-grp"),
     t = n.attr("data-src");
-  console.log("removing selections");
+  // console.log("removing selections");
   $("a[data-grp='" + o + "']").removeClass("btn-primary btn-success");
-  console.log("adding selection to", e);
+  // console.log("adding selection to", e);
   n.addClass("btn-primary");
-  console.log("sending: " + t);
+  // console.log("sending: " + t);
   menu(t);
   // connection.send(t)
 }
@@ -154,7 +154,7 @@ function updateSelect(e) {
 
 function updateSelect_(e) {
   var n = $(e).attr("data-src") + "/" + e.selectedIndex;
-  console.log("sending: " + n);
+  // console.log("sending: " + n);
   menu(n);
   // connection.send(n);
 }

examples/esp8266/WebMenu/WebMenu/data/1.3/device.xslt renamed to examples/esp8266/WebMenu/WebMenu/data/1.4/device.xslt

@@ -8,7 +8,7 @@
 ; http://docs.platformio.org/en/stable/projectconf.html
 
 [platformio]
-env_default = wemos
+env_default = esp12e
 lib_dir= lib
 ; lib_dir =~/Arduino/Libraries
 ;lib_dir =~/Sketchbook/libraries
@@ -21,20 +21,11 @@ data_dir=WebMenu/data
 ; framework = arduino
 ; build_flags = -Wno-comment -Wno-strict-aliasing -Wno-builtin-macro-redefined -DNODEBUG
 
-; [env:esp12e]
-; platform = espressif8266
-; board = esp12e
-; framework = arduino
-; upload_speed=921600
-; build_flags = -DDEBUG -DMENU_ASYNC -DMENU_FMT_WRAPS
-
-[env:wemos]
+[env:esp12e]
 platform = espressif8266
-board = d1_mini
+board = esp12e
 framework = arduino
-; upload_speed=1500000
 upload_speed=921600
-upload_port=/dev/ttyUSB*
 build_flags =
   -DMENU_ASYNC
   -DMENU_FMT_WRAPS
@@ -43,3 +34,19 @@ build_flags =
   -DNO_WEB_DEBUG
   -DMENU_SSID="\"r-site.net\"" -DMENU_PASS="\"rsite.2011\""
 src_build_flags = !echo "-Wno-write-strings -Wno-reorder -Wno-strict-aliasing -Wno-sign-compare -DLOC="$PLATFORMIO_LOC
+
+; [env:wemos]
+; platform = espressif8266
+; board = d1_mini
+; framework = arduino
+; ; upload_speed=1500000
+; upload_speed=921600
+; upload_port=/dev/ttyUSB*
+; build_flags =
+;   -DMENU_ASYNC
+;   -DMENU_FMT_WRAPS
+;   -DMENU_IDLE_BKGND
+;   -DNO_MENU_DEBUG
+;   -DNO_WEB_DEBUG
+;   -DMENU_SSID="\"r-site.net\"" -DMENU_PASS="\"rsite.2011\""
+; src_build_flags = !echo "-Wno-write-strings -Wno-reorder -Wno-strict-aliasing -Wno-sign-compare -DLOC="$PLATFORMIO_LOC

examples/esp8266/WebMenu/WebMenu/data/1.3/index.html renamed to examples/esp8266/WebMenu/WebMenu/data/1.4/index.html

@@ -1,5 +1,5 @@
 name=ArduinoMenu library
-version=4.15.5
+version=4.15.6
 author=Rui Azevedo, [email protected]
 maintainer=neu-rah, [email protected]
 sentence=Generic menu/interactivity system

examples/esp8266/WebMenu/WebMenu/data/1.3/menu.css renamed to examples/esp8266/WebMenu/WebMenu/data/1.4/menu.css

@@ -55,7 +55,7 @@ Used prompt::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,id
   idx_t prompt::selected() const {return 0;}
   const char* prompt::typeName() const {return "prompt";}
   bool prompt::async(const char*uri,navRoot& root,idx_t lvl) {
-    trace(MENU_DEBUG_OUT<<"prompt::async ["<<uri<<"]"<<endl;);
+    _trace(MENU_DEBUG_OUT<<"prompt::async ["<<uri<<"]"<<endl;);
     return true;
   }
   idx_t menuNode::parseUriNode(const char*&uri) {
@@ -92,10 +92,22 @@ Used prompt::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,id
     assert(strchr(numericChars,uri[0]));
     int n=parseUriNode(uri);
     trace(MENU_DEBUG_OUT<<"n:"<<n<<" sel:"<<root.path[lvl].sel<<endl);
-    if (!(root.path[lvl].sel==n&&root.path[lvl+1].target==&operator[](n)&&root.level>lvl)) {
+    _trace(Serial<<"root.level>lvl:"<<(root.level>lvl)<<endl);
+    _trace(Serial<<"root.path[lvl].sel==n:"<<(root.path[lvl].sel==n)<<endl);
+    _trace(Serial<<"root.path[lvl+1].target==&operator[](n))):"<<(root.path[lvl+1].target==&operator[](n))<<endl);
+    _trace(Serial<<"operator[](n).type()==toggleClass:"<<(operator[](n).type()==toggleClass)<<endl);
+    if (!(
+        //if updating a toggle to not toggle the value, was deffault action
+        //but as we can't enter toggles this action would be preceeding every update otherwise.
+        (operator[](n).type()==toggleClass&&strchr(uri,'/'))
+        ||(root.level>lvl&&root.path[lvl].sel==n&&root.path[lvl+1].target==&operator[](n))
+      )) {
+      _trace(Serial<<"menuNode, escTo "<<lvl<<endl);
       root.escTo(lvl/*+(lvl&&root.path[lvl].sel==n?-1:0)*/);
+      _trace(Serial<<"menuNode, doNav "<<n<<endl);
       root.doNav(navCmd(idxCmd,n));
     }
+    _trace(Serial<<"menuNode, proceed async"<<endl);
     return operator[](n).async(uri,root,lvl+1);
   }
   const char* navTarget::typeName() const {return "navTarget";}