From d090dd3dd7a0f77d91043221dd64eed206aee741 Mon Sep 17 00:00:00 2001
From: Shawn A <spam@rumental.com>
Date: Tue, 20 Mar 2018 13:14:50 -0500
Subject: [PATCH] move menutokens

---
 WiFiManager.cpp |  4 ++--
 WiFiManager.h   | 13 -------------
 strings_en.h    | 13 +++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 7dc92c0..41207cd 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -1918,7 +1918,7 @@ void WiFiManager::setShowInfoErase(boolean enabled){
 void WiFiManager::setMenu(const char * menu[], uint8_t size){
   _menuIds.clear();
   for(size_t i = 0; i < size; i++){
-    for(size_t j = 0; j < _menuids_cnt; j++){
+    for(size_t j = 0; j < _nummenutokens; j++){
       if(menu[i] == _menutokens[j]){
         if((String)menu[i] == "param") _paramsInWifi = false; // param auto flag
         _menuIds.push_back(j);
@@ -1931,7 +1931,7 @@ void WiFiManager::setMenu(const char * menu[], uint8_t size){
 void WiFiManager::setMenu(std::vector<const char *>& menu){
   _menuIds.clear();
   for(auto menuitem : menu ){
-    for(size_t j = 0; j<_menuids_cnt; j++){
+    for(size_t j = 0; j < _nummenutokens; j++){
       if(menuitem == _menutokens[j]){
         if((String)menuitem == "param") _paramsInWifi = false; // param auto flag
         _menuIds.push_back(j);
diff --git a/WiFiManager.h b/WiFiManager.h
index c0cacec..0c95ca1 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -235,19 +235,6 @@ class WiFiManager
     #endif
         std::unique_ptr<WM_WebServer> server;
 
-    uint8_t _menuids_cnt = 9;
-    const char * const _menutokens[9] = {
-        "wifi",
-        "wifinoscan",
-        "info",
-        "param",
-        "close",
-        "restart",
-        "exit",
-        "erase",
-        "sep"
-    };
-
     std::vector<uint8_t> _menuIds;
     std::vector<const char *> _menuIdsDefault = {"wifi","info","exit"};
 
diff --git a/strings_en.h b/strings_en.h
index 66dec3d..a5e5347 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -210,6 +210,19 @@ const char D_HR[]                 PROGMEM = "--------------------";
 // -----------------------------------------------------------------------------------------------
 // DO NOT EDIT BELOW THIS LINE
 
+const uint8_t _nummenutokens = 9;
+const char * const _menutokens[9] PROGMEM = {
+    "wifi",
+    "wifinoscan",
+    "info",
+    "param",
+    "close",
+    "restart",
+    "exit",
+    "erase",
+    "sep"
+};
+
 const char R_root[]               PROGMEM = "/";
 const char R_wifi[]               PROGMEM = "/wifi";
 const char R_wifinoscan[]         PROGMEM = "/0wifi";