diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 450e162..320af11 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -245,7 +245,7 @@ boolean WiFiManager::startConfigPortal(char const *apName, char const *apPasswo } boolean WiFiManager::process(){ - if(configPortalActive){ + if(configPortalActive && !_configPortalIsBlocking){ uint8_t state = handleConfigPortal(); return state == WL_CONNECTED; } @@ -559,6 +559,7 @@ void WiFiManager::handleWifi(boolean scan) { rssiQ += quality; item.replace("{v}", WiFi.SSID(indices[i])); item.replace("{r}", rssiQ); + item.replace("{q}", (String)round(map(quality,0,100,1,4))); if (WiFi.encryptionType(indices[i]) != ENC_TYPE_NONE) { item.replace("{i}", "l"); } else { diff --git a/WiFiManager.h b/WiFiManager.h index e69c6eb..72956b0 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -23,11 +23,19 @@ extern "C" { } const char HTTP_HEAD[] PROGMEM = "{v}"; -const char HTTP_STYLE[] PROGMEM = ""; +// const char HTTP_STYLE[] PROGMEM = ""; +const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_SCRIPT[] PROGMEM = ""; -const char HTTP_HEAD_END[] PROGMEM = "
"; +const char HTTP_HEAD_END[] PROGMEM = "
"; const char HTTP_PORTAL_OPTIONS[] PROGMEM = "



"; -const char HTTP_ITEM[] PROGMEM = "
{v} {r}%
"; +const char HTTP_ITEM[] PROGMEM = "
{v}
"; +//const char HTTP_ITEM_PADLOCK[] PROGMEM = ""; const char HTTP_FORM_START[] PROGMEM = "


"; const char HTTP_FORM_LABEL[] PROGMEM = ""; const char HTTP_FORM_PARAM[] PROGMEM = "
"; diff --git a/extras/png_signal_strength_master.png b/extras/png_signal_strength_master.png new file mode 100644 index 0000000..f03c947 Binary files /dev/null and b/extras/png_signal_strength_master.png differ diff --git a/extras/test.html b/extras/test.html new file mode 100644 index 0000000..58c913c --- /dev/null +++ b/extras/test.html @@ -0,0 +1,176 @@ + + + + + + Config ESP + + + + + + + + +
+ + +