ElixirForge/WiFiManager
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/WiFiManager.git synced 2026-10-04 02:48:13 +10:00
Code Releases Activity

Synced my changes with tzapu's

Browse Source
This commit is contained in:
John Little
2015-12-17 14:59:56 +00:00
parent c44d3643a8 e9dd81d163
commit c2f11e8bd9
2 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
-27
View File
@@ -99,8 +99,6 @@ boolean WiFiManager::autoConnect(char const *apName, char const *apPasswd) {
return true;
}
// delay(1000);
//not connected
//setup AP
WiFi.mode(WIFI_AP);
@@ -118,11 +116,6 @@ boolean WiFiManager::autoConnect(char const *apName, char const *apPasswd) {
//HTTP
server->handleClient();
/*if(connect) {
delay(5000);
ESP.reset();
delay(1000);
}*/
if(connect) {
delay(2000);
@@ -184,18 +177,6 @@ String WiFiManager::getPassword() {
return _pass;
}
/*
void WiFiManager::setSSID(String s) {
_ssid = s;
setEEPROMString(0, 32, _ssid);
}
void WiFiManager::setPassword(String p) {
DEBUG_PRINT("Save password:");
DEBUG_PRINT(p);
_pass = p;
setEEPROMString(32, 64, _pass);
}*/
/*
String WiFiManager::getEEPROMString(int start, int len) {
EEPROM.begin(512);
@@ -268,9 +249,6 @@ String WiFiManager::urldecode(const char *src)
void WiFiManager::resetSettings() {
//need to call it only after lib has been started with autoConnect or begin
//setEEPROMString(0, 32, "-");
//setEEPROMString(32, 64, "-");
DEBUG_PRINT("settings invalidated");
WiFi.disconnect();
delay(200);
@@ -367,12 +345,8 @@ void WiFiManager::handleWifi(bool scan) {
/** Handle the WLAN save form and redirect to WLAN config page again */
void WiFiManager::handleWifiSave() {
DEBUG_PRINT("WiFi save");
//server->arg("s").toCharArray(ssid, sizeof(ssid) - 1);
//server->arg("p").toCharArray(password, sizeof(password) - 1);
//SAVE/connect here
//setSSID(urldecode(server->arg("s").c_str()));
//setPassword(urldecode(server->arg("p").c_str()));
_ssid = urldecode(server->arg("s").c_str());
_pass = urldecode(server->arg("p").c_str());
@@ -395,7 +369,6 @@ void WiFiManager::handleWifiSave() {
DEBUG_PRINT("Sent wifi save page");
//saveCredentials();
connect = true; //signal ready to connect/reset
}
WiFiManager.h
+4 -12
View File
@@ -28,18 +28,12 @@ public:
boolean autoConnect();
boolean autoConnect(char const *apName);
boolean autoConnect(char const *apName, char const *apPasswd);
boolean hasConnected();
String beginConfigMode(void);
void startWebConfig();
String getSSID();
String getPassword();
void setSSID(String s);
void setPassword(String p);
void resetSettings();
//for conveniennce
//for convenience
String urldecode(const char*);
//sets timeout before webserver loop ends and exits even if there has been no setup.
@@ -51,9 +45,7 @@ public:
//sets a custom ip /gateway /subnet configuration
void setAPConfig(IPAddress ip, IPAddress gw, IPAddress sn);
void setAPCallback( void (*func)(void) );
int serverLoop();
private:
std::unique_ptr<DNSServer> dnsServer;
std::unique_ptr<ESP8266WebServer> server;