Wifi Scanner as menu

Author: assada

src/Sreens/WiFiScannerScreen.cpp

@@ -18,14 +18,10 @@ class WiFiScannerScreen {
     MenuAction action = [this](MenuItem&item) {
         this->tft->fillScreen(MENU_BACKGROUND_COLOR);
         this->mainMenu->reInitButtons(this->btnUp, this->btnDown); //reset main menu buttons
-        /*this->btnDown->setLongClickDetectedHandler([this](Button2&b) {
-            this->tft->fillScreen(MENU_BACKGROUND_COLOR);
-            this->mainMenu->buttonsInit(this->btnUp, this->btnDown);
-            this->mainMenu->redrawMenuItems();
-        });*/
 
         this->wifiScan();
 
+
         return false;
     };
 
@@ -39,17 +35,7 @@ class WiFiScannerScreen {
     Menu wifiMenu;
 
     void wifiScan() {
-        MenuAction backAction = [this](MenuItem&item) {
-            this->wifiMenu.reInitButtons(this->btnUp, this->btnDown);
-            this->mainMenu->buttonsInit(this->btnUp, this->btnDown); //enable main menu buttons
-            this->mainMenu->redrawMenuItems();
-
-            return true;
-        };
-
-        std::vector<MenuItem> menuItems = {
-            MenuItem("<< Back", {{"delayTime", "500"}}, backAction)
-        };
+        std::vector<MenuItem> menuItems = {};
 
         this->tft->setTextColor(TFT_GREEN, MENU_BACKGROUND_COLOR);
         this->tft->fillScreen(MENU_BACKGROUND_COLOR);
@@ -77,12 +63,20 @@ class WiFiScannerScreen {
                         "%s(%d)",
                         WiFi.SSID(i).c_str(),
                         WiFi.RSSI(i));
-                menuItems.push_back(MenuItem(buff, {}, [](MenuItem&item) { //connect to selected AP and return to main menu
+                menuItems.push_back(MenuItem(buff, {}, [](MenuItem&item) {
+                    //connect to selected AP and return to main menu
                     return false; //do nothing
                 }));
             }
             this->wifiMenu.setItems(menuItems);
             this->wifiMenu.buttonsInit(this->btnUp, this->btnDown); //start wifi menu buttons
+            this->btnDown->setLongClickDetectedHandler([this](Button2&b) {
+                this->wifiMenu.reInitButtons(this->btnUp, this->btnDown);
+
+                this->tft->fillScreen(MENU_BACKGROUND_COLOR);
+                this->mainMenu->buttonsInit(this->btnUp, this->btnDown);
+                this->mainMenu->redrawMenuItems();
+            });
             this->wifiMenu.redrawMenuItems();
         }
         WiFi.mode(WIFI_OFF);

src/main.cpp

@@ -73,7 +73,7 @@ std::vector<MenuItem> menuItems = {
     MenuItem("Info", {}, infoScreen.action),
     MenuItem("Stars", {}, starsScreen.action),
     MenuItem("WiFi Scanner", {}, wiFiScannerScreen.action),
-    MenuItem("Run", {{"flashTime", "500"}}, defaultAction),
+    MenuItem("Nothing", {{"flashTime", "500"}}, defaultAction),
     MenuItem("Backlight", {{"value", String(ledBacklight)}}, [](MenuItem&item) {
         ledBacklight += 50;
         if (ledBacklight > 255) {
@@ -85,7 +85,7 @@ std::vector<MenuItem> menuItems = {
 
         return false;
     }),
-    MenuItem("Menu 3", {}, defaultAction),
+    MenuItem("Nothing", {}, defaultAction),
     MenuItem("Maro", {{"value", "OFF"}, {"flashTime", "100"}}, [](MenuItem&item) {
         tft.fillScreen(TFT_BLACK);
         tft.setTextColor(TFT_WHITE, TFT_BLACK);

src/menu.h

@@ -127,9 +127,9 @@ struct Menu {
         btnDown->reset();
         btnUp->begin(BUTTON_1);
         btnDown->begin(BUTTON_2);
-        btnUp->setLongClickTime(700);
+        btnUp->setLongClickTime(1000);
         btnUp->setDebounceTime(50);
-        btnDown->setLongClickTime(700);
+        btnDown->setLongClickTime(1000);
         btnDown->setDebounceTime(50);
     }
 
@@ -141,29 +141,20 @@ struct Menu {
             this->blockedButton = true;
             Serial.println("Select Menu Item: " + this->title);
             bool flash = this->items[this->selectedMenuItem].onSelect(this->items[this->selectedMenuItem]);
-            unsigned int delay = 100;
-            int delayTime = 0;
+            unsigned int delay = 500;
 
             if (this->items[this->selectedMenuItem].parameters.find("flashTime") != this->items[this->selectedMenuItem].
                 parameters.end()) {
                 const String flashTime = this->items[this->selectedMenuItem].parameters["flashTime"];
                 delay = flashTime.toInt();
             }
 
-            if (this->items[this->selectedMenuItem].parameters.find("delayTime") != this->items[this->selectedMenuItem].
-                parameters.end()) {
-                delayTime = this->items[this->selectedMenuItem].parameters["delayTime"].toInt();
-            }
-
             if (flash != false) {
+                Serial.println("Delay: " + String(delay));
                 espDelay(delay);
 
                 this->redrawMenuItems();
             }
-
-            if (delayTime > 0) {
-                espDelay(delayTime);
-            }
         });
 
         btnUp->setReleasedHandler([this](Button2&b) {