diff --git a/assets/scripts.js b/assets/scripts.js index 13d6961..9d97fc0 100644 --- a/assets/scripts.js +++ b/assets/scripts.js @@ -67,7 +67,7 @@ async function listenToPort() { if (x.indexOf("SN=") > 0 && x.indexOf("HW=") > 0 && x.indexOf("STATE=") > 0) { progressBar("60", "Reading device completed", "#04AA6D"); - setTimeout(getDeviceData, 2000); + setTimeout(getDeviceData, 4000); return; } } @@ -160,6 +160,7 @@ function firmwareUpdate(data){ .then(response => response.json()) .then(firmware=> { firmwarelocation = './firmware/'+firmware['software']; + upgraded_version = firmware['version']; return firmwarelocation; }) diff --git a/assets/upload.js b/assets/upload.js index aed90fd..0845eb1 100644 --- a/assets/upload.js +++ b/assets/upload.js @@ -25,12 +25,13 @@ async function createFirmwareUpdate(){ var f = d.slice(d.length - 2) hw = 'R'+f; } - - hex_fw = firmwarelocation.split("/firmware/").pop(); - + + hex_fw = firmwarelocation.split("/firmware/").pop(); + console.log(upgraded_version); + var testdetails2 = { "HW" : hw, - "HEX_FW" : hex_fw + "HEX_FW" : upgraded_version } var testdetails = JSON.stringify(testdetails2);