Update to 6.2.1

README.md

@@ -41,8 +41,9 @@ If you would like to support the developer with a cup of coffee you can do that
 
 
 
-##### 6.2.0 Image Processing in Memory - (2021-03-08)
+##### 6.2.1 Image Processing in Memory - (2021-03-08)
 
+* NEW 6.2.1: Changed brightness and contrast to default if not enabled (resolves to bright images)
 * Determination of fixed illumination settings during startup - speed up of 5s in each run
 * Update digital CNN to v8.1.1 (additional digital images trained)
 * Extended error message in MQTT error message

code/components/jomjol_controlcamera/ClassControllCamera.cpp

@@ -140,24 +140,31 @@ bool CCamera::SetBrightnessContrastSaturation(int _brightness, int _contrast, in
 {
     bool result = false;
     sensor_t * s = esp_camera_sensor_get(); 
-    _brightness = min(2, max(-2, _brightness));
-    _contrast = min(2, max(-2, _contrast));
+    if (_brightness > -100)
+        _brightness = min(2, max(-2, _brightness));
+    if (_contrast > -100)
+        _contrast = min(2, max(-2, _contrast));
 //    _saturation = min(2, max(-2, _saturation));
 
 //    s->set_saturation(s, _saturation);
-    s->set_contrast(s, _contrast);
-    s->set_brightness(s, _brightness);
+    if (_contrast > -100)
+        s->set_contrast(s, _contrast);
+    if (_brightness > -100)
+        s->set_brightness(s, _brightness);
 
-    if (_brightness != brightness)
+    if ((_brightness != brightness) && (_brightness > -100))
         result = true;
-    if (_contrast != contrast)
+    if ((_contrast != contrast) && (_contrast > -100))
         result = true;
-    if (_saturation != saturation)
+    if ((_saturation != saturation) && (_saturation > -100))
         result = true;
     
-    brightness = _brightness;
-    contrast = _contrast;
-    saturation = _saturation;
+    if (_brightness > -100)
+        brightness = _brightness;
+    if (_contrast > -100)
+        contrast = _contrast;
+    if (_saturation > -100)
+       saturation = _saturation;
 
     if (result && isFixedExposure)
         EnableAutoExposure(waitbeforepicture_org);

code/components/jomjol_flowcontroll/ClassFlowMakeImage.cpp

@@ -49,9 +49,9 @@ bool ClassFlowMakeImage::ReadParameter(FILE* pfile, string& aktparamgraph)
     std::vector<string> zerlegt;
 
     aktparamgraph = trim(aktparamgraph);
-    int _brightness = 0;
-    int _contrast = 0;
-    int _saturation = 0;
+    int _brightness = -100;
+    int _contrast = -100;
+    int _saturation = -100;
 
     if (aktparamgraph.size() == 0)
         if (!this->GetNextParagraph(pfile, aktparamgraph))

code/components/jomjol_tfliteclass/server_tflite.cpp

@@ -406,9 +406,9 @@ esp_err_t handler_editflow(httpd_req_t *req)
         std::string _bri = "";
         std::string _con = "";
         std::string _sat = "";
-        int bri = 0;
-        int sat = 0;
-        int con = 0;
+        int bri = -100;
+        int sat = -100;
+        int con = -100;
 
         if (httpd_query_key_value(_query, "host", _valuechar, 30) == ESP_OK) {
             _host = std::string(_valuechar);

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="676bda2";
-const char* GIT_TAG="";
+const char* GIT_REV="4537725";
+const char* GIT_TAG="v6.2.0";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-03-08 20:30";
+const char* BUILD_TIME="2021-03-09 21:07";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v6.2.0 - 2020-03-08";
+const char* GIT_BASE_BRANCH = "master - v6.2.1 - 2020-03-09";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="676bda2";
-const char* GIT_TAG="";
+const char* GIT_REV="4537725";
+const char* GIT_TAG="v6.2.0";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-03-08 20:30";
+const char* BUILD_TIME="2021-03-09 21:07";

sd-card/config/config.ini

@@ -4,7 +4,7 @@
 WaitBeforeTakingPicture = 5
 ImageQuality = 5
 ImageSize = VGA
-Brightness = -2
+;Brightness = -2
 FixedExposure = true
 
 [Alignment]

sd-card/html/edit_reference.html

@@ -96,11 +96,18 @@ table {
             param;
 
         function doTake(){ 
-            _brightness = document.getElementById("MakeImage_Brightness_value1").value;
+            var xhttp = new XMLHttpRequest();
+            if (param["MakeImage"]["Brightness"].found && param["MakeImage"]["Brightness"].enabled)
+            {
+                _brightness = document.getElementById("MakeImage_Brightness_value1").value;
 //            _contrast = document.getElementById("MakeImage_Contrast_value1").value;
 //            _saturation = document.getElementById("MakeImage_Saturation_value1").value;
-            var xhttp = new XMLHttpRequest();
-            url = basepath + "/editflow.html?task=test_take&bri=" + _brightness;
+url = basepath + "/editflow.html?task=test_take&bri=" + _brightness;
+            }
+            else
+            {
+                url = basepath + "/editflow.html?task=test_take";
+            }
             if (basepath.length > 0){
                 url = url + "&host=" + basepath;
             }
@@ -123,8 +130,15 @@ table {
             else
                 document.getElementById("labelmirror").style = "color:lightgrey;";
 
-            if (param["MakeImage"]["Brightness"].found)
+            if (param["MakeImage"]["Brightness"].found && param["MakeImage"]["Brightness"].enabled)
                 document.getElementById("MakeImage_Brightness_value1").disabled = false;
+            else
+            {
+                document.getElementById("MakeImage_Brightness_value1").type = "hidden";
+                document.getElementById("MakeImage_Brightness_text").style.visibility = "hidden";
+                
+            }
+
 //            if (param["MakeImage"]["Saturation"].found)
 //                document.getElementById("MakeImage_Saturation_value1").disabled = false;
 //            if (param["MakeImage"]["Contrast"].found)
@@ -174,14 +188,15 @@ table {
                 else
                     param["Alignment"]["InitialMirror"].value1 = "false";
 
-                ReadParameter(param, "MakeImage", "Brightness", false);		
-//            	ReadParameter(param, "MakeImage", "Contrast", false);
-//                ReadParameter(param, "MakeImage", "Saturation", false);
-                
-
-                var textToSave = setConfigParameters(param);
-		        FileDeleteOnServer("/config/config.ini", basepath);
-		        FileSendContent(textToSave, "/config/config.ini", basepath);
+                if (param["MakeImage"]["Brightness"].found && param["MakeImage"]["Brightness"].enabled)
+                {
+                    ReadParameter(param, "MakeImage", "Brightness", false);		
+    //            	ReadParameter(param, "MakeImage", "Contrast", false);
+    //                ReadParameter(param, "MakeImage", "Saturation", false);
+                    var textToSave = setConfigParameters(param);
+                    FileDeleteOnServer("/config/config.ini", basepath);
+                    FileSendContent(textToSave, "/config/config.ini", basepath);
+                }
 
                 var canvas = document.getElementById("canvas");
                 drawRotated(false);

sd-card/html/version.txt

@@ -1 +1 @@
-5.3.0
+5.4.0