diff --git a/code/components/jomjol_fileserver_ota/server_help.cpp b/code/components/jomjol_fileserver_ota/server_help.cpp index 3123b3c90..256579e64 100644 --- a/code/components/jomjol_fileserver_ota/server_help.cpp +++ b/code/components/jomjol_fileserver_ota/server_help.cpp @@ -63,8 +63,10 @@ esp_err_t send_file(httpd_req_t *req, std::string filename) endsWith(filename, ".jpg") || endsWith(filename, ".jpeg") || endsWith(filename, ".ico") || - endsWith(filename, ".png")) { - + endsWith(filename, ".gif") || + endsWith(filename, ".svg") || + endsWith(filename, ".png")) + { if (filename == "/sdcard/html/setup.html") { httpd_resp_set_hdr(req, "Clear-Site-Data", "\"*\""); } diff --git a/sd-card/demo/leer.txt b/sd-card/demo/leer.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/sd-card/firmware/leer.txt b/sd-card/firmware/leer.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/sd-card/html/common.js b/sd-card/html/common.js index e7c389d41..c9a52f704 100644 --- a/sd-card/html/common.js +++ b/sd-card/html/common.js @@ -77,7 +77,7 @@ function LoadFwVersion() { if (xhttp.status >= 200 && xhttp.status < 300) { fwVersion = xhttp.responseText; document.getElementById("Version").innerHTML = "Slider0007 Fork | " + fwVersion; - console.log(fwVersion); + //console.log(fwVersion); compareVersions(); } else { @@ -104,7 +104,7 @@ function LoadWebUiVersion() { xhttp.addEventListener('load', function(event) { if (xhttp.status >= 200 && xhttp.status < 300) { webUiVersion = xhttp.responseText; - console.log("Web UI Version: " + webUiVersion); + //console.log("Web UI Version: " + webUiVersion); compareVersions(); } else { @@ -115,7 +115,7 @@ function LoadWebUiVersion() { try { url = _domainname + '/info?type=HTMLVersion'; - console.log("url"); + //console.log("url: " + url); xhttp.open("GET", url, true); xhttp.send(); } @@ -134,7 +134,7 @@ function compareVersions() { fWGitHash = arr[arr.length - 1].substring(0, 7); arr = webUiVersion.split(" "); webUiHash = arr[arr.length - 1].substring(0, 7); - console.log("FW Hash: " + fWGitHash + ", Web UI Hash: " + webUiHash); + //console.log("FW Hash: " + fWGitHash + ", Web UI Hash: " + webUiHash); if (fWGitHash != webUiHash) { firework.launch("The version of the web interface (" + webUiHash + diff --git a/sd-card/html/graph.html b/sd-card/html/graph.html index 95568858a..8f3c5ef44 100644 --- a/sd-card/html/graph.html +++ b/sd-card/html/graph.html @@ -28,14 +28,44 @@ vertical-align: middle; } + input[type=number] { + width: 45px; + min-width: 45px; + max-width: 45px; + margin-right: 0px; + padding: 3px 5px; + display: inline-block; + border: 1px solid #ccc; + font-size: 16px; + vertical-align: middle; + } + .button { padding: 5px 10px; width: 160px; font-size: 16px; } + + input:out-of-range { + background-color: rgba(255, 0, 0, 0.25); + border: 1px solid red; + } + + input:invalid { + background-color: rgba(255, 0, 0, 0.25); + border: 1px solid red; + } diff --git a/sd-card/html/img_loading.gif b/sd-card/html/img_loading.gif new file mode 100644 index 000000000..68dbf4b64 Binary files /dev/null and b/sd-card/html/img_loading.gif differ diff --git a/sd-card/html/img_not_available.png b/sd-card/html/img_not_available.png new file mode 100644 index 000000000..c3d7c5c2e Binary files /dev/null and b/sd-card/html/img_not_available.png differ diff --git a/sd-card/html/index.html b/sd-card/html/index.html index 0a0211db0..9763b0e27 100644 --- a/sd-card/html/index.html +++ b/sd-card/html/index.html @@ -32,7 +32,7 @@ if (streamPopup) // Ensure that stream popup is closed because it's blocking web interface streamPopup.close(); - console.log("loadPage(" + page + ")"); + //console.log("loadPage(" + page + ")"); document.cookie = "page="+page + "; path=/"; document.getElementById('maincontent').src = page; @@ -81,24 +81,6 @@

A Neural Network Recognition Sy