From ac3edc9bec353eb5f12a6ef6cd4929614fee31ba Mon Sep 17 00:00:00 2001
From: jomjol <30766535+jomjol@users.noreply.github.com>
Date: Thu, 10 Sep 2020 08:47:20 +0200
Subject: [PATCH] nightly
---
README.md | 6 +++++-
code/src/server_tflite.cpp | 7 +------
sd-card/html/edit_analog.html | 12 +++++++++---
sd-card/html/edit_digits.html | 12 +++++++++---
4 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 1e62e3bf..33837b44 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,11 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
-##### Rolling - (2020-09-09)
+##### Rolling - (2020-09-10)
+
+* update ROI-configurator, in case of no ROIs defined
+
+2020-09-10
* Update to new and modern layout (thanks to michaeljoos in iobroker-thread)
* incorporated "Take Picture" to make new reference image
diff --git a/code/src/server_tflite.cpp b/code/src/server_tflite.cpp
index 00266b7d..1b18f7da 100644
--- a/code/src/server_tflite.cpp
+++ b/code/src/server_tflite.cpp
@@ -58,7 +58,6 @@ void doInit(void)
bool doflow(void)
{
- int i;
std::string zw_time = gettimestring("%Y%m%d-%H%M%S");
printf("doflow - start %s\n", zw_time.c_str());
flowisrunning = true;
@@ -131,9 +130,8 @@ esp_err_t handler_doflow(httpd_req_t *req)
esp_err_t handler_wasserzaehler(httpd_req_t *req)
{
LogFile.WriteToFile("handler_wasserzaehler");
- const char* resp_str;
- string zw;
bool _rawValue = false;
+ string zw;
printf("handler_wasserzaehler uri:\n"); printf(req->uri); printf("\n");
@@ -213,9 +211,6 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
esp_err_t handler_editflow(httpd_req_t *req)
{
LogFile.WriteToFile("handler_editflow");
- const char* resp_str;
- string zw;
- bool _rawValue = false;
printf("handler_editflow uri: "); printf(req->uri); printf("\n");
diff --git a/sd-card/html/edit_analog.html b/sd-card/html/edit_analog.html
index 90ac16dc..d28c1902 100644
--- a/sd-card/html/edit_analog.html
+++ b/sd-card/html/edit_analog.html
@@ -23,8 +23,8 @@
@@ -159,6 +159,12 @@ function SaveToConfig(){
function UpdateROIs(){
if (ROIInfo.length == 0){
alert("There are no ROIs defined.\nPlease first define minimum one ROI in the config.ini by hand.\n");
+ document.getElementById("newROI").disabled = true;
+ document.getElementById("deleteROI").disabled = true;
+ document.getElementById("index").disabled = true;
+ document.getElementById("saveroi").disabled = true;
+ document.getElementById("moveNext").disabled = true;
+ document.getElementById("movePrevious").disabled = true;
return;
}
diff --git a/sd-card/html/edit_digits.html b/sd-card/html/edit_digits.html
index fb89fc11..69ccec4a 100644
--- a/sd-card/html/edit_digits.html
+++ b/sd-card/html/edit_digits.html
@@ -23,8 +23,8 @@
@@ -159,6 +159,12 @@ function SaveToConfig(){
function UpdateROIs(){
if (ROIInfo.length == 0){
alert("There are no ROIs defined.\nPlease first define minimum one ROI in the config.ini by hand.\n");
+ document.getElementById("newROI").disabled = true;
+ document.getElementById("deleteROI").disabled = true;
+ document.getElementById("index").disabled = true;
+ document.getElementById("saveroi").disabled = true;
+ document.getElementById("moveNext").disabled = true;
+ document.getElementById("movePrevious").disabled = true;
return;
}