#219 was missing navFocus reset

Author: neu-rah

examples/Serial/serialio/serialio/serialio.ino

@@ -153,13 +153,14 @@ result doAlert(eventMask e, prompt &item) {
   return proceed;
 }
 
-//when menu is suspended
 result idle(menuOut &o, idleEvent e) {
   // o.clear();
   switch(e) {
     case idleStart:o.println("suspending menu!");break;
     case idling:o.println("suspended...");break;
-    case idleEnd:o.println("resuming menu.");break;
+    case idleEnd:o.println("resuming menu.");
+      nav.reset();
+      break;
   }
   return proceed;
 }
@@ -171,8 +172,9 @@ void setup() {
   Serial.begin(115200);
   while(!Serial);
   Serial.println("menu 4.x test");Serial.flush();
-  //nav.idleTask=idle;//point a function to be used when menu is suspended
-  //nav.idleOn();//this menu will start on idle state, press select to enter menu
+  nav.timeOut=3;
+  nav.idleTask=idle;//point a function to be used when menu is suspended
+  // nav.idleOn();//this menu will start on idle state, press select to enter menu
   //nav.doInput("323");
   // nav.useAccel=false;
 }

library.properties

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

src/menuIo.cpp

@@ -192,6 +192,9 @@ void outputsList::clearChanged(navNode& nav) const {
 void outputsList::clear() {
   for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->clear();
 }
+// void outputsList::reset() {
+//   for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->reset();
+// }
 void outputsList::doNav(navCmd cmd,class navNode &nav) {
   for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->doNav(cmd,nav);
 }

src/menuIo.h

@@ -74,6 +74,7 @@
         idx_t maxX(idx_t i=0) const;
         idx_t maxY(idx_t i=0) const;
         idx_t& top(navNode& nav) const;
+        // inline void reset() {panelsList.reset();}
         inline idx_t printRaw(const __FlashStringHelper* at,idx_t len) {
           return printRaw((const char*)at,len);
         }
@@ -166,6 +167,7 @@
         void refresh();//force redraw of all outputs on next output call
         void clearChanged(navNode& nav) const;
         void clear();
+        // void reset();
         void doNav(navCmd cmd,class navNode &nav);
         result idle(idleFunc f,idleEvent e,bool idleChanged=false);
     };

src/nav.cpp

@@ -125,8 +125,7 @@ void navRoot::initPath(idx_t d) {
     path[n].root=this;
 }
 void navRoot::useMenu(menuNode &menu) {
-  navFocus=&menu;
-  path[0].target=&menu;
+  path[0].useMenu(menu);
   reset();
   refresh();
 }
@@ -161,7 +160,7 @@ void navRoot::doOutput() {
     bool c=idleChanged;
     idleChanged=false;//turn it off here so that sleepTask can force it on again
     out.idle(sleepTask,idling,c);
-    #ifdef MENU_IDLE_BKGND
+    #ifdef MENU_IDLE_BKGND//cascade menu sysrtem idle behind user idle task
       if (idleTask!=sleepTask) out.idle(idleTask,idling);
     #endif
   }

src/nav.h

@@ -99,7 +99,9 @@
         void useMenu(menuNode &menu);
         inline void reset() {
           level=0;
-          path[0].sel=0;
+          navFocus=path[level].target;
+          path[level].reset();
+          refresh();
         }
         inline void refresh() {out.refresh();}
         inline navNode& node() const {return path[level];}