call prepareReenter in SpecialMenus

inherit lcd Wrapper

include/menuControl.h

@@ -45,8 +45,19 @@ class MenuControl {
         /**
          * @brief can be called to update shown data
          */
-        virtual void update() {}
+        virtual void update() {
+            if (this->updateDelay == 0)
+                return;
 
+            if (millis() - this->lastUpdateMillis < this->updateDelay) {
+                return;
+            }
+
+            this->printMenu();
+            this->lastUpdateMillis = millis();
+        }
+        
+        virtual void prepareReenterMenu() {}
         virtual void printMenu() = 0;
 
         /**
@@ -57,7 +68,7 @@ class MenuControl {
          * 
          * @param menu 
          */
-        void setParentMenu(MenuControl* menu) { this->parentMenu = menu; }
+        void setParentMenu(MenuControl* menu);
         // MenuControl* getParentMenu() { return this->parentMenu; }
 
         /**
@@ -69,10 +80,24 @@ class MenuControl {
          */
         void setLcd(DisplayWrapper* lcd) { this->lcd = lcd; }
 
+        /**
+         * @brief Set the time between each new print to the display
+         * 
+         * If the delay is zero, no updates will be made.
+         * The delay is by default zero.
+         * 
+         * @param delay time in milliseconds
+         */
+        void setUpdateDelay(uint16_t delay = 0) { this->updateDelay = delay; }
+
     protected:
         void print(String lineOne, String lineTwo) const;
+        DisplayWrapper* getLcd() const { return this->lcd; }
 
         MenuControl* parentMenu = nullptr;
         DisplayWrapper* lcd = nullptr;
+
+        uint16_t updateDelay = 0;
+        uint32_t lastUpdateMillis = 0;
 };
 #endif // MENU_CONTROLL_H

include/menuInformationSites.h

@@ -61,30 +61,26 @@ class MenuInformationSites : public MenuControl {
          */
         void printMenu() override;
 
-        /**
-         * @brief can be called to update shown data
-         */
-        void update() override;
-
     protected:
         bool setCountPages(uint8_t pages);
         uint8_t getCountPages() const;
         uint8_t getCurrentPage() const;
 
         virtual void printPage() const = 0;
-        virtual void runCommand() const {}
+        virtual void runCommandNo() {}
+        virtual void runCommand() {}
         virtual void init() {}
 
         void printDefault() const;
 
         uint8_t lastPageNumber = 0;
         bool leaved = true;
+        bool noEqualLeft = false;
         
     private:
         uint8_t countPages;
         uint8_t currentPage;
 
-
         const uint16_t delay = 5000;
         uint32_t lastMillis = 0;
 };

include/menuIntInput.h

@@ -81,8 +81,6 @@ class MenuIntInput : public MenuControl {
          */
         void printMenu() override;
         
-        void update() override {};
-
     private:
         MenuIntInputWrapper* wrapper;
 

library.json

@@ -1,6 +1,6 @@
 {
     "name": "Menu",
-    "version": "1.0.1",
+    "version": "1.1.2",
     "description": "Build page based menus on uCs",
     "keywords": "menu, page, input",
     "repository":

src/menuControl.cpp

@@ -20,3 +20,10 @@ void MenuControl::print(String lineOne, String lineTwo) const {
         lcd->print(lineTwo.c_str());
     }
 }
+
+void MenuControl::setParentMenu(MenuControl* menu) {
+    this->parentMenu = menu;
+    DisplayWrapper* lcd = this->parentMenu->getLcd();
+    if (lcd)
+        this->lcd = lcd;
+}

src/menuInformationSites.cpp

@@ -39,13 +39,19 @@ void MenuInformationSites::right() {
 
 void MenuInformationSites::left() {
     if (this->parentMenu) {
+        this->parentMenu->prepareReenterMenu();
         this->parentMenu->printMenu();
         this->leaved = true;
     }
 }
 
 void MenuInformationSites::no() {
+    if (this->noEqualLeft) {
         this->left();
+        return;
+    }
+    this->runCommandNo();
+    this->printMenu();
 }
 
 void MenuInformationSites::yes() {
@@ -64,14 +70,6 @@ void MenuInformationSites::printMenu() {
     this->lastPageNumber = this->currentPage;
 }
 
-void MenuInformationSites::update() {
-    if (millis() - this->lastMillis < this->delay) {
-        return;
-    }
-    this->printMenu();
-    this->lastMillis = millis();
-}
-
 bool MenuInformationSites::setCountPages(uint8_t pages) {
     this->countPages = pages;
     this->currentPage = 0;
@@ -91,8 +89,8 @@ uint8_t MenuInformationSites::getCurrentPage() const {
 }
 
 void MenuInformationSites::printDefault() const {
-    String lineOne = String("Page: ") + (this->currentPage + 1);
-    String lineTwo = String("of ") + this->countPages;
+    String lineOne = String("Pagenumber: ") + (this->currentPage + 1);
+    String lineTwo = String("Pagecount : ") + this->countPages;
 
     this->print(lineOne, lineTwo);
 }

src/menuIntInput.cpp

@@ -181,14 +181,18 @@ void MenuIntInput::no() {
         this->values[i] = this->originalValues[i];
     this->currentPosition = 0;
 
-    if (this->parentMenu)
+    if (this->parentMenu) {
+        this->parentMenu->prepareReenterMenu();
         this->parentMenu->printMenu();
+    }
 }
 
 void MenuIntInput::yes() {
     this->wrapper->action(this->values, this->length);
-    if (this->parentMenu && printParentMenu)
+    if (this->parentMenu && printParentMenu){
+        this->parentMenu->prepareReenterMenu();
         this->parentMenu->printMenu();
+    }
 }
 
 void MenuIntInput::printMenu() {