Merge branch 'web_ota' into 'master'
Add the possibility to upload OTA by http Closes #2 See merge request !8
This commit is contained in:
commit
7839671bf8
@ -1,5 +1,7 @@
|
||||
#ifndef CONFIG_DISABLE_WEB
|
||||
#include <ESP8266HTTPUpdateServer.h>
|
||||
|
||||
ESP8266HTTPUpdateServer httpUpdater;
|
||||
String gpioControlHTML = "";
|
||||
String pwmControlHTML = "";
|
||||
|
||||
@ -44,6 +46,7 @@ void WebHandleRoot() {
|
||||
#ifdef CONFIG_ENABLE_BMP180
|
||||
"BMP 180 (Temp+Pression) Status: " + (BMP180IsConnected() ? "Connected" : "Disconnected") + "<br/>"
|
||||
#endif
|
||||
"<a href=\"/upload\">Update firmware</a><br/>"
|
||||
"Wifi Strength: " + WiFi.RSSI() + "dBm<br/>"
|
||||
"Free space: " + ESP.getFreeSketchSpace() + "<br/>"
|
||||
"Free heap: " + ESP.getFreeHeap() + "<br/>"
|
||||
@ -293,6 +296,7 @@ void WebSetupServer(int ) {
|
||||
server.on("/wifiStatus", WebHandleWifiStatus);
|
||||
|
||||
server.onNotFound(WebHandleNotFound);
|
||||
httpUpdater.setup(&server, "/upload");
|
||||
server.begin();
|
||||
SKETCH_DEBUG_PRINTLN("HTTP server started");
|
||||
}
|
||||
|
@ -129,6 +129,10 @@ void WifiSetup(productConfig conf) {
|
||||
SKETCH_DEBUG_PRINTLN("Error setting up MDNS responder!");
|
||||
} else {
|
||||
SKETCH_DEBUG_PRINTLN("mDNS responder started");
|
||||
#ifndef CONFIG_DISABLE_WEB
|
||||
//Needed for OTA by HTTP
|
||||
MDNS.addService("http", "tcp", 80);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
myIP = WiFi.localIP();
|
||||
|
Loading…
Reference in New Issue
Block a user