Merge pull request #57 from Qrome/2.2

Qrome - added ability to update firmware from web interface
Qrome · Nov 26, 2018 · 1720d10 · 1720d10
2 parents 043b2e1 + 7928548
commit 1720d10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/printermonitor/Settings.h b/printermonitor/Settings.h
@@ -40,6 +40,7 @@ SOFTWARE.
 #include <WiFiManager.h>
 #include <ESP8266mDNS.h>
 #include <ArduinoOTA.h>
+#include <ESP8266HTTPUpdateServer.h>
 #include "TimeClient.h"
 #include "OctoPrintClient.h"
 #include "OpenWeatherMapClient.h"

diff --git a/printermonitor/printermonitor.ino b/printermonitor/printermonitor.ino
@@ -95,12 +95,14 @@ void configModeCallback (WiFiManager *myWiFiManager);
 int8_t getWifiQuality();
 
 ESP8266WebServer server(WEBSERVER_PORT);
+ESP8266HTTPUpdateServer serverUpdater;
 
 String WEB_ACTIONS =  "<a class='w3-bar-item w3-button' href='/'><i class='fa fa-home'></i> Home</a>"
                       "<a class='w3-bar-item w3-button' href='/configure'><i class='fa fa-cog'></i> Configure</a>"
                       "<a class='w3-bar-item w3-button' href='/configureweather'><i class='fa fa-cloud'></i> Weather</a>"
                       "<a class='w3-bar-item w3-button' href='/systemreset' onclick='return confirm(\"Do you want to reset to default settings?\")'><i class='fa fa-undo'></i> Reset Settings</a>"
                       "<a class='w3-bar-item w3-button' href='/forgetwifi' onclick='return confirm(\"Do you want to forget to WiFi connection?\")'><i class='fa fa-wifi'></i> Forget WiFi</a>"
+                      "<a class='w3-bar-item w3-button' href='/update'><i class='fa fa-wrench'></i> Firmware Update</a>"
                       "<a class='w3-bar-item w3-button' href='https://github.com/Qrome' target='_blank'><i class='fa fa-question-circle'></i> About</a>";
 
 String CHANGE_FORM =  "<form class='w3-container' action='/updateconfig' method='get'><h2>Station Config:</h2>"
@@ -263,6 +265,7 @@ void setup() {
     server.on("/configure", handleConfigure);
     server.on("/configureweather", handleWeatherConfigure);
     server.onNotFound(redirectHome);
+    serverUpdater.setup(&server, "/update", www_username, www_password);
     // Start the server
     server.begin();
     Serial.println("Server started");