diff --git a/code/components/jomjol_flowcontroll/MainFlowControl.cpp b/code/components/jomjol_flowcontroll/MainFlowControl.cpp
index 81fc39bc..a96e383b 100644
--- a/code/components/jomjol_flowcontroll/MainFlowControl.cpp
+++ b/code/components/jomjol_flowcontroll/MainFlowControl.cpp
@@ -453,7 +453,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
else {
/* Digital ROIs */
txt = "";
- txt += "Recognized Digit ROIs (previous round)
\n";
+ txt += "
Recognized Digit ROIs (previous round)
\n";
txt += "\n";
std::vector htmlinfodig;
@@ -488,7 +488,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
/* Analog ROIs */
- txt = "Recognized Analog ROIs (previous round)
\n";
+ txt = "
Recognized Analog ROIs (previous round)
\n";
txt += "\n";
std::vector htmlinfoana;
@@ -510,7 +510,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
/* Full Image
* Only show it after the image got taken and aligned */
- txt = "Aligned Image (current round)
\n";
+ txt = "
Aligned Image (current round)
\n";
if ((*status == std::string("Initialization")) ||
(*status == std::string("Initialization (delayed)")) ||
(*status == std::string("Take Image"))) {
diff --git a/sd-card/html/common.js b/sd-card/html/common.js
index 2091c2a9..20d01010 100644
--- a/sd-card/html/common.js
+++ b/sd-card/html/common.js
@@ -1,7 +1,7 @@
/* The UI can also be run locally, but you have to set the IP of your devide accordingly.
* And you also might have to disable CORS in your webbrowser! */
-var domainname_for_testing = "192.168.178.23";
+var domainname_for_testing = "192.168.1.151";
/* Returns the domainname with prepended protocol.
@@ -13,7 +13,7 @@ function getDomainname(){
)
{
- console.log("Using pre-defined domainname for testing: " + domainname_for_testing);
+ //console.log("Using pre-defined domainname for testing: " + domainname_for_testing);
domainname = "http://" + domainname_for_testing
}
else
diff --git a/sd-card/html/index.html b/sd-card/html/index.html
index b02fce1e..6cd64e96 100644
--- a/sd-card/html/index.html
+++ b/sd-card/html/index.html
@@ -24,11 +24,18 @@
'status=no,toolbar=no,titlebar=no,' +
'left=10,top=250,width=640px,height=480px';
- async function loadPage(page) {
+ function loadPage(page) {
+ console.log("loadPage( " + page + " )");
+
if (streamPopup) // Ensure that stream popup is closed because it's blocking web interface
streamPopup.close();
- console.log("loadPage(" + page + ")");
+ asyncPageLoad(page);
+ }
+
+
+ async function asyncPageLoad(page ) {
+ console.log(" loading " + page + " ...");
document.cookie = "page="+page + "; path=/";
document.getElementById('maincontent').src = page;
@@ -37,6 +44,7 @@
});
}
+
function resetMenu() {
[].forEach.call(document.querySelectorAll('.submenu'), function (el) {
el.style.visibility = 'visible';
@@ -73,6 +81,7 @@
+