|
|
@@ -10,41 +10,151 @@
|
|
|
</head>
|
|
|
|
|
|
<body>
|
|
|
+<h3>It is strongly recommended to update firmware and content of /html directory on SD-card at the same time!</h3>
|
|
|
+<h2>1. Firmware Update</h2>
|
|
|
<table class="fixed" border="0">
|
|
|
- <td>
|
|
|
- <table border="0">
|
|
|
- <tr>
|
|
|
- <td>
|
|
|
- <label for="newfile">Select the firmware file</label>
|
|
|
- </td>
|
|
|
- <td colspan="2">
|
|
|
- <input id="newfile" type="file" onchange="setpath()" style="width:100%;">
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td>
|
|
|
- <label for="filepath">Set path on server</label>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <input id="filepath" type="text" style="width:100%;" readonly>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <button id="upload" type="button" onclick="upload()">Upload</button>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- </table>
|
|
|
- </td></tr>
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <table border="0">
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <label for="newfile">Select the firmware file</label>
|
|
|
+ </td>
|
|
|
+ <td colspan="2">
|
|
|
+ <input id="newfile" type="file" onchange="setpath()" style="width:100%;">
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <label for="filepath">Set path on server</label>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <input id="filepath" type="text" style="width:100%;" readonly>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <button id="upload" type="button" onclick="upload()">Upload</button>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
<tr>
|
|
|
<td>
|
|
|
- <button id="upload" type="button" onclick="doUpdate()">Flash the update</button> (Takes about 60s)
|
|
|
+ <button id="doUpdate" type="button" onclick="doUpdate()">Flash the firmware</button> (Takes about 60s)
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
|
|
|
-<script>
|
|
|
+<h2>2. Update /html directory</h2>
|
|
|
+<table class="fixed" border="0">
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <table border="0">
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <label for="newfilehtml">Select the zipped /html content</label>
|
|
|
+ </td>
|
|
|
+ <td colspan="2">
|
|
|
+ <input id="newfilehtml" type="file" onchange="setpathhtml()" style="width:100%;">
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <label for="filepathhtml">Set path on server</label>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <input id="filepathhtml" type="text" style="width:100%;" readonly>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <button id="uploadhtml" type="button" onclick="uploadhtml()">Upload</button>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <button id="doUpdatehtml" type="button" onclick="doUpdatehtml()">Update "/html" directory</button>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+</table>
|
|
|
+<h2>3. Reboot</h2>
|
|
|
+<table class="fixed" border="0">
|
|
|
+ <tr>
|
|
|
+ <td>
|
|
|
+ <button id="reboot" type="button" onclick="doReboot()">Reboot to activate updates</button>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+</table>
|
|
|
+
|
|
|
+<script type="text/javascript" src="./gethost.js"></script>
|
|
|
+
|
|
|
+
|
|
|
+<script language="JavaScript">
|
|
|
+
|
|
|
+function init(){
|
|
|
+ document.getElementById("reboot").disabled = true;
|
|
|
+ document.getElementById("upload").disabled = true;
|
|
|
+ document.getElementById("uploadhtml").disabled = true;
|
|
|
+ document.getElementById("doUpdate").disabled = true;
|
|
|
+ document.getElementById("doUpdatehtml").disabled = true;
|
|
|
+}
|
|
|
+
|
|
|
function doUpdate() {
|
|
|
if (confirm("Are you sure to update the firmware?")) {
|
|
|
var stringota = "/ota?file=firmware.bin";
|
|
|
+
|
|
|
+ var xhttp = new XMLHttpRequest();
|
|
|
+
|
|
|
+ xhttp.onreadystatechange = function() {
|
|
|
+ if (xhttp.readyState == 4) {
|
|
|
+ if (xhttp.status == 200) {
|
|
|
+ document.getElementById("reboot").disabled = false;
|
|
|
+ alert("Flash successfull - Reboot necessary to make changes active.");
|
|
|
+ /* keine Reaktion, damit sich das Dokument nicht ändert */
|
|
|
+ } else if (xhttp.status == 0) {
|
|
|
+ alert("Server closed the connection abruptly!");
|
|
|
+ UpdatePage();
|
|
|
+ } else {
|
|
|
+ alert(xhttp.status + " Error!\n" + xhttp.responseText);
|
|
|
+ UpdatePage();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+ xhttp.open("GET", stringota, true);
|
|
|
+ xhttp.send();
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+function doUpdatehtml() {
|
|
|
+ if (confirm("Are you sure to update the /html content?")) {
|
|
|
+ var stringota = "/ota?task=unziphtml";
|
|
|
+
|
|
|
+ var xhttp = new XMLHttpRequest();
|
|
|
+
|
|
|
+ xhttp.onreadystatechange = function() {
|
|
|
+ if (xhttp.readyState == 4) {
|
|
|
+ if (xhttp.status == 200) {
|
|
|
+ document.getElementById("reboot").disabled = false;
|
|
|
+ alert("Update /html successful!");
|
|
|
+ /* keine Reaktion, damit sich das Dokument nicht ändert */
|
|
|
+ } else if (xhttp.status == 0) {
|
|
|
+ alert("Server closed the connection abruptly!");
|
|
|
+ UpdatePage();
|
|
|
+ } else {
|
|
|
+ alert(xhttp.status + " Error!\n" + xhttp.responseText);
|
|
|
+ UpdatePage();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+ xhttp.open("GET", stringota, true);
|
|
|
+ xhttp.send();
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+function doReboot() {
|
|
|
+ if (confirm("Are you sure you want to reboot the ESP32?")) {
|
|
|
+ var stringota = "/reboot";
|
|
|
window.location = stringota;
|
|
|
window.location.href = stringota;
|
|
|
window.location.assign(stringota);
|
|
|
@@ -55,8 +165,16 @@ function doUpdate() {
|
|
|
function setpath() {
|
|
|
var fileserverpraefix = "/firmware/firmware.bin";
|
|
|
document.getElementById("filepath").value = fileserverpraefix;
|
|
|
+ document.getElementById("upload").disabled = false;
|
|
|
+}
|
|
|
+
|
|
|
+function setpathhtml() {
|
|
|
+ var fileserverpraefix = "/firmware/html.zip";
|
|
|
+ document.getElementById("filepathhtml").value = fileserverpraefix;
|
|
|
+ document.getElementById("uploadhtml").disabled = false;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
function upload() {
|
|
|
var xhttp = new XMLHttpRequest();
|
|
|
|
|
|
@@ -67,10 +185,10 @@ function upload() {
|
|
|
/* keine Reaktion, damit sich das Dokument nicht ändert */
|
|
|
} else if (xhttp.status == 0) {
|
|
|
alert("Server closed the connection abruptly!");
|
|
|
- location.reload()
|
|
|
+ UpdatePage();
|
|
|
} else {
|
|
|
alert(xhttp.status + " Error!\n" + xhttp.responseText);
|
|
|
- location.reload()
|
|
|
+ UpdatePage();
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -106,13 +224,15 @@ function upload() {
|
|
|
if (xhttp.readyState == 4) {
|
|
|
if (xhttp.status == 200) {
|
|
|
alert("Upload successfull!")
|
|
|
- document.reload();
|
|
|
+// document.reload();
|
|
|
+ document.getElementById("reboot").disabled = false;
|
|
|
+ document.getElementById("doUpdate").disabled = false;
|
|
|
} else if (xhttp.status == 0) {
|
|
|
alert("Server closed the connection abruptly!");
|
|
|
- location.reload()
|
|
|
+ UpdatePage();
|
|
|
} else {
|
|
|
alert(xhttp.status + " Error!\n" + xhttp.responseText);
|
|
|
- location.reload()
|
|
|
+ UpdatePage();
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -123,6 +243,79 @@ function upload() {
|
|
|
xhttp.send(file);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+function uploadhtml() {
|
|
|
+ var xhttp = new XMLHttpRequest();
|
|
|
+
|
|
|
+ /* first delete the old firmware */
|
|
|
+ xhttp.onreadystatechange = function() {
|
|
|
+ if (xhttp.readyState == 4) {
|
|
|
+ if (xhttp.status == 200) {
|
|
|
+ /* keine Reaktion, damit sich das Dokument nicht ändert */
|
|
|
+ } else if (xhttp.status == 0) {
|
|
|
+ alert("Server closed the connection abruptly!");
|
|
|
+ UpdatePage();
|
|
|
+ } else {
|
|
|
+ alert(xhttp.status + " Error!\n" + xhttp.responseText);
|
|
|
+ UpdatePage();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+ xhttp.open("GET", "/ota?delete=html.zip", false);
|
|
|
+ xhttp.send();
|
|
|
+ /* ----------------------------- */
|
|
|
+
|
|
|
+ var filePath = document.getElementById("filepathhtml").value;
|
|
|
+ var upload_path = "/upload/" + filePath;
|
|
|
+ var fileInput = document.getElementById("newfilehtml").files;
|
|
|
+
|
|
|
+ /* Max size of an individual file. Make sure this
|
|
|
+ * value is same as that set in file_server.c */
|
|
|
+ var MAX_FILE_SIZE = 2000*1024;
|
|
|
+ var MAX_FILE_SIZE_STR = "2000KB";
|
|
|
+
|
|
|
+ if (fileInput.length == 0) {
|
|
|
+ alert("No file selected!");
|
|
|
+ } else if (filePath.length == 0) {
|
|
|
+ alert("File path on server is not set!");
|
|
|
+ } else if (filePath.indexOf(' ') >= 0) {
|
|
|
+ alert("File path on server cannot have spaces!");
|
|
|
+ } else if (filePath[filePath.length-1] == '/') {
|
|
|
+ alert("File name not specified after path!");
|
|
|
+ } else if (fileInput[0].size > 2000*1024) {
|
|
|
+ alert("File size must be less than 2000KB!");
|
|
|
+ } else {
|
|
|
+ document.getElementById("newfilehtml").disabled = true;
|
|
|
+ document.getElementById("filepathhtml").disabled = true;
|
|
|
+ document.getElementById("uploadhtml").disabled = true;
|
|
|
+
|
|
|
+ xhttp.onreadystatechange = function() {
|
|
|
+ if (xhttp.readyState == 4) {
|
|
|
+ if (xhttp.status == 200) {
|
|
|
+ alert("Upload successfull!")
|
|
|
+// document.reload();
|
|
|
+ document.getElementById("reboot").disabled = false;
|
|
|
+ document.getElementById("doUpdatehtml").disabled = false;
|
|
|
+ } else if (xhttp.status == 0) {
|
|
|
+ alert("Server closed the connection abruptly!");
|
|
|
+ UpdatePage();
|
|
|
+ } else {
|
|
|
+ alert(xhttp.status + " Error!\n" + xhttp.responseText);
|
|
|
+ UpdatePage();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+
|
|
|
+ var file = fileInput[0];
|
|
|
+ xhttp.open("POST", upload_path, true);
|
|
|
+ xhttp.send(file);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+init();
|
|
|
+
|
|
|
</script>
|
|
|
|
|
|
|
jomjol