diff --git a/code/main/main.cpp b/code/main/main.cpp index 7b436bf1..92de3017 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -265,7 +265,7 @@ extern "C" void app_main(void) } else { // Test Camera camera_fb_t * fb = esp_camera_fb_get(); if (!fb) { - LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Camera cannot be initialzed. Will restart in 5 minutes!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Camera Framebuffer cannot be initialzed. Will restart in 5 minutes!"); initSucessful = false; } else { diff --git a/sd-card/html/prevalue_set.html b/sd-card/html/prevalue_set.html index 4bbf27fc..bbbd5a4d 100644 --- a/sd-card/html/prevalue_set.html +++ b/sd-card/html/prevalue_set.html @@ -52,12 +52,12 @@ input[type=number] {
Input (Format = 123.456):
- PreValue: + Previous Value:
- +@@ -90,30 +90,56 @@ function setprevalue() { response = xhttp.responseText; document.getElementById("result").innerHTML=response; } - catch (error) - { - // alert("Deleting Config.ini failed"); - } + catch (error) + { + alert("Failed to get data from device!"); + } } function loadPrevalue(_basepath) { - var sel = document.getElementById("Numbers_value1"); - var _number = sel.options[sel.selectedIndex].text; + // Get current Pre Value + var sel = document.getElementById("Numbers_value1"); + var _number = sel.options[sel.selectedIndex].text; - var xhttp = new XMLHttpRequest(); - try { - url = _basepath + '/setPreValue?numbers=' + _number; - xhttp.open("GET", url, false); - xhttp.send(); - response = xhttp.responseText; - document.getElementById("prevalue").innerHTML=response; - document.getElementById("myInput").value=response; - } - catch (error) - { - // alert("Deleting Config.ini failed"); - } - return true; + var xhttp = new XMLHttpRequest(); + try { + url = _basepath + '/setPreValue?numbers=' + _number; + xhttp.open("GET", url, false); + xhttp.send(); + response = xhttp.responseText; + document.getElementById("prevalue").innerHTML=response; + } + catch (error) + { + alert("Failed to get data from device!"); + } + + // Get current RAW Value + var sel = document.getElementById("Numbers_value1"); + var _number = sel.options[sel.selectedIndex].text; + + var xhttp = new XMLHttpRequest(); + try { + url = _basepath + '/value?all=true&type=raw'; + xhttp.open("GET", url, false); + xhttp.send(); + response = xhttp.responseText; + + lines = response.split(/\r?\n/); + + lines.forEach(function(line) { + arr = line.split("\t"); + if (_number == arr[0]) { + document.getElementById("myInput").value=arr[1]; + return; + } + }); + + } + catch (error) + { + alert("Failed to get data from device!"); + } } diff --git a/sd-card/html/readconfigcommon.js b/sd-card/html/readconfigcommon.js index 5f20bcc6..8931e387 100644 --- a/sd-card/html/readconfigcommon.js +++ b/sd-card/html/readconfigcommon.js @@ -66,7 +66,6 @@ function ZerlegeZeile(input, delimiter = " =\t\r") * equal sign, if the key is "password" */ if (input.includes("password")) { // Line contains a password, use the equal sign as the only delimiter and only split on first occurrence - console.log(input); var pos = input.indexOf("="); Output.push(trim(input.substr(0, pos), delimiter)); Output.push(trim(input.substr(pos +1, input.length), delimiter));