Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-01-31 06:40:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

streamline flash logic

Browse Source
This commit is contained in:
Christian Herzog
2019-09-26 20:08:22 +02:00
parent 7bfc46af0f
commit 6888b53c6c
3 changed files with 27 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/wifi-manager/code.js
View File

@@ -212,7 +212,7 @@ $(document).ready(function(){
console.log('sent config JSON with headers:', autoexec1); console.log('sent config JSON with headers:', autoexec1);
}); });
$("#recovery").on("click", function() { $("#flash").on("click", function() {
var url = $("#fwurl").val(); var url = $("#fwurl").val();
$.ajax({ $.ajax({
url: '/config.json', url: '/config.json',
@@ -222,23 +222,6 @@ $(document).ready(function(){
headers: { "X-Custom-fwurl": url }, headers: { "X-Custom-fwurl": url },
data: { 'timestamp': Date.now() } data: { 'timestamp': Date.now() }
}); });
$.ajax({
url: '/recovery.json',
dataType: 'json',
method: 'POST',
cache: false,
data: { 'timestamp': Date.now()}
});
});
$("#reboot").on("click", function() {
$.ajax({
url: '/reboot.json',
dataType: 'json',
method: 'POST',
cache: false,
data: { 'timestamp': Date.now()}
});
}); });
$("#generate-command").on("click", function() { $("#generate-command").on("click", function() {
@@ -494,11 +477,9 @@ function getConfig() {
if (data.hasOwnProperty('recovery')) { if (data.hasOwnProperty('recovery')) {
if (data["recovery"] === 1) { if (data["recovery"] === 1) {
recovery = true; recovery = true;
//$("#recoverydiv").hide();
$("#otadiv").show(); $("#otadiv").show();
} else { } else {
recovery = false; recovery = false;
$("#recoverydiv").show();
$("#otadiv").hide(); $("#otadiv").hide();
} }
} }

14
components/wifi-manager/index.html
View File

@@ -199,7 +199,6 @@
</div> </div>
<div class="tab-pane fade" id="tab-system"> <div class="tab-pane fade" id="tab-system">
<div id="recoverydiv">
<h1>Check for firmware upgrade</h1> <h1>Check for firmware upgrade</h1>
<div class="buttons"> <div class="buttons">
<input type="button" id="fwcheck" class="btn btn-info" value="Check for updates" /> <input type="button" id="fwcheck" class="btn btn-info" value="Check for updates" />
@@ -219,20 +218,11 @@
</table> </table>
<h2>Firmware URL:</h2> <h2>Firmware URL:</h2>
<textarea id="fwurl" maxlength="120"></textarea> <textarea id="fwurl" maxlength="120"></textarea>
<h1>Reboot to recovery system to perform firmware upgrade</h1>
<div class="buttons"> <div class="buttons">
<input type="button" id="recovery" class="btn btn-warning" value="Recovery" /> <input type="button" id="flash" class="btn btn-danger" value="Flash!" />
</div>
</div> </div>
<div id="otadiv"> <div id="otadiv">
<header><h1>Firmware upgrade</h1></header> <div id="progress">Progress: <progress id="progr" value="0" max="100" ></progress></div>
<form name="multipart" action="otaform" method="post" enctype="multipart/form-data" onsubmit="do_upload(this); return false;">
<progress id="progr" value="0" max="100" >Upload Progress</progress>
</form>
<h1>Reboot system with new firmware</h1>
<div class="buttons">
<input type="button" id="reboot" class="btn btn-warning" value="Reboot" />
</div>
</div> </div>
</div> </div>

4
components/wifi-manager/style.css
View File

@@ -290,3 +290,7 @@ input, textarea {
font-family: monospace, monospace; font-family: monospace, monospace;
font-size: 70%; font-size: 70%;
} }
#progress {
margin-left: 13px;
}