iot/esp8266-laser
1
0
Fork 0
mirror of https://github.com/0x1d/esp8266-laser.git synced 2025-12-15 18:38:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

added wificonfig

Browse Source 
/ssid/ssidname,
 /pwd/password,
 /wiap/0/ -> client /1/ -> SoftAP,
 /saveconf -> write config to file

* write to file worked ssid and pw gets saved but fails to connect may timeout 10s to short?
This commit is contained in:
FrYakaTKoP
2017-10-08 03:59:08 +02:00
parent 9920d6360a
commit a7de25a117
2 changed files with 154 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
data/config.ini Normal file
View File

167
esp8266-laser.ino
View File

@@ -34,17 +34,23 @@
SoftwareSerial laserSerial(14, 12, false, 256); SoftwareSerial laserSerial(14, 12, false, 256);
const char *ssid = "ESP-test"; char ssid[50] = "tojoin";
const char *password = ""; char password[50] = "";
int wifiMode = 0; // 0: client, 1: AP (default)
int wifiTimeout = 10000; //ms
/* Soft AP network parameters */
char *ssidAP = "ESP-test";
IPAddress apIP(192, 168, 4, 1); // note: update metaRefreshStr string if ip change!
IPAddress netMsk(255, 255, 255, 0);
/* hostname for mDNS. Should work at least on windows. Try http://esp8266.local */ /* hostname for mDNS. Should work at least on windows. Try http://esp8266.local */
const char *myHostname = "esp8266"; const char *myHostname = "esplaser";
const char *metaRefreshStr = "<head><meta http-equiv=\"refresh\" content=\"3; url=/index.html\" /></head><body><p>redirecting...</p></body>"; const char *metaRefreshStr = "<head><meta http-equiv=\"refresh\" content=\"3; url=/index.html\" /></head><body><p>redirecting...</p></body>";
/* Soft AP network parameters */
IPAddress apIP(192, 168, 4, 1); // note: update metaRefreshStr string if ip change! unsigned long previousMillis = 0;
IPAddress netMsk(255, 255, 255, 0);
// Web server // Web server
ESP8266WebServer server(80); ESP8266WebServer server(80);
@@ -62,10 +68,36 @@ String formatBytes(size_t bytes) {
} }
} }
boolean writeWifiConfigFile() {
}
void readWifiConfigFile() {
File f = SPIFFS.open("/config.ini", "r");
if (!f) {
Serial.println("config file open failed");
}
Serial.println("Reading wifi config");
String s = f.readStringUntil('\n');
if (s.substring(0, 4) == "mode") {
s.substring(5, 6).toInt();
}
s = f.readStringUntil('\n');
if (s.substring(0, 4) == "ssid") {
s.substring(5).toCharArray(ssid, 50);
}
s = f.readStringUntil('\n');
if (s.substring(0, 3) == "pwd") {
s.substring(5).toCharArray(password, 50);
}
f.close();
}
String getContentType(String filename) { String getContentType(String filename) {
if (server.hasArg("download")) return "application/octet-stream"; if (server.hasArg("download")) return "application/octet-stream";
else if (filename.endsWith(".htm")) return "text/html"; else if (filename.endsWith(".htm")) return "text/html";
else if (filename.endsWith(".html")) return "text/html"; else if (filename.endsWith(".html")) return "text/html";
else if (filename.endsWith(".ini")) return "text/plain";
else if (filename.endsWith(".css")) return "text/css"; else if (filename.endsWith(".css")) return "text/css";
else if (filename.endsWith(".js")) return "application/javascript"; else if (filename.endsWith(".js")) return "application/javascript";
else if (filename.endsWith(".png")) return "image/png"; else if (filename.endsWith(".png")) return "image/png";
@@ -163,6 +195,95 @@ void handleMotor(String uri)
json = String(); json = String();
} }
void handleSsid(String uri)
{
uri.substring(6).toCharArray(ssid, 50);
String json = "{ \"handledSsid\":";
json += "{\"ssid\":\"" + (String)ssid + "\"}}";
server.send(200, "text/json", json);
json = String();
}
void handlePwd(String uri)
{
uri.substring(5).toCharArray(password, 50);
String json = "{ \"handledPwd\":";
json += "{\"password\":\"" + (String)password + "\"}}";
server.send(200, "text/json", json);
json = String();
}
void handleWiAp(String uri)
{
wifiMode = uri.substring(6, 7).toInt();
String json = "{ \"handledWiAp\":";
json += "{\"softAp\":\"" + (String)wifiMode + "\"}}";
server.send(200, "text/json", json);
json = String();
}
void handleSaveConf() {
boolean success = false;
File f = SPIFFS.open("/config.ini", "w");
if (!f) {
Serial.println("config file open failed");
success = false;
}
else
{
Serial.println("Writing wifi config");
f.print("mode:");
f.println(wifiMode);
f.print("ssid:");
f.println(ssid);
f.print("pwd:");
f.println(password);
f.close();
success = true;
}
if(success == true)
{
server.send(200, "text/plain", "saved config to file, reset to apply");
}
else
{
server.send(500, "text/plain", "error saving file");
}
}
boolean setupWifi() {
// Serial.print("setupWifi");
// Serial.println(wifiMode);
if (wifiMode == 0)
{
Serial.printf("Try connecting to %s\n", ssid);
WiFi.begin(ssid, password);
previousMillis = millis();
while (WiFi.status() != WL_CONNECTED) {
delay(500);
if (millis() - previousMillis >= wifiTimeout) {
Serial.println("connection timedout");
return false;
}
}
Serial.println("");
Serial.println("WiFi connected");
Serial.println("IP address: ");
Serial.println(WiFi.localIP());
return true;
}
else if (wifiMode == 1)
{
Serial.printf("Starting SoftAP %s\n", ssidAP);
WiFi.mode(WIFI_AP);
WiFi.softAP(ssidAP);
Serial.println("");
Serial.print("SoftAP started! IP address: ");
Serial.println ( WiFi.softAPIP() );
return true;
}
}
void setup(void) { void setup(void) {
laserSerial.begin(9600); laserSerial.begin(9600);
Serial.begin(115200); Serial.begin(115200);
@@ -179,14 +300,13 @@ void setup(void) {
} }
//WIFI INIT //WIFI INIT
Serial.printf("Connecting to %s\n", ssid); readWifiConfigFile();
WiFi.mode(WIFI_AP); boolean wifiConnected = setupWifi();
WiFi.softAP(ssid, password); if (!wifiConnected)
{
wifiMode = 1; // fallback to AP mode
Serial.println(""); setupWifi();
Serial.print("Connected! IP address: "); }
Serial.println ( WiFi.softAPIP() );
// Setup MDNS responder // Setup MDNS responder
if (!MDNS.begin(myHostname)) { if (!MDNS.begin(myHostname)) {
@@ -201,6 +321,9 @@ void setup(void) {
//SERVER INIT //SERVER INIT
//list directory //list directory
server.on("/listFiles", HTTP_GET, handleFileList); server.on("/listFiles", HTTP_GET, handleFileList);
//server.on("/wwc", HTTP_GET, writeWifiConfigFile);
//server.on("/rwc", HTTP_GET, readWifiConfigFile);
server.on("/saveconf", HTTP_GET, handleSaveConf);
server.on("/heap", HTTP_GET, []() { server.on("/heap", HTTP_GET, []() {
String json = "{"; String json = "{";
json += "\"heap\":" + String(ESP.getFreeHeap()); json += "\"heap\":" + String(ESP.getFreeHeap());
@@ -227,6 +350,22 @@ void handleNotFound() {
handleLaser(uri); handleLaser(uri);
return; return;
} }
if (uri.substring(0, 6) == "/ssid/")
{
handleSsid(uri);
return;
}
if (uri.substring(0, 5) == "/pwd/")
{
handlePwd(uri);
return;
}
if (uri.substring(0, 6) == "/wiap/")
{
handleWiAp(uri);
return;
}
if (!handleFileRead(server.uri())) if (!handleFileRead(server.uri()))
{ {
server.send(302, "text/html", metaRefreshStr); server.send(302, "text/html", metaRefreshStr);