v8.0.3

v8.0.1

FeatureRequest.md

@@ -11,6 +11,12 @@
 
 ____
 
+#### #9 Basic auth for the UI
+
+* https://github.com/jomjol/AI-on-the-edge-device/issues/283
+
+* Implementation of an authentication mechanism.
+
 #### #8 MQTT configurable readout intervall
 
 Make the readout intervall configurable via MQTT.
@@ -27,13 +33,13 @@ To do:
 * Implement a checking algo
 * Extend the firmware and html page for the error handling
 
-#### #6 Check for double ROI names
+#### ~~#6 Check for double ROI names~~ - implemented v8.0.0
 
-Check during configuration, that ROI names are unique.
+~~Check during configuration, that ROI names are unique.~~
 
-To do:
+~~To do:~~
 
-* Implementation of ROI name checking in html code before saving analog or digital ROIs
+* ~~Implementation of ROI name checking in html code before saving analog or digital ROIs~~
 
   
 
@@ -49,31 +55,31 @@ To do:
 
 
 
-#### #4 Initial Shifting and Rotation
+#### ~~#4 Initial Shifting and Rotation~~ - implemented v7.0.0
 
-* https://github.com/jomjol/AI-on-the-edge-device/issues/123
+* ~~https://github.com/jomjol/AI-on-the-edge-device/issues/123~~
 
-Implementation of a shifting additional to the initial rotation of the raw camera input
+~~Implementation of a shifting additional to the initial rotation of the raw camera input~~
 
-To do:
+~~To do:~~
 
-* Implementation of shifting
-* Extension of configuration
-* Adaption of the html configuration to implement shifting
+* ~~Implementation of shifting~~
+* ~~Extension of configuration~~
+* ~~Adaption of the html configuration to implement shifting~~
 
 
 
-#### #3 Allow grouping of digits to multiple reading values
+#### ~~#3 Allow grouping of digits to multiple reading values~~ - implemented v8.0.0
 
-* https://github.com/jomjol/AI-on-the-edge-device/issues/123
+* ~~https://github.com/jomjol/AI-on-the-edge-device/issues/123~~
 
-Implementation of two different independent readouts in one setup
+~~Implementation of two different independent readouts in one setup~~
 
-To do:
+~~To do:~~
+
+* ~~Extend the configuration, setting and processing flow for two independend readouts~~
 
-* Extend the configuration, setting and processing flow for two independend readouts
 
-https://github.com/jomjol/AI-on-the-edge-device/issues/123
 
 
 
@@ -96,15 +102,16 @@ To do:
 
 ____
 
-#### #1 Optional GPIO for external flash/lighting
+#### ~~#1 Optional GPIO for external flash/lighting~~ - implemented (v8.0.0)
 
-* https://github.com/jomjol/AI-on-the-edge-device/issues/133
+* ~~https://github.com/jomjol/AI-on-the-edge-device/issues/133~~
 
-Implementation of an an extrnal flash / lightning through GPIOs.
-* available GPIOs: 12 & 13 (currently in use for html switching)
+~~Implementation of an an extrnal flash / lightning through GPIOs.~~
 
-To do:
+* ~~available GPIOs: 12 & 13 (currently in use for html switching)~~
 
-* Implementation of a software module for external light source (e.g. WS8132 LED controller, ...)
-* Update of the camera module to use the external light instead of the internal flash light
-* Adopt the configuration algorithm with a configurable light source
+~~To do:~~
+
+* ~~Implementation of a software module for external light source (e.g. WS8132 LED controller, ...)~~
+* ~~Update of the camera module to use the external light instead of the internal flash light~~
+* ~~Adopt the configuration algorithm with a configurable light source~~

README.md

@@ -47,8 +47,11 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 8.0.0 - Multi Meter Support (2021-07-14)
+##### 8.0.3 - Multi Meter Support (2021-07-25)
 
+* NEW 8.0.3: bug fix: reboot during `config.ini` handling, html error
+* NEW 8.0.2: saving roundes prevalue, bug fix html server
+* NEW 8.0.1: bug fix html handling of parameter `FixedExposure` and `ImageSize`
 * Dual / multi meter support (more than 1 number to be recognized)
   This is implemented with the feature "number" on the ROI definition as well as selected options
 * MQTT: standardization of the naming - including new topics (`json`,  `freeMem `, `uptime`)c

code/components/jomjol_fileserver_ota/server_file.cpp

@@ -486,10 +486,10 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
     int start_fn = strlen(((struct file_server_data *)req->user_ctx)->base_path);
     printf("Directory: %s, start_fn: %d, found: %d\n", directory.c_str(), start_fn, found);
 	directory = directory.substr(start_fn, found - start_fn + 1);
-    printf("Directory danach: %s\n", directory.c_str());    
+    printf("Directory danach 1: %s\n", directory.c_str());    
 
     directory = "/fileserver" + directory;
-    printf("Directory danach: %s\n", directory.c_str());   
+    printf("Directory danach 2: %s\n", directory.c_str());   
 
     /* Redirect onto root to see the updated file list */
     httpd_resp_set_status(req, "303 See Other");
@@ -500,11 +500,13 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
     httpd_resp_set_hdr(req, "Location", directory.c_str());
     httpd_resp_sendstr(req, "File uploaded successfully");
 
+/*
     if (strcmp(filepath, CONFIG_FILE) == 0) {
-        printf("New config foung. Reload handler.");
+        printf("New config found. Reload handler.");
         gpio_handler_deinit();
         MQTTdestroy();
     }
+*/
 
     return ESP_OK;
 }
@@ -606,10 +608,10 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
         int start_fn = strlen(((struct file_server_data *)req->user_ctx)->base_path);
         printf("Directory: %s, start_fn: %d, found: %d\n", directory.c_str(), start_fn, found);
         directory = directory.substr(start_fn, found - start_fn + 1);
-        printf("Directory danach: %s\n", directory.c_str());    
+        printf("Directory danach 3: %s\n", directory.c_str());    
 
         directory = "/fileserver" + directory;
-        printf("Directory danach: %s\n", directory.c_str());   
+        printf("Directory danach 4: %s\n", directory.c_str());   
     }
     
 

code/components/jomjol_fileserver_ota/server_help.cpp

@@ -107,6 +107,8 @@ esp_err_t set_content_type_from_file(httpd_req_t *req, const char *filename)
         return httpd_resp_set_type(req, "text/html");
     } else if (IS_FILE_EXT(filename, ".jpeg")) {
         return httpd_resp_set_type(req, "image/jpeg");
+    } else if (IS_FILE_EXT(filename, ".jpg")) {
+        return httpd_resp_set_type(req, "image/jpeg");
     } else if (IS_FILE_EXT(filename, ".ico")) {
         return httpd_resp_set_type(req, "image/x-icon");
     }

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -208,7 +208,7 @@ void ClassFlowPostProcessing::SavePreValue()
         strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
         NUMBERS[j]->timeStamp = std::string(buffer);
 
-        _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + to_string(NUMBERS[j]->PreValue) + "\n";
+        _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + "\n";
         printf("Write PreValue Zeile: %s\n", _zw.c_str());
 
         fputs(_zw.c_str(), pFile);
@@ -594,7 +594,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
             if ((!NUMBERS[j]->AllowNegativeRates) && (NUMBERS[j]->Value < NUMBERS[j]->PreValue))
             {
-                NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + std::to_string(NUMBERS[j]->Value) + " "; 
+                NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; 
                 NUMBERS[j]->Value = NUMBERS[j]->PreValue;
                 zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift);
             }

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="03b5e36";
+const char* GIT_REV="ea72256";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-14 19:54";
+const char* BUILD_TIME="2021-07-25 18:09";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v8.0.0 - 2021-07-14";
+const char* GIT_BASE_BRANCH = "master - v8.0.3 - 2021-07-25";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="03b5e36";
+const char* GIT_REV="ea72256";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-14 19:53";
+const char* BUILD_TIME="2021-07-25 18:09";

sd-card/html/edit_config_param.html

@@ -367,9 +367,6 @@ textarea {
 			</td>
 		</tr>
 
-
-		ExtendedResolution
-
 		<tr class="expert"  id="ex10">
 			<td width="20px"  style="padding-left: 40px;"> </td>
 			<td> <class id="Analog_ModelInputSize_text" style="color:black;">ModelInputSize</class> </td>
@@ -1659,12 +1656,12 @@ function UpdateInput() {
 	WriteParameter(param, category, "MakeImage", "Brightness", false);		
 //	WriteParameter(param, category, "MakeImage", "Contrast", false);		
 //	WriteParameter(param, category, "MakeImage", "Saturation", false);		
-	WriteParameter(param, category, "MakeImage", "ImageSize", false, true);		
-	WriteParameter(param, category, "MakeImage", "FixedExposure", false, true);		
+	WriteParameter(param, category, "MakeImage", "ImageSize", false);		
+	WriteParameter(param, category, "MakeImage", "FixedExposure", false);		
 
 	WriteParameter(param, category, "Alignment", "SearchFieldX", false);		
 	WriteParameter(param, category, "Alignment", "SearchFieldY", false);		
-	WriteParameter(param, category, "Alignment", "AlignmentAlgo", true, true);		
+	WriteParameter(param, category, "Alignment", "AlignmentAlgo", true);		
 
 	WriteParameter(param, category, "Digits", "Model", false);		
 	WriteParameter(param, category, "Digits", "LogImageLocation", true);		

sd-card/html/version.txt

@@ -1 +1 @@
-9.5.0
+9.5.2