diff --git a/README.md b/README.md index 012991bd..7532973c 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,14 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571 ------ +**General remark:** beside the `firmware.bin`, typically also the content of `/html` needs to be updated! -##### 1.1.1 (2020-09-07) + +##### 1.1.2 (2020-09-07) * Improved update page for the web server (`/html` can be updated via a zip-file, which is provided in `/firmware/html.zip`) - **Attention: beside the `firmware.bin`, also the content of `/html` needs to be updated!** +* Improved Chrome support ##### 1.1.0 (2020-09-06) diff --git a/firmware/html.zip b/firmware/html.zip index 2c0e0fc7..247c091b 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/edit_alignment.html b/sd-card/html/edit_alignment.html index b3b302f7..7ea252b8 100644 --- a/sd-card/html/edit_alignment.html +++ b/sd-card/html/edit_alignment.html @@ -75,7 +75,7 @@ - + @@ -119,7 +119,6 @@ function SaveToConfig(){ refInfo["dx"] = document.getElementById("refdx").value; refInfo["dy"] = document.getElementById("refdy").value; UpdateConfig(refInfo, aktindex, enhanceCon, basepath); -// location.reload(); } function EnhanceContrast(){ @@ -159,6 +158,7 @@ function UpdateReference(){ document.getElementById("refy").value = refInfo["y"]; rect.startX = document.getElementById("refx").value; rect.startY = document.getElementById("refy").value; + document.getElementById("enhancecontrast").disabled = true; draw(); } @@ -177,58 +177,6 @@ function dataURLtoBlob(dataurl) { return new Blob([u8arr], {type:mime}); } - function SaveReference() - { - - if (confirm("Are you sure you want to update \"reference.jpg\"?")) { - 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!"); - location.reload() - } else { - alert(xhttp.status + " Error!\n" + xhttp.responseText); - location.reload() - } - } - }; - xhttp.open("POST", basepath + "/delete/config/reference.jpg", false); - xhttp.send(); - /* ----------------------------- */ - - - xhttp.onreadystatechange = function() { - if (xhttp.readyState == 4) { - if (xhttp.status == 200) { - alert("Update \"reference.jpg\" successfull!\n\nTo make it active you need to reboot.") - document.reload(); - } else if (xhttp.status == 0) { - alert("Server closed the connection abruptly!"); - location.reload() - } else { - alert(xhttp.status + " Error!\n" + xhttp.responseText); - location.reload() - } - } - }; - - upload_path = basepath + "/upload/config/reference.jpg"; - - var canvas = document.getElementById("canvas"); - - var JPEG_QUALITY=0.5; - var dataUrl = canvas.toDataURL('image/jpeg', JPEG_QUALITY); - var rtn = dataURLtoBlob(dataUrl); - - xhttp.open("POST", upload_path, true); - xhttp.send(rtn); - } - } function loadCanvas(dataURL) { var canvas = document.getElementById('canvas'); @@ -289,6 +237,7 @@ function dataURLtoBlob(dataurl) { document.getElementById("img_ref_org").src = url; var url = basepath + "/fileserver" + "/img_tmp/ref_zw_org.jpg?" + Date.now(); document.getElementById("img_ref").src = url; + document.getElementById("enhancecontrast").disabled = false; draw(); } diff --git a/sd-card/html/edit_analog.html b/sd-card/html/edit_analog.html index 2606cecd..ceec1704 100644 --- a/sd-card/html/edit_analog.html +++ b/sd-card/html/edit_analog.html @@ -152,8 +152,7 @@ function ChangeSelection(){ function SaveToConfig(){ SaveROIToConfig(ROIInfo, "[Analog]", basepath); - - location.reload(); + UpdatePage(); } @@ -218,6 +217,7 @@ function ParseIni(_basepath) { canvas.width = this.width; canvas.height = this.height; drawImage(); + draw(); }; imageObj.src = dataURL; diff --git a/sd-card/html/edit_digits.html b/sd-card/html/edit_digits.html index 1a9ce4d8..9d4606e9 100644 --- a/sd-card/html/edit_digits.html +++ b/sd-card/html/edit_digits.html @@ -152,9 +152,6 @@ function ChangeSelection(){ function SaveToConfig(){ SaveROIToConfig(ROIInfo, "[Digits]", basepath); -// location.reload(); -// parent.window.location.reload(true); -// window.location = location.href + '?session=' + Math.floor((Math.random() * 1000000) + 1); UpdatePage(); } @@ -220,6 +217,7 @@ function ParseIni(_basepath) { canvas.width = this.width; canvas.height = this.height; drawImage(); + draw(); }; imageObj.src = dataURL; @@ -249,6 +247,7 @@ function ParseIni(_basepath) { loadCanvas(basepath + "/fileserver/config/reference.jpg"); ParseIni(basepath); drawImage(); + draw(); } function drawImage(){ var canvas = document.getElementById('canvas'); diff --git a/sd-card/html/edit_reference.html b/sd-card/html/edit_reference.html index 2500d92a..d0e20534 100644 --- a/sd-card/html/edit_reference.html +++ b/sd-card/html/edit_reference.html @@ -49,7 +49,7 @@ - + @@ -70,6 +70,7 @@ document.getElementById("prerotateangle").value = getPreRotate(); document.getElementById("finerotate").disabled = false; document.getElementById("prerotateangle").disabled = false; + document.getElementById("updatereferenceimage").disabled = false; // document.getElementById("ButtonRotate").disabled = false; loadCanvas(url); drawRotated(); @@ -80,7 +81,8 @@ document.getElementById("finerotate").value = 0; document.getElementById("prerotateangle").value = 0; document.getElementById("finerotate").disabled = true; - document.getElementById("prerotateangle").disabled = true; + document.getElementById("prerotateangle").disabled = true; + document.getElementById("updatereferenceimage").disabled = true; // document.getElementById("ButtonRotate").disabled = true; loadCanvas(url); ParseConfig(); @@ -101,8 +103,10 @@ setPreRotate(document.getElementById("prerotateangle").value); UpdateConfigFile(basepath); var canvas = document.getElementById("canvas"); + drawRotated(false); SaveCanvasToImage(canvas, "/config/reference.jpg", true, basepath); showReference(); + UpdatePage(); } } @@ -140,7 +144,7 @@ showReference(); } - function drawRotated(){ + function drawRotated(_grid = true){ finerot= parseFloat(document.getElementById("finerotate").value); prerot = parseFloat(document.getElementById("prerotateangle").value); if (finerot == 1) { @@ -164,7 +168,10 @@ context.rotate(degrees*Math.PI/180); context.drawImage(imageObj,-imageObj.width/2,-imageObj.height/2); context.restore(); - drawGrid(); + if (_grid == true){ + drawGrid(); + } + } function drawGrid(){