From 62f5ce6e0c1ffd8cbf0f53a8a6f95b4ac73aaefc Mon Sep 17 00:00:00 2001
From: Shawn A <spam@rumental.com>
Date: Wed, 14 Feb 2018 16:42:10 -0600
Subject: [PATCH] more string cleanup

---
 WiFiManager.cpp | 15 ++-------------
 WiFiManager.h   |  2 +-
 strings_en.h    | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 0b23896..aa4dbf2 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -1337,19 +1337,8 @@ boolean WiFiManager::validApPassword(){
 }
 
 String WiFiManager::getWLStatusString(uint8_t status){
-  const char * const WIFI_STA_STATUS[]
-  {
-      "WL_IDLE_STATUS",
-      "WL_NO_SSID_AVAIL",
-      "WL_SCAN_COMPLETED",
-      "WL_CONNECTED",
-      "WL_CONNECT_FAILED",
-      "WL_CONNECTION_LOST",
-      "WL_DISCONNECTED"
-  };
-
   if(status >=0 && status <=6) return WIFI_STA_STATUS[status];
-  return F("UNKNOWN");
+  return FPSTR(S_NA);
 }
 
 String WiFiManager::encryptionTypeStr(uint8_t authmode) {
@@ -1365,7 +1354,7 @@ String WiFiManager::encryptionTypeStr(uint8_t authmode) {
         case ENC_TYPE_AUTO:
             return F("WPA_WPA2_PSK");
         default:
-            return F("Unknown");
+            return FPSTR(S_NA);
     }
 }
 
diff --git a/WiFiManager.h b/WiFiManager.h
index c71b942..a8f8dc6 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -269,7 +269,7 @@ class WiFiManager
       return  obj->fromString(s);
     }
     auto optionalIPFromString(...) -> bool {
-      DEBUG_WM("NO fromString METHOD ON IPAddress, you need ESP8266 core 2.1.0 or newer for Custom IP configuration to work.");
+      // DEBUG_WM("NO fromString METHOD ON IPAddress, you need ESP8266 core 2.1.0 or newer for Custom IP configuration to work.");
       return false;
     }
 };
diff --git a/strings_en.h b/strings_en.h
index a669c0d..01ae48e 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -133,6 +133,7 @@ const char S_enable[]             PROGMEM = "Enabled";
 const char S_disable[]            PROGMEM = "Disabled";
 const char S_GET[]                PROGMEM = "GET";
 const char S_POST[]               PROGMEM = "POST";
+const char S_NA[]                 PROGMEM = "Unknown";
 
 const char S_titlewifisaved[]     PROGMEM = "Credentials Saved"; // @token titlewifisaved
 const char S_titlewifi[]          PROGMEM = "Config ESP"; // @token titlewifi
@@ -187,4 +188,15 @@ const char T_R[]                  PROGMEM = "{R}"; // @token R
 // http
 const char HTTP_HEAD_CL[]         PROGMEM = "Content-Length";
 const char HTTP_HEAD_CT[]         PROGMEM = "text/html";
-const char HTTP_HEAD_CT2[]        PROGMEM = "text/plain";
\ No newline at end of file
+const char HTTP_HEAD_CT2[]        PROGMEM = "text/plain";
+
+const char * const WIFI_STA_STATUS[] PROGMEM
+{
+  "WL_IDLE_STATUS",
+  "WL_NO_SSID_AVAIL",
+  "WL_SCAN_COMPLETED",
+  "WL_CONNECTED",
+  "WL_CONNECT_FAILED",
+  "WL_CONNECTION_LOST",
+  "WL_DISCONNECTED"
+};