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

change wifi_ssid ret to string, fix info

Browse Source
This commit is contained in:
Shawn A
2018-01-25 13:58:39 -06:00
parent e56d22cfb1
commit 2761656d78
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
+8 -16
View File
@@ -1061,7 +1061,7 @@ void WiFiManager::handleInfo() {
page += F("</dd>");
page += F("<dt>SSID</dt><dd>");
page += WiFi.SSID();
page += WiFi_SSID();
page += F("</dd>");
page += F("<dt>BSSID</dt><dd>");
@@ -1529,11 +1529,11 @@ bool WiFiManager::WiFi_Disconnect() {
// toggle STA without persistent
bool WiFiManager::WiFi_enableSTA(bool enable,bool persistent) {
WiFiMode_t currentMode = WiFi.getMode();
WiFiMode_t newMode;
bool isEnabled = (currentMode & WIFI_STA) != 0;
if(enable) newMode = (WiFiMode_t)(currentMode | WIFI_STA);
else newMode = (WiFiMode_t)(currentMode & (~WIFI_STA));
WiFiMode_t currentMode = WiFi.getMode();
bool isEnabled = (currentMode & WIFI_STA) != 0;
if(enable) newMode = (WiFiMode_t)(currentMode | WIFI_STA);
else newMode = (WiFiMode_t)(currentMode & (~WIFI_STA));
#ifdef ESP8266
if((isEnabled != enable) || persistent) {
@@ -1586,24 +1586,16 @@ uint8_t WiFiManager::WiFi_softap_num_stations(){
}
bool WiFiManager::WiFi_hasAutoConnect(){
#ifdef ESP8266
return WiFi.SSID() != "";
#elif defined(ESP32)
wifi_config_t conf;
esp_wifi_get_config(WIFI_IF_STA, &conf);
const char* ssid = reinterpret_cast<const char*>(conf.sta.ssid);
return ssid != "";
#endif
return WiFi_SSID() != "";
}
const char* WiFiManager::WiFi_SSID(){
String WiFiManager::WiFi_SSID(){
#ifdef ESP8266
return WiFi.SSID();
#elif defined(ESP32)
wifi_config_t conf;
esp_wifi_get_config(WIFI_IF_STA, &conf);
const char* ssid = reinterpret_cast<const char*>(conf.sta.ssid);
return ssid;
return String(reinterpret_cast<const char*>(conf.sta.ssid));
#endif
}