ElixirForge/WiFiManager
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/WiFiManager.git synced 2026-10-14 23:21:31 +10:00
Code Releases Activity

adds some style, clean up css, adds new tokens

Browse Source 
#415
This commit is contained in:
Shawn A
2017-09-08 16:08:35 -05:00
parent a93b601cd7
commit 81b37dfffc
4 changed files with 201 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
+25 -5
View File
@@ -560,15 +560,18 @@ void WiFiManager::handleWifi(boolean scan) {
DEBUG_WM(WiFi.SSID(indices[i]));
DEBUG_WM(WiFi.RSSI(indices[i]));
int quality = getRSSIasQuality(WiFi.RSSI(indices[i]));
uint8_t enc_type = WiFi.encryptionType(indices[i]);
if (_minimumQuality == -1 || _minimumQuality < quality) {
String item = FPSTR(HTTP_ITEM);
String rssiQ;
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("{v}", WiFi.SSID(indices[i])); // ssid no encoding
item.replace("{R}", (String)WiFi.RSSI(indices[i])); // rssi
item.replace("{e}", encryptionTypeStr(enc_type));
item.replace("{r}", rssiQ); // qualitypercent
item.replace("{q}", (String)round(map(quality,0,100,1,4))); //quality icon 1-4
if (enc_type != ENC_TYPE_NONE) {
item.replace("{i}", "l");
} else {
item.replace("{i}", "");
@@ -616,7 +619,7 @@ void WiFiManager::handleWifi(boolean scan) {
snprintf(parLength, 5, "%d", _params[i]->getValueLength());
pitem.replace("{l}", parLength);
pitem.replace("{v}", _params[i]->getValue());
pitem.replace("{c}", _params[i]->getCustomHTML());
pitem.replace("{c}", _params[i]->getCustomHTML()); // additional attributes not html
} else {
pitem = _params[i]->getCustomHTML();
}
@@ -929,6 +932,23 @@ boolean WiFiManager::validApPassword(){
return true;
}
String WiFiManager::encryptionTypeStr(uint8_t authmode) {
switch(authmode) {
case ENC_TYPE_NONE:
return "None";
case ENC_TYPE_WEP:
return "WEP";
case ENC_TYPE_TKIP:
return "WPA_PSK";
case ENC_TYPE_CCMP:
return "WPA2_PSK";
case ENC_TYPE_AUTO:
return "WPA_WPA2_PSK";
default:
return "Unknown";
}
}
// set mode without persistent
bool WiFiManager::wifimode(WiFiMode_t m) {
if(wifi_get_opmode() == (uint8) m) {