show ota_dsc and block flash button while OTA is running

This commit is contained in:
Christian Herzog
2019-09-30 20:21:20 +02:00
parent d92539d2be
commit 5e6fc4d20c
3 changed files with 20 additions and 2 deletions

View File

@@ -16,8 +16,9 @@ var recovery = false;
var enableAPTimer = true;
var enableStatusTimer = true;
var commandHeader = 'squeezelite -b 500:2000 -d all=info ';
var pname, ver, otapct;
var pname, ver, otapct, otadsc;
var blockAjax = false;
var blockFlashButton = false;
var apList = null;
var selectedSSID = "";
@@ -228,6 +229,8 @@ $(document).ready(function(){
});
$("#flash").on("click", function() {
if (blockFlashButton) return;
blockFlashButton = true;
var url = $("#fwurl").val();
$.ajax({
url: '/config.json',
@@ -508,6 +511,16 @@ function checkStatus(){
$('.progress-bar').css('width', otapct+'%').attr('aria-valuenow', otapct);
$('.progress-bar').html(otapct+'%');
}
if(data.hasOwnProperty('ota_dsc') && data['ota_dsc'] != ''){
otadsc = data['ota_dsc'];
$("span#flash-status").html(otadsc);
if (otadsc.match(/Error:/) || otapct > 95) {
blockFlashButton = false;
enableStatusTimer = true;
}
} else {
$("span#flash-status").html('');
}
blockAjax = false;
})
.fail(function() {

View File

@@ -276,7 +276,7 @@
<h2>Firmware URL:</h2>
<textarea id="fwurl" maxlength="120"></textarea>
<div class="buttons">
<input type="button" id="flash" class="btn btn-danger" value="Flash!" />
<input type="button" id="flash" class="btn btn-danger" value="Flash!" /><span id="flash-status"></span>
</div>
<div id="otadiv">
<div class="progress" id="progress">

View File

@@ -302,6 +302,11 @@ input, textarea {
background-color: #037AF0;
}
span#flash-status {
padding-left: 15px;
font-size: 120%;
}
.footer {
position: fixed;
left: 0;