Merge branch 'dev'

Author: neu-rah

examples/CustomPrompt/CustomPrompt/CustomPrompt.ino

@@ -96,6 +96,7 @@ void setup() {
   //   delay(1000);
   // }
 
+  //NOTE: async is disabled now define MENU_ASYNC to activate it
   //following code is an async navigation example
   //its async because it does not require a known menu state
   //because you can indicate the zero indexed option positions separated by /

src/menu.cpp

@@ -43,6 +43,7 @@ prompt* menuNode::seek(idx_t* uri,idx_t len) {
     return e.seek(++uri,--len);
   } else return NULL;
 }
+#ifdef MENU_ASYNC
 bool menuNode::async(const char *uri,navRoot& root,idx_t lvl) {
   trace(Serial<<"menuNode::async"<<endl);
   if ((!*uri)||(uri[0]=='/'&&!uri[1])) return this;
@@ -66,6 +67,7 @@ bool menuNode::async(const char *uri,navRoot& root,idx_t lvl) {
   //Serial<<"recurse on ["<<n<<"]-"<<operator[](n)<<" uri:"<<uri<<" lvl:"<<lvl<<endl;Serial.flush();
   return operator[](n).async(uri,root,++lvl);
 }
+#endif
 
 void textField::doNav(navNode& nav,navCmd cmd) {
   trace(Serial<<"textField::doNav"<<endl);
@@ -664,6 +666,7 @@ navCmd navRoot::exit() {
   return escCmd;
 }
 
+#ifdef MENU_ASYNC
 bool fieldBase::async(const char *uri,navRoot& root,idx_t lvl) {
   trace(Serial<<"fieldBase::async"<<endl);
   if ((!*uri)||(uri[0]=='/'&&!uri[1])) return true;
@@ -674,6 +677,7 @@ bool fieldBase::async(const char *uri,navRoot& root,idx_t lvl) {
   }
   return true;
 }
+#endif
 
 void fieldBase::doNav(navNode& nav,navCmd cmd) {
   trace(Serial<<"fieldBase::doNav "<<cmd<<endl);

src/menu.h

@@ -19,12 +19,7 @@ for correcting unsigned values validation
   #define RSITE_ARDUINO_MENU_SYSTEM
   #include <Arduino.h>
   #if defined(DEBUG)
-    // #ifdef _U8G2LIB_HH
-      //because U8G2 already uses Streaming
       #include <Streaming.h>
-    // #else
-      // #include <streamFlow.h>
-    // #endif
   #endif
   #include "menuBase.h"
   #include "shadows.h"
@@ -104,9 +99,11 @@ for correcting unsigned values validation
         inline result operator()(FUNC_PARAMS) const {return (*shadow)(FUNC_VALUES);}
         idx_t printRaw(menuOut& out,idx_t len) const;
         virtual prompt* seek(idx_t* uri,idx_t len) {return len?NULL:this;}
+        #ifdef MENU_ASYNC
         virtual bool async(const char *uri,navRoot& root,idx_t lvl) {
           return ((!*uri)||(uri[0]=='/'&&!uri[1]));
         }
+        #endif
 
         //some functions to use on htmlFmt
         // for enumerations:
@@ -167,7 +164,9 @@ for correcting unsigned values validation
         bool tunning=false;
         fieldBase(constMEM promptShadow& shadow):navTarget(shadow) {}
         virtual classes type() const {return fieldClass;}
-        bool async(const char *uri,navRoot& root,idx_t lvl) override;
+        #ifdef MENU_ASYNC
+          bool async(const char *uri,navRoot& root,idx_t lvl) override;
+        #endif
         inline constMEM char* units() {return ((fieldBaseShadow*)shadow)->_units();}
         void doNav(navNode& nav,navCmd cmd) override;
         virtual bool canTune()=0;
@@ -259,7 +258,9 @@ for correcting unsigned values validation
         inline idx_t sz() const {return ((menuNodeShadow*)shadow)->_sz();}
         inline prompt* constMEM* data() const {return ((menuNodeShadow*)shadow)->_data();}
         prompt* seek(idx_t* uri,idx_t len) override;
-        bool async(const char *uri,navRoot& root,idx_t lvl=0) override;
+        #ifdef MENU_ASYNC
+          bool async(const char *uri,navRoot& root,idx_t lvl=0) override;
+        #endif
     };
 
     //--------------------------------------------------------------------------
@@ -703,32 +704,33 @@ for correcting unsigned values validation
           return sleepTask?idleChanged:node().changed(out);
         }
         inline bool changed(idx_t n) const {return changed(out[n]);}
-        inline bool async(const char* at) {
-          navFocus=path[level].target;
-          return active().async(at, *this, 0);
-        }
-        menuOut& printPath(menuOut& o) const {
-          for(idx_t n=0;n<level;n++) {
-            o.print('/');
-            o.print(path[n].sel);
+        #ifdef MENU_ASYNC
+          inline bool async(const char* at) {
+            navFocus=path[level].target;
+            return active().async(at, *this, 0);
           }
-          return o;
-        }
+          menuOut& printPath(menuOut& o) const {
+            for(idx_t n=0;n<level;n++) {
+              o.print('/');
+              o.print(path[n].sel);
+            }
+            return o;
+          }
+          //async printMenu on arbitrary menuOut device
+          Used printMenu(menuOut& o) const {
+            _trace(Serial<<"navRoot::printMenu(menuOut& o)"<<endl);
+            if ((active().sysStyles()&_parentDraw)&&level)
+              return o.printMenu(path[level-1]);
+            else return o.printMenu(node());
+          }
+        #endif
         Used printMenu() const {
           trace(Serial<<"navRoot::printMenu"<<endl);
           if ((active().sysStyles()&_parentDraw)&&level)
             return out.printMenu(path[level-1]);
           else return out.printMenu(node());
         }
 
-        //async printMenu on arbitrary menuOut device
-        Used printMenu(menuOut& o) const {
-          _trace(Serial<<"navRoot::printMenu(menuOut& o)"<<endl);
-          if ((active().sysStyles()&_parentDraw)&&level)
-            return o.printMenu(path[level-1]);
-          else return o.printMenu(node());
-        }
-
         //menu IO - external iteration functions
         void doInput(menuIn& in);
         inline void doInput(const char*in) {